From d24d3c6eac40373f14d97bb73404484b060e9cf5 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sat, 3 Aug 2024 17:14:45 -0300
Subject: [PATCH 1/5] Dependency upgrade: geoserverver:2.25.2.1-CLOUD ->
 2.25.3.0-CLOUD

---
 src/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pom.xml b/src/pom.xml
index 211437678..b2fa20196 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -25,8 +25,8 @@
     <spring.version>5.3.37</spring.version>
     <spring.security.version>5.7.12</spring.security.version>
     <jackson.version>2.17.1</jackson.version>
-    <gs.version>2.25.2.1-CLOUD</gs.version>
-    <gt.version>31-SNAPSHOT</gt.version>
+    <gs.version>2.25.3.0-CLOUD</gs.version>
+    <gt.version>31.3</gt.version>
     <acl.version>2.2.0</acl.version>
     <!-- Downgrade netty.version used by spring-boot to the one used by geoserver azure client
     (software.amazon.awssdk:netty-nio-client:jar:2.9.24) for COG and GWC Azure plugin -->

From 88d224cdd39d7f7cd08e7c423d7e561cb88cfeda Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sat, 3 Aug 2024 17:26:31 -0300
Subject: [PATCH 2/5] Exclude gt depenedencies from gs-gwc, for geoserver
 2.25.3, gwc is 1.25-SNAPSHOT and carries over gt:31-SNAPSHOT

---
 src/pom.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pom.xml b/src/pom.xml
index b2fa20196..9bbe63f5e 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -28,6 +28,7 @@
     <gs.version>2.25.3.0-CLOUD</gs.version>
     <gt.version>31.3</gt.version>
     <acl.version>2.2.0</acl.version>
+    <postgresql.version>42.7.3</postgresql.version>
     <!-- Downgrade netty.version used by spring-boot to the one used by geoserver azure client
     (software.amazon.awssdk:netty-nio-client:jar:2.9.24) for COG and GWC Azure plugin -->
     <netty.version>4.1.46.Final</netty.version>
@@ -483,6 +484,11 @@
         <artifactId>gs-gwc</artifactId>
         <version>${gs.version}</version>
         <exclusions>
+          <exclusion>
+            <!-- exclude gt depenedencies, for geoserver 2.25.3, gwc is 1.25-SNAPSHOT and carries over gt:31-SNAPSHOT -->
+            <groupId>org.geotools</groupId>
+            <artifactId>*</artifactId>
+          </exclusion>
           <exclusion>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -1200,7 +1206,7 @@
           <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>42.7.3</version>
+            <version>${postgresql.version}</version>
           </dependency>
           <dependency>
             <groupId>com.jayway.jsonpath</groupId>

From f2b5e0bc3af6487db37ecefa4cbf394101190e50 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sat, 3 Aug 2024 17:28:05 -0300
Subject: [PATCH 3/5] Dependency upgrade: jackson:2.17.1 -> 2.17.2

---
 src/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pom.xml b/src/pom.xml
index 9bbe63f5e..252c58144 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -24,7 +24,7 @@
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring.version>5.3.37</spring.version>
     <spring.security.version>5.7.12</spring.security.version>
-    <jackson.version>2.17.1</jackson.version>
+    <jackson.version>2.17.2</jackson.version>
     <gs.version>2.25.3.0-CLOUD</gs.version>
     <gt.version>31.3</gt.version>
     <acl.version>2.2.0</acl.version>

From f7b4ba631fac4dd7ea59c285918377d9c50573cb Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sat, 3 Aug 2024 17:28:24 -0300
Subject: [PATCH 4/5] Set maven.compiler.source/target to 21

---
 src/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pom.xml b/src/pom.xml
index 252c58144..c7013ae7b 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -18,8 +18,8 @@
     <module>integration-tests</module>
   </modules>
   <properties>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <maven.compiler.source>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <spring-cloud.version>2021.0.9</spring-cloud.version>
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring.version>5.3.37</spring.version>

From c57d6c4f62a567e98acc3e40a67f46f83db1c9ad Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 4 Aug 2024 23:51:58 -0300
Subject: [PATCH 5/5] Set geoserver dependency version to 2.25.3.0-SNAPSHOT

---
 src/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pom.xml b/src/pom.xml
index c7013ae7b..8e39b5e7f 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -25,7 +25,7 @@
     <spring.version>5.3.37</spring.version>
     <spring.security.version>5.7.12</spring.security.version>
     <jackson.version>2.17.2</jackson.version>
-    <gs.version>2.25.3.0-CLOUD</gs.version>
+    <gs.version>2.25.3.0-SNAPSHOT</gs.version>
     <gt.version>31.3</gt.version>
     <acl.version>2.2.0</acl.version>
     <postgresql.version>42.7.3</postgresql.version>