Merge branch 'master' of https://github.com/senbox-org/snap-reader-tests

senbox-org · Mar 4, 2024 · dd683ef · dd683ef
2 parents 8b4ca38 + 194cbef
commit dd683ef
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -52,6 +52,9 @@ windows:
   stage: test
   tags: [windows]
   variables:
+    GIT_STRATEGY: clone
+    FF_ENABLE_JOB_CLEANUP: 'true'
+    FF_USE_WINDOWS_LEGACY_PROCESS_STRATEGY: 'false'
     DATA_PATH: 'D:\\testData'
     CLASS_PATH: org.esa.s2tbx
     LIB_HDF_ARGS: >-
@@ -65,7 +68,7 @@ windows:
       -Dsnap.reader.tests.execute=true -Dsnap.reader.tests.data.dir=%DATA_PATH%
       -Dsnap.reader.tests.class.name=%CLASS_PATH%
       -Dsnap.reader.tests.failOnMissingData=true
-    MAVEN_SETTINGS_FILE: C:\Users\Administrator\AppData\Roaming\apache-maven\conf\settings.xml
+    MAVEN_SETTINGS_FILE: C:\\Users\\Administrator\\AppData\\Roaming\\apache-maven\\conf\\settings.xml
   script:
     - mvn %MAVEN_CLI_OPTS% test
   parallel:

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.esa.snap</groupId>
     <artifactId>snap-reader-tests</artifactId>
-    <version>10.0.0-SNAPSHOT</version>
+    <version>11.0.0-SNAPSHOT</version>
 
     <packaging>nbm</packaging>
 
@@ -18,17 +18,17 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <snap.version>10.0.0-SNAPSHOT</snap.version>
+        <snap.version>11.0.0-SNAPSHOT</snap.version>
         <netbeans.version>RELEASE113</netbeans.version>
         <jackson.version>2.15.1</jackson.version>
 
-        <snap.test.version>10.0.0-SNAPSHOT</snap.test.version>
-        <opttbx.test.version>10.0.0-SNAPSHOT</opttbx.test.version>
-        <mwvtbx.test.version>10.0.0-SNAPSHOT</mwvtbx.test.version>
-        <rstb.test.version>10.0.0-SNAPSHOT</rstb.test.version>
-        <iceye.test.version>10.0.0-SNAPSHOT</iceye.test.version>
+        <snap.test.version>11.0.0-SNAPSHOT</snap.test.version>
+        <opttbx.test.version>11.0.0-SNAPSHOT</opttbx.test.version>
+        <mwvtbx.test.version>11.0.0-SNAPSHOT</mwvtbx.test.version>
+        <rstb.test.version>11.0.0-SNAPSHOT</rstb.test.version>
+        <iceye.test.version>11.0.0-SNAPSHOT</iceye.test.version>
         <seadas-reader.test.version>1.10.0-SNAPSHOT</seadas-reader.test.version>
-        <smos.test.version>10.0.0-SNAPSHOT</smos.test.version>
+        <smos.test.version>11.0.0-SNAPSHOT</smos.test.version>
 
         <max.memory>-Xmx5g</max.memory>
     </properties>
@@ -766,7 +766,7 @@
                         <property>
                             <name>snap.version</name>
                             <banSnapshots>false</banSnapshots>
-                            <version>[10.0.0-SNAPSHOT]</version>
+                            <version>[11.0.0-SNAPSHOT]</version>
                         </property>
                     </properties>
                 </configuration>