[1.8.x backport] spring and hibernate dependencies bumping (geosoluti…

…ons-it#271) * bump spring version (geosolutions-it#262) * change hibernate and google genric-dao versions (geosolutions-it#270)
taba90 · Apr 28, 2022 · 71eac5f · 71eac5f
1 parent 4d7b699
commit 71eac5f
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/pom.xml b/src/pom.xml
@@ -74,7 +74,7 @@
         spring-security-core 3.0.4 requires spring-core 3.x, otherwise we'd normally use 2.5.6, which
         is what the rest of the app uses
         -->
-        <spring-version>5.3.9</spring-version>
+        <spring-version>5.3.18</spring-version>
 
         <!-- 2.5.6.SEC01 is the version used by smix-->
         <!-- 2.5.5       is the version used by memberService-->
@@ -123,8 +123,8 @@
 <!--        <postgis-jdbc-version>1.3.3</postgis-jdbc-version>-->
 
         <persistence-version>1.0</persistence-version>
-        <hibernate-version>5.5.0.Final</hibernate-version>
-        <hibernate-generic-dao-version>1.2.0</hibernate-generic-dao-version>
+        <hibernate-version>5.4.33.Final</hibernate-version>
+        <hibernate-generic-dao-version>geosolutions-1.3.0</hibernate-generic-dao-version>
         <asm-version>2.2.3</asm-version>
         <cglib-version>2.1_3</cglib-version>
         <guava-version>18.0</guava-version>
@@ -536,6 +536,14 @@
 		    <!-- =========================================================== -->
 		    <!--     SPRING                                                  -->
 		    <!-- =========================================================== -->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring-version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
@@ -731,7 +739,7 @@
             <dependency>
                 <groupId>com.googlecode.genericdao</groupId>
                 <artifactId>dao-hibernate</artifactId>
-                <version>1.3.0-SNAPSHOT</version>
+                <version>geosolutions-1.3.0</version>
             </dependency>
 
             <!--dependency>
@@ -742,7 +750,7 @@
             <dependency>
                 <groupId>com.googlecode.genericdao</groupId>
                 <artifactId>search-jpa-hibernate</artifactId>
-                <version>1.3.0-SNAPSHOT</version>
+                <version>geosolutions-1.3.0</version>
 <!--                <groupId>com.trg</groupId>
                 <artifactId>trg-search-jpa-hibernate</artifactId>
                 <version>${hibernate-generic-dao-version}</version>-->