SNAP-4113_gdal_upgrade

.gitlab-ci.yml

@@ -59,7 +59,7 @@ mvn-build:
   artifacts:
     paths:
       - "${MAVEN_PROJECT_DIR}/**/target/*.jar"
-      - "${MAVEN_PROJECT_DIR}/**/target/classes"
+      #- "${MAVEN_PROJECT_DIR}/**/target/classes"
       - "${MAVEN_PROJECT_DIR}/**/target/*.nbm"
       #- "${MAVEN_PROJECT_DIR}/**/target/site/jacoco/jacoco.csv"
       - "${MAVEN_PROJECT_DIR}/**/target/site"

lib-gdal/src/main/java/org/esa/snap/dataio/gdal/GDALVersion.java

@@ -18,7 +18,7 @@
  */
 public enum GDALVersion {
 
-    GDAL_372_FULL("3.7.2", "3-7-2", true, new String[]{"gdalalljni"});
+    GDAL_3121_FULL("3.12.1", "3-12-1", true, new String[]{"gdalalljni"});
 
     static final String VERSION_NAME = "{version}";
     static final String DIR_NAME = "gdal-" + VERSION_NAME;
@@ -72,7 +72,7 @@ public static GDALVersion getGDALVersion() {
      */
     public static GDALVersion getInternalVersion() {
         if (INTERNAL_VERSION == null) {
-            INTERNAL_VERSION = GDAL_372_FULL;
+            INTERNAL_VERSION = GDAL_3121_FULL;
         }
         return INTERNAL_VERSION;
     }

lib-gdal/src/main/resources/auxdata/gdal/Linux/x64/gdal-3-12-1.sha256

@@ -0,0 +1 @@
+3d211512f1a85a7013612c5a10c7d11b3103cf8d64b00975111beb9c4928cc50

lib-gdal/src/main/resources/auxdata/gdal/MacOSX/aarch64/gdal-3-12-1.sha256

@@ -0,0 +1 @@
+db7b29998746e7688457cac948beb4e3665c8387a24eaab27854a97979aeb9fe

lib-gdal/src/main/resources/auxdata/gdal/MacOSX/x64/gdal-3-12-1.sha256

@@ -0,0 +1 @@
+be8b8cf05988994dae6e4ad51075f84e8871b7dfa2a9ab070f80603698fcb2d2

lib-gdal/src/main/resources/auxdata/gdal/Windows/x64/gdal-3-12-1.sha256

@@ -0,0 +1 @@
+5ff56262dd62cdf3738b664ec9dc7622851488fd6657920ca0bde29fb4e74afd

lib-gdal/src/test/java/org/esa/snap/dataio/gdal/GDALDistributionInstallerTest.java

@@ -14,7 +14,7 @@ public class GDALDistributionInstallerTest {
 
     private void testInstallBundleDistribution() {
         try {
-            final GDALVersion gdalVersion = GDALVersion.GDAL_372_FULL;
+            final GDALVersion gdalVersion = GDALVersion.GDAL_3121_FULL;
             GDALDistributionInstaller.setupDistribution(gdalVersion);
             assertTrue(Files.exists(AbstractGDALTest.getExpectedNativeLibrariesRootFolderPath()));
             assertTrue(Files.exists(GDALVersionTest.getExpectedGDALVersionLocation(gdalVersion)));

lib-gdal/src/test/java/org/esa/snap/dataio/gdal/GDALLoaderTest.java

@@ -111,8 +111,8 @@ public void testSyncGDALInitialisation(){
         assertNotNull(TEST_GDAL_LOADER);
         try {
             Path gdalRootFolderPath = getExpectedNativeLibrariesRootFolderPath();
-            //remove gdal folder
-            if(Files.exists(gdalRootFolderPath)){
+            //remove gdal folder when not itialised to force the bundle deploy during this test
+            if(TEST_GDAL_LOADER.isNotInitialised() && Files.exists(gdalRootFolderPath)){
                 FileUtils.deleteTree(gdalRootFolderPath.toFile());
             }
 

snap-gdal-reader/src/main/java/org/esa/snap/dataio/gdal/reader/plugins/SNAPTiffDriverProductReaderPlugIn.java

@@ -0,0 +1,29 @@
+package org.esa.snap.dataio.gdal.reader.plugins;
+
+import org.esa.snap.core.dataio.DecodeQualification;
+
+/**
+ * Reader plugin for products using the GDAL library.
+ *
+ * @author Jean Coravu
+ */
+public class SNAPTiffDriverProductReaderPlugIn extends AbstractDriverProductReaderPlugIn {
+
+    public SNAPTiffDriverProductReaderPlugIn() {
+        // make a difference between GDAL GeoTIFF and SNAP GeoTIFF reader
+        // in case this driver is enabled from GDAL
+        super("SNAP_TIFF", "SNAP GeoTIFF (GDAL)");
+
+        addExtension(".tif");
+        addExtension(".tiff");
+    }
+
+    @Override
+    public DecodeQualification getDecodeQualification(Object input) {
+        final DecodeQualification qualification = super.getDecodeQualification(input);
+        if (qualification == DecodeQualification.UNABLE) {
+            return qualification;
+        }
+        return DecodeQualification.SUITABLE;
+    }
+}