Merge pull request #596 from groldan/upgrade_1.9.x_to_geoserver_2.26.1.2

Upgrade 1.9.x to geoserver 2.26.1.2
geoserver · Jan 27, 2025 · 8cabed0 · 8cabed0
2 parents 44ddecf + 7f21bcd
commit 8cabed0
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/pom.xml b/src/pom.xml
@@ -23,10 +23,10 @@
     <spring-cloud.version>2021.0.9</spring-cloud.version>
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring.version>5.3.39</spring.version>
-    <spring.security.version>5.8.15</spring.security.version>
+    <spring.security.version>5.8.16</spring.security.version>
     <jackson.version>2.17.2</jackson.version>
-    <gs.version>2.26.1.1</gs.version>
-    <gt.version>32.1</gt.version>
+    <gs.version>2.26.1.2</gs.version>
+    <gt.version>32-SNAPSHOT</gt.version>
     <acl.version>2.3.1</acl.version>
     <postgresql.version>42.7.3</postgresql.version>
     <!-- Same netty.version used by geoserver for COG and GWC Azure plugin -->
@@ -1060,6 +1060,12 @@
       </activation>
       <dependencyManagement>
         <dependencies>
+          <dependency>
+            <!-- GeoServer 2.26.x is at 1.79, where spring-boot:2.7.18 is at 1.73 -->
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk18on</artifactId>
+            <version>1.79</version>
+          </dependency>
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-bom</artifactId>