Merge pull request #1949 from bencaradocdavies/geot-6050

[GEOT-6050] Upgrade HSQLDB to 2.4.1
geotools · Jun 27, 2018 · 9afcfc5 · 9afcfc5
2 parents 4bb01ac + 046c0c1
commit 9afcfc5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...psg-hsql/src/main/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactory.java b/...psg-hsql/src/main/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactory.java
@@ -74,7 +74,7 @@ public class ThreadedHsqlEpsgFactory extends ThreadedEpsgFactory {
      * version number if there is some changes related to the EPSG-HSQL plugin rather then the EPSG
      * database itself (for example additional database index).
      */
-    public static final Version VERSION = new Version("8.6.0.0");
+    public static final Version VERSION = new Version("8.6.0.1");
 
     /**
      * The key for fetching the database directory from {@linkplain System#getProperty(String)
@@ -157,7 +157,7 @@ private static File getDirectory() {
 
     /** Returns the directory to uses in the temporary directory folder. */
     private static File getTemporaryDirectory() {
-        File directory = new File(System.getProperty("java.io.tmpdir", "."), "Geotools");
+        File directory = new File(System.getProperty("java.io.tmpdir", "."), "GeoTools");
         if (directory.isDirectory() || directory.mkdir()) {
             directory = new File(directory, "Databases/HSQL");
             if (directory.isDirectory() || directory.mkdirs()) {

diff --git a/...hsql/src/test/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactoryTest.java b/...hsql/src/test/java/org/geotools/referencing/factory/epsg/ThreadedHsqlEpsgFactoryTest.java
@@ -353,7 +353,7 @@ public void testTmpWithSpaces() throws Exception {
             assertNotNull(factory.createCoordinateReferenceSystem("EPSG:4326"));
             String creationMarker =
                     String.format(
-                            "Geotools/Databases/HSQL/v%s/EPSG_creation_marker.txt",
+                            "GeoTools/Databases/HSQL/v%s/EPSG_creation_marker.txt",
                             ThreadedHsqlEpsgFactory.VERSION);
             assertTrue((new File(tmpDir, creationMarker)).exists());
         } finally {

diff --git a/pom.xml b/pom.xml
@@ -997,7 +997,7 @@
       <dependency>
         <groupId>org.hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
-        <version>2.3.0</version>
+        <version>2.4.1</version>
       </dependency>
       <dependency>
         <groupId>org.openplans</groupId>