Merge pull request #200 from geosolutions-it/revert-199-gdal_2x_12x

Revert "Update to GDAL 2.x bindings #198"
geosolutions-it · Feb 27, 2019 · 997c9fe · 997c9fe
2 parents 0d41cff + a36b62a
commit 997c9fe
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 20 deletions.
diff --git a/library/gdalframework/pom.xml b/library/gdalframework/pom.xml
@@ -17,12 +17,11 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-      <dependency>
-          <groupId>org.gdal</groupId>
-          <artifactId>gdal</artifactId>
-          <version>${gdal.version}</version>
-      </dependency>
-      <dependency>
+    <dependency>
+      <groupId>it.geosolutions.imageio-ext</groupId>
+      <artifactId>imageio-ext-gdal-bindings</artifactId>
+    </dependency>
+    <dependency>
       <groupId>it.geosolutions.imageio-ext</groupId>
       <artifactId>imageio-ext-streams</artifactId>
       <version>${project.version}</version>

diff --git a/library/gdalframework/src/main/java/it/geosolutions/imageio/gdalframework/GDALUtilities.java b/library/gdalframework/src/main/java/it/geosolutions/imageio/gdalframework/GDALUtilities.java
@@ -624,8 +624,8 @@ public static void loadGDAL() {
                         // GDAL version >= 2.3.0
                         System.loadLibrary("gdalalljni");
                     } catch (UnsatisfiedLinkError e1) {
-                        if (LOGGER.isLoggable(Level.FINE)) {
-                            LOGGER.log(Level.FINE,"Failed to load the GDAL native libs from \"gdalalljni\". " +
+                        if (LOGGER.isLoggable(Level.INFO)) {
+                            LOGGER.log(Level.INFO,"Failed to load the GDAL native libs from \"gdalalljni\". " +
                                     "Falling back to \"gdaljni\".\n" +
                                     e1.toString());
                         }
@@ -638,17 +638,6 @@ public static void loadGDAL() {
                             LOGGER.info("GDAL Native Library loaded (version: " + versionInfo + ")");
                     }
 
-                    if (LOGGER.isLoggable(Level.FINE)) {
-                        int driverCount = gdal.GetDriverCount();
-                        List<String> drivers = new ArrayList<>();
-                        for (int i = 0; i < driverCount; i++) {
-                            Driver driver = gdal.GetDriver(i);
-                            drivers.add(driver.getShortName());
-                            driver.delete();
-                        }
-                        LOGGER.fine("Formats available in GDAL (not all exposed by imageio-ext): " +  drivers);
-                    }
-
                     // //
                     //
                     // Setting error messages handler.

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,6 @@
     <gdal.version>1.9.2</gdal.version>
     <kakadu.version>5.2.6</kakadu.version>
     <java.awt.headless>true</java.awt.headless>
-    <gdal.version>2.2.0</gdal.version>  
   </properties>
 
   <!-- ======================================================== -->