#166 adjust jts and hibernate-spatial versions

Other minor alignments
geoserver · Feb 9, 2021 · 5bf7670 · 5bf7670
1 parent 2c4d4db
commit 5bf7670
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 21 deletions.
diff --git a/src/gui/pom.xml b/src/gui/pom.xml
@@ -35,8 +35,6 @@
         <jaxws-version>2.1</jaxws-version>
         <cxf-version>3.1.5</cxf-version>
 
-        <hibernate-version>3.6.0.Final</hibernate-version>
-        <hibernate-generic-dao-version>1.1.0</hibernate-generic-dao-version>
         <asm-version>2.2.3</asm-version>
         <cglib-version>2.2</cglib-version>
 
@@ -566,7 +564,7 @@
             <dependency>
                 <groupId>org.locationtech.jts</groupId>
                 <artifactId>jts-core</artifactId>
-                <version>1.15.1</version>
+                <version>${jts.version}</version>
             </dependency>
 
             <!-- =========================================================== -->

diff --git a/src/gui/web/pom.xml b/src/gui/web/pom.xml
@@ -367,6 +367,7 @@
                                 <delete dir="gwt-unitCache"/>
                                 <delete dir="war/WEB-INF/deploy"/>
                                 <delete dir="war/WEB-INF/classes"/>
+                                <delete dir="war/WEB-INF/spatial-lib"/>
                                 <!-- 								 -->
                                 <!--
                               these entries are in the gitignore file

diff --git a/src/pom.xml b/src/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-/* (c) 2014-2016 Open Source Geospatial Foundation - all rights reserved
+/* (c) 2014-2021 Open Source Geospatial Foundation - all rights reserved
  * This code is licensed under the GPL 2.0 license, available at the root
  * application directory.
  */
@@ -14,12 +14,13 @@
    <packaging>pom</packaging>
 
    <properties>
+     <geofence-version>3.4.6.1</geofence-version>
      <hibernate-version>3.6.9.Final</hibernate-version>
      <hibernate-generic-dao-version>1.1.0</hibernate-generic-dao-version>
-     <hibernate-spatial-version>1.1.3.1</hibernate-spatial-version>
-     <hibernate-spatial-h2-version>1.1.3.1</hibernate-spatial-h2-version>
-     <postgresql.jdbc.version>42.1.1</postgresql.jdbc.version>
+     <hibernate-spatial-version>1.1.3.2</hibernate-spatial-version>
+     <postgresql.jdbc.version>42.2.18</postgresql.jdbc.version>
      <postgis.jdbc.version>1.3.3</postgis.jdbc.version>
+     <jts.version>1.17.1</jts.version>
    </properties>
 
    <name>Master GeoFence POM</name>

diff --git a/src/services/core/persistence/pom.xml b/src/services/core/persistence/pom.xml
@@ -175,10 +175,6 @@
         </dependency>
 
 		<!-- CGLIB -->
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-        </dependency>
         <dependency>
             <groupId>cglib</groupId>
             <artifactId>cglib-nodep</artifactId>

diff --git a/src/services/pom.xml b/src/services/pom.xml
@@ -27,7 +27,6 @@
     </modules>
 
     <properties>
-        <geofence-version>3.4.6</geofence-version>
         <main-prefix>geofence</main-prefix>
 
         <gt-version>25-SNAPSHOT</gt-version>
@@ -47,13 +46,6 @@
         <xml-apis-version>1.3.03</xml-apis-version>
         <jaxws-version>2.1</jaxws-version>
 
-        <hibernate-version>3.6.9.Final</hibernate-version>
-        <hibernate-generic-dao-version>1.1.0</hibernate-generic-dao-version>
-        <hibernate-spatial-version>1.1.3.1</hibernate-spatial-version>
-        <hibernate-spatial-h2-version>1.1.3.1</hibernate-spatial-h2-version>
-        <postgresql.jdbc.version>42.1.1</postgresql.jdbc.version>
-        <postgis.jdbc.version>1.3.3</postgis.jdbc.version>
-
         <commons-logging-version>1.1.2</commons-logging-version>
         <commons-lang-version>2.3</commons-lang-version>
         <commons-collections-version>3.2</commons-collections-version>
@@ -73,7 +65,6 @@
         <spring-support>2.0.8</spring-support>
         <spring-ws-version>1.0.1</spring-ws-version>
         <aspectj-version>1.5.4</aspectj-version>
-        <ubl-version>2.0</ubl-version>
         <jetty-version>9.2.13.v20150730</jetty-version>
         <jettison-version>1.2</jettison-version>
 
@@ -709,7 +700,7 @@
             <dependency>
                 <groupId>org.locationtech.jts</groupId>
                 <artifactId>jts-core</artifactId>
-                <version>1.15.1</version>
+                <version>${jts.version}</version>
             </dependency>
 
 		    <!-- =========================================================== -->