From 8d68ed223618e24f5a30c1e80a13eaad2ad66e0d Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:39:45 -0300
Subject: [PATCH 01/16] Fix dependency convergence error on
 javax.measure:unit-api:jar:2.2/2.1.2 from GeoTools

```
[ERROR] Rule 2: org.apache.maven.enforcer.rules.dependency.DependencyConvergence failed with message:
[ERROR] Failed while enforcing releasability.
[ERROR]
[ERROR] Dependency convergence error for javax.measure:unit-api:jar:2.1.2 paths to dependency are:
[ERROR] +-org.geoserver.acl:gs-acl-authorization:jar:2.3-SNAPSHOT
[ERROR]   +-org.geotools:gt-main:jar:32-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-referencing:jar:32-SNAPSHOT:provided
[ERROR]       +-org.geotools:gt-metadata:jar:32-SNAPSHOT:provided
[ERROR]         +-org.geotools:gt-api:jar:32-SNAPSHOT:provided
[ERROR]           +-systems.uom:systems-common:jar:2.1:provided
[ERROR]             +-javax.measure:unit-api:jar:2.1.2:provided
[ERROR] and
[ERROR] +-org.geoserver.acl:gs-acl-authorization:jar:2.3-SNAPSHOT
[ERROR]   +-org.geotools:gt-main:jar:32-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-referencing:jar:32-SNAPSHOT:provided
[ERROR]       +-org.geotools:gt-metadata:jar:32-SNAPSHOT:provided
[ERROR]         +-org.geotools:gt-api:jar:32-SNAPSHOT:provided
[ERROR]           +-systems.uom:systems-common:jar:2.1:provided
[ERROR]             +-si.uom:si-quantity:jar:2.1:provided
[ERROR]               +-javax.measure:unit-api:jar:2.1.2:provided
[ERROR] and
[ERROR] +-org.geoserver.acl:gs-acl-authorization:jar:2.3-SNAPSHOT
[ERROR]   +-org.geotools:gt-main:jar:32-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-referencing:jar:32-SNAPSHOT:provided
[ERROR]       +-org.geotools:gt-metadata:jar:32-SNAPSHOT:provided
[ERROR]         +-org.geotools:gt-api:jar:32-SNAPSHOT:provided
[ERROR]           +-systems.uom:systems-common:jar:2.1:provided
[ERROR]             +-si.uom:si-units:jar:2.1:provided
[ERROR]               +-javax.measure:unit-api:jar:2.1.2:provided
[ERROR] and
[ERROR] +-org.geoserver.acl:gs-acl-authorization:jar:2.3-SNAPSHOT
[ERROR]   +-org.geotools:gt-main:jar:32-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-referencing:jar:32-SNAPSHOT:provided
[ERROR]       +-org.geotools:gt-metadata:jar:32-SNAPSHOT:provided
[ERROR]         +-org.geotools:gt-api:jar:32-SNAPSHOT:provided
[ERROR]           +-tech.units:indriya:jar:2.2:provided
[ERROR]             +-javax.measure:unit-api:jar:2.2:provided
[ERROR] and
[ERROR] +-org.geoserver.acl:gs-acl-authorization:jar:2.3-SNAPSHOT
[ERROR]   +-org.geotools:gt-main:jar:32-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-referencing:jar:32-SNAPSHOT:provided
[ERROR]       +-org.geotools:gt-metadata:jar:32-SNAPSHOT:provided
[ERROR]         +-org.geotools:gt-api:jar:32-SNAPSHOT:provided
[ERROR]           +-tech.units:indriya:jar:2.2:provided
[ERROR]             +-tech.uom.lib:uom-lib-common:jar:2.2:provided
[ERROR]               +-javax.measure:unit-api:jar:2.2:provided

```
---
 pom.xml            |  3 +++
 src/plugin/pom.xml |  5 -----
 src/pom.xml        | 22 +++++++++++++++++++++-
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index ae56191..b6abe67 100644
--- a/pom.xml
+++ b/pom.xml
@@ -433,6 +433,9 @@
                 <requireMavenVersion>
                   <version>[3.6.3,)</version>
                 </requireMavenVersion>
+                <dependencyConvergence>
+                  <excludedScopes>test</excludedScopes>
+                </dependencyConvergence>
               </rules>
             </configuration>
           </execution>
diff --git a/src/plugin/pom.xml b/src/plugin/pom.xml
index dd7e171..33e67b1 100644
--- a/src/plugin/pom.xml
+++ b/src/plugin/pom.xml
@@ -18,11 +18,6 @@
     <module>config</module>
     <module>plugin</module>
   </modules>
-  <properties>
-    <!-- Default GeoServer version to build and test the plugin against-->
-    <gs.version>2.26-SNAPSHOT</gs.version>
-    <gt.version>32-SNAPSHOT</gt.version>
-  </properties>
   <dependencyManagement>
     <dependencies>
       <dependency>
diff --git a/src/pom.xml b/src/pom.xml
index 6b7934f..b96fb53 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -28,8 +28,10 @@
     <spring-cloud.version>2021.0.8</spring-cloud.version>
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring-boot-3.version>3.2.4</spring-boot-3.version>
+    <!-- Default GeoServer version to build and test the plugin against-->
+    <gs.version>2.26-SNAPSHOT</gs.version>
     <!-- GeoTools version used by gs-acl-authorization, doesn't need to match any version used by GeoServer -->
-    <gt.version>31.0</gt.version>
+    <gt.version>32-SNAPSHOT</gt.version>
     <jts.version>1.19.0</jts.version>
     <lombok.version>1.18.32</lombok.version>
     <mapstruct.version>1.6.0.Beta1</mapstruct.version>
@@ -209,4 +211,22 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>dependencyConvergence</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>javax.measure</groupId>
+            <artifactId>unit-api</artifactId>
+            <version>2.2</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
+
+  </profiles>
 </project>

From 00065b1b412d92c23b72b5198528a01996cb34d3 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:46:57 -0300
Subject: [PATCH 02/16] Fix dependency convergence on
 com.google.guava:guava:jar:33.2.0-jre/32.0.0-jre

```
[ERROR] Rule 2: org.apache.maven.enforcer.rules.dependency.DependencyConvergence failed with message:
[ERROR] Failed while enforcing releasability.
[ERROR]
[ERROR] Dependency convergence error for com.google.guava:guava:jar:33.2.0-jre paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geoserver:gs-ows:jar:2.26-SNAPSHOT:provided
[ERROR]       +-com.google.guava:guava:jar:33.2.0-jre:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-coverage:jar:32-SNAPSHOT:provided
[ERROR]       +-it.geosolutions.jaiext.stats:jt-stats:jar:1.1.25:provided
[ERROR]         +-com.google.guava:guava:jar:32.0.0-jre:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-com.google.guava:guava:jar:33.2.0-jre:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-it.geosolutions.jaiext.concurrent-tile-cache:jt-concurrent-tile-cache:jar:1.1.25:provided
[ERROR]       +-com.google.guava:guava:jar:32.0.0-jre:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index b96fb53..bcdb4d7 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -224,6 +224,11 @@
             <artifactId>unit-api</artifactId>
             <version>2.2</version>
           </dependency>
+          <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.2.0-jre</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>

From 80e3eb50d6d47b25e15c8d11533997632aa3c9e8 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:49:41 -0300
Subject: [PATCH 03/16] Fix dependency convergence error on
 commons-beanutils:commons-beanutils:jar:1.9.4/1.8.0

```
[ERROR] Rule 2: org.apache.maven.enforcer.rules.dependency.DependencyConvergence failed with message:
[ERROR] Failed while enforcing releasability.
[ERROR]
[ERROR] Dependency convergence error for commons-beanutils:commons-beanutils:jar:1.8.0 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-net.sf.json-lib:json-lib:jar:2.4.2-geoserver:provided
[ERROR]       +-commons-beanutils:commons-beanutils:jar:1.8.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-commons-beanutils:commons-beanutils:jar:1.9.4:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-imagemosaic:jar:32-SNAPSHOT:provided
[ERROR]       +-commons-beanutils:commons-beanutils:jar:1.9.4:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index bcdb4d7..ba3e67e 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -229,6 +229,11 @@
             <artifactId>guava</artifactId>
             <version>33.2.0-jre</version>
           </dependency>
+          <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>

From 4f98cb703f5704c7109b668310a1cf9842723ada Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:51:59 -0300
Subject: [PATCH 04/16] Fix dependency convergence error on
 commons-collections:commons-collections:jar:3.2.2/3.2.1

```
[ERROR] Rule 2: org.apache.maven.enforcer.rules.dependency.DependencyConvergence failed with message:
[ERROR] Failed while enforcing releasability.
[ERROR]
[ERROR] Dependency convergence error for commons-collections:commons-collections:jar:3.2.1 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-net.sf.json-lib:json-lib:jar:2.4.2-geoserver:provided
[ERROR]       +-commons-collections:commons-collections:jar:3.2.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-commons-beanutils:commons-beanutils:jar:1.9.4:provided
[ERROR]       +-commons-collections:commons-collections:jar:3.2.2:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index ba3e67e..7df2b86 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -234,6 +234,11 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.4</version>
           </dependency>
+          <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>

From 3c9cd7814c1d44f66cb5ac142a308e9a32079f3f Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:53:42 -0300
Subject: [PATCH 05/16] Fix dependency convergence error on
 commons-lang:commons-lang:jar:2.5/2.3

```
[ERROR] Rule 2: org.apache.maven.enforcer.rules.dependency.DependencyConvergence failed with message:
[ERROR] Failed while enforcing releasability.
[ERROR]
[ERROR] Dependency convergence error for commons-lang:commons-lang:jar:2.5 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-net.sf.json-lib:json-lib:jar:2.4.2-geoserver:provided
[ERROR]       +-commons-lang:commons-lang:jar:2.5:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-net.sf.json-lib:json-lib:jar:2.4.2-geoserver:provided
[ERROR]       +-net.sf.ezmorph:ezmorph:jar:1.0.6:provided
[ERROR]         +-commons-lang:commons-lang:jar:2.3:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index 7df2b86..2f3cbed 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -239,6 +239,11 @@
             <artifactId>commons-collections</artifactId>
             <version>3.2.2</version>
           </dependency>
+          <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.5</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>

From 0dcc54e7651fedb863e91b3e3d89e3655777f249 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:55:23 -0300
Subject: [PATCH 06/16] Fix dependency convergence error on
 commons-logging:commons-logging:jar:1.2/1.1.1/1.0.4

```
[ERROR] Dependency convergence error for commons-logging:commons-logging:jar:1.1.1 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-net.sf.json-lib:json-lib:jar:2.4.2-geoserver:provided
[ERROR]       +-commons-logging:commons-logging:jar:1.1.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-commons-beanutils:commons-beanutils:jar:1.9.4:provided
[ERROR]       +-commons-logging:commons-logging:jar:1.2:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geoserver:gs-platform:jar:2.26-SNAPSHOT:provided
[ERROR]       +-org.apache.logging.log4j:log4j-jcl:jar:2.17.2:provided
[ERROR]         +-commons-logging:commons-logging:jar:1.2:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-wms:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-svg:jar:32-SNAPSHOT:provided
[ERROR]       +-org.apache.xmlgraphics:batik-transcoder:jar:1.17:provided
[ERROR]         +-org.apache.xmlgraphics:batik-awt-util:jar:1.17:provided
[ERROR]           +-org.apache.xmlgraphics:xmlgraphics-commons:jar:2.9:provided
[ERROR]             +-commons-logging:commons-logging:jar:1.0.4:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-wms:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.apache.httpcomponents:httpclient-cache:jar:4.5.14:provided
[ERROR]       +-commons-logging:commons-logging:jar:1.2:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index 2f3cbed..4b10c5d 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -244,6 +244,11 @@
             <artifactId>commons-lang</artifactId>
             <version>2.5</version>
           </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>

From 6f6c0631b36792fc6d70ac64914d1db19935dced Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:57:41 -0300
Subject: [PATCH 07/16] Fix dependency convergence error on
 commons-io:commons-io:jar:2.16.1/2.11.0

```
[ERROR] Dependency convergence error for commons-io:commons-io:jar:2.16.1 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geoserver:gs-ows:jar:2.26-SNAPSHOT:provided
[ERROR]       +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geoserver:gs-ows:jar:2.26-SNAPSHOT:provided
[ERROR]       +-org.geotools.xsd:gt-xsd-core:jar:32-SNAPSHOT:provided
[ERROR]         +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-commons-fileupload:commons-fileupload:jar:1.5:provided
[ERROR]       +-commons-io:commons-io:jar:2.11.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-coverage:jar:32-SNAPSHOT:provided
[ERROR]       +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-wfs-ng:jar:32-SNAPSHOT:provided
[ERROR]       +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-wms:jar:32-SNAPSHOT:provided
[ERROR]       +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-imagemosaic:jar:32-SNAPSHOT:provided
[ERROR]       +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geoserver:gs-platform:jar:2.26-SNAPSHOT:provided
[ERROR]       +-commons-io:commons-io:jar:2.16.1:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-wms:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-svg:jar:32-SNAPSHOT:provided
[ERROR]       +-org.apache.xmlgraphics:batik-transcoder:jar:1.17:provided
[ERROR]         +-org.apache.xmlgraphics:batik-awt-util:jar:1.17:provided
[ERROR]           +-org.apache.xmlgraphics:xmlgraphics-commons:jar:2.9:provided
[ERROR]             +-commons-io:commons-io:jar:2.11.0:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index 4b10c5d..41a585d 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -249,6 +249,11 @@
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
           </dependency>
+          <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.16.1</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>

From c60feff648ea7662aad1db8c7516598cc7e507e6 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 15:59:28 -0300
Subject: [PATCH 08/16] Fix dependency convergence error on
 com.google.code.findbugs:jsr305:jar:3.0.2/2.0.3

```
[ERROR] Dependency convergence error for com.google.code.findbugs:jsr305:jar:3.0.2 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-com.google.guava:guava:jar:33.2.0-jre:provided
[ERROR]       +-com.google.code.findbugs:jsr305:jar:3.0.2:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-com.google.code.findbugs:jsr305:jar:2.0.3:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-accessmanager:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-wms:jar:2.26-SNAPSHOT:provided
[ERROR]     +-com.github.librepdf:openpdf:jar:1.3.26:provided
[ERROR]       +-com.google.code.findbugs:jsr305:jar:3.0.2:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index 41a585d..d338743 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -229,6 +229,11 @@
             <artifactId>guava</artifactId>
             <version>33.2.0-jre</version>
           </dependency>
+          <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+          </dependency>
           <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

From aa56313828fccb7888c2fbfbbb46e17258381ffc Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:01:29 -0300
Subject: [PATCH 09/16] Fix dependency convergence error on
 org.checkerframework:checker-qual:jar:3.42.0/3.5.0

```
[ERROR] Dependency convergence error for org.checkerframework:checker-qual:jar:3.42.0 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-webui:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-com.google.guava:guava:jar:33.2.0-jre:provided
[ERROR]       +-org.checkerframework:checker-qual:jar:3.42.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-webui:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.web:gs-web-core:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools.jdbc:gt-jdbc-postgis:jar:32-SNAPSHOT:provided
[ERROR]       +-org.postgresql:postgresql:jar:42.3.8:provided
[ERROR]         +-org.checkerframework:checker-qual:jar:3.5.0:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index d338743..afd5003 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -234,6 +234,11 @@
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
           </dependency>
+          <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+            <version>3.42.0</version>
+          </dependency>
           <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

From 59023d6aaaf4ca356b3c244dcd81caf68fcb56eb Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:03:20 -0300
Subject: [PATCH 10/16] Fix dependency convergence error on
 org.apache.wicket:wicket-core:jar:7.18.0/7.0.0

```
[ERROR] Dependency convergence error for org.apache.wicket:wicket-core:jar:7.18.0 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-webui:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.web:gs-web-core:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.apache.wicket:wicket-core:jar:7.18.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-webui:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.web:gs-web-core:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.apache.wicket:wicket-extensions:jar:7.18.0:provided
[ERROR]       +-org.apache.wicket:wicket-core:jar:7.18.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-webui:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.web:gs-web-core:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.wicketstuff:wicketstuff-select2:jar:7.18.0:provided
[ERROR]       +-de.agilecoders.wicket.webjars:wicket-webjars:jar:0.5.3:provided
[ERROR]         +-org.apache.wicket:wicket-core:jar:7.0.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-webui:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.web:gs-web-core:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.wicketstuff:wicketstuff-select2:jar:7.18.0:provided
[ERROR]       +-org.apache.wicket:wicket-core:jar:7.18.0:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index afd5003..5458c8d 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -264,6 +264,11 @@
             <artifactId>commons-io</artifactId>
             <version>2.16.1</version>
           </dependency>
+          <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-core</artifactId>
+            <version>7.18.0</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>

From 4459339ea14c650b6d9b8aa7fe44b06514f85718 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:04:52 -0300
Subject: [PATCH 11/16] Fix dependency convergence error on
 org.apache.commons:commons-text:jar:1.12.0/1.7

```
[ERROR] Dependency convergence error for org.apache.commons:commons-text:jar:1.12.0 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-wps:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-main:jar:32-SNAPSHOT:provided
[ERROR]       +-org.apache.commons:commons-text:jar:1.12.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-wps:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.apache.commons:commons-text:jar:1.12.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-wps:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.extension:gs-wps-core:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.apache.commons:commons-text:jar:1.12.0:provided
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-plugin-wps:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.extension:gs-wps-core:jar:2.26-SNAPSHOT:provided
[ERROR]     +-org.geotools:gt-csv:jar:32-SNAPSHOT:provided
[ERROR]       +-com.opencsv:opencsv:jar:5.0:provided
[ERROR]         +-org.apache.commons:commons-text:jar:1.7:provided
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index 5458c8d..3fb160f 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -264,6 +264,11 @@
             <artifactId>commons-io</artifactId>
             <version>2.16.1</version>
           </dependency>
+          <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.12.0</version>
+          </dependency>
           <dependency>
             <groupId>org.apache.wicket</groupId>
             <artifactId>wicket-core</artifactId>

From 66dbf7cc3f6cf5a1e48407f2a1f06362b2fe14e1 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:07:09 -0300
Subject: [PATCH 12/16] Fix dependency convergence error on
 com.google.errorprone:error_prone_annotations:jar:2.26.1/2.21.1

```
[ERROR] Dependency convergence error for com.google.errorprone:error_prone_annotations:jar:2.21.1 paths to dependency are:
[ERROR] +-org.geoserver.acl.plugin:gs-acl-client-plugin:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.acl.plugin:gs-acl-plugin-client:jar:2.3-SNAPSHOT:compile
[ERROR]     +-org.geoserver.acl.integration:gs-acl-domain-spring-integration:jar:2.3-SNAPSHOT:compile
[ERROR]       +-com.github.ben-manes.caffeine:caffeine:jar:3.1.8:compile
[ERROR]         +-com.google.errorprone:error_prone_annotations:jar:2.21.1:compile
[ERROR] and
[ERROR] +-org.geoserver.acl.plugin:gs-acl-client-plugin:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver:gs-main:jar:2.26-SNAPSHOT:provided
[ERROR]     +-com.google.guava:guava:jar:33.2.0-jre:provided
[ERROR]       +-com.google.errorprone:error_prone_annotations:jar:2.26.1:compile
```
---
 src/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pom.xml b/src/pom.xml
index 3fb160f..1e55611 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -239,6 +239,11 @@
             <artifactId>checker-qual</artifactId>
             <version>3.42.0</version>
           </dependency>
+          <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <version>2.26.1</version>
+          </dependency>
           <dependency>
             <groupId>commons-beanutils</groupId>
             <artifactId>commons-beanutils</artifactId>

From 9b5d4c984bc95f5b8a2bb4fbab06f9a0954fbd06 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:11:25 -0300
Subject: [PATCH 13/16] Exclude dependency convergence test for
 io.swagger.core.v3:swagger-annotations

The dependency is used on artifacts for different spring versions, it's
ok they've different versions coming from different transitives.

```
[ERROR] Dependency convergence error for io.swagger.core.v3:swagger-annotations:jar:2.2.19 paths to dependency are:
[ERROR] +-org.geoserver.acl:gs-acl-service:jar:2.3-SNAPSHOT
[ERROR]   +-org.geoserver.acl.integration.openapi:gs-acl-api-impl:jar:2.3-SNAPSHOT:compile
[ERROR]     +-org.geoserver.acl.openapi.spring5:gs-acl-openapi-spring-server:jar:2.3-SNAPSHOT:compile
[ERROR]       +-org.geoserver.acl.openapi.spring5:gs-acl-openapi-model:jar:2.3-SNAPSHOT:compile
[ERROR]         +-io.swagger.core.v3:swagger-annotations:jar:2.2.19:compile
[ERROR] and
[ERROR] +-org.geoserver.acl:gs-acl-service:jar:2.3-SNAPSHOT
[ERROR]   +-org.springdoc:springdoc-openapi-ui:jar:1.8.0:compile
[ERROR]     +-org.springdoc:springdoc-openapi-webmvc-core:jar:1.8.0:compile
[ERROR]       +-org.springdoc:springdoc-openapi-common:jar:1.8.0:compile
[ERROR]         +-io.swagger.core.v3:swagger-core:jar:2.2.20:compile
[ERROR]           +-io.swagger.core.v3:swagger-annotations:jar:2.2.20:compile
```
---
 pom.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pom.xml b/pom.xml
index b6abe67..5a0bab7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -435,6 +435,9 @@
                 </requireMavenVersion>
                 <dependencyConvergence>
                   <excludedScopes>test</excludedScopes>
+                  <excludes>
+                    <exclude>io.swagger.core.v3:swagger-annotations</exclude>
+                  </excludes>
                 </dependencyConvergence>
               </rules>
             </configuration>

From e2effb348fc3b5063200ea66a3098b62efc0a426 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:19:10 -0300
Subject: [PATCH 14/16] Move dependencyConvergence maven profile to include the
 examples/ pom

---
 examples/pom.xml | 29 +++++++++++++++++++
 pom.xml          | 70 ++++++++++++++++++++++++++++++++++++++++++++++
 src/pom.xml      | 73 ------------------------------------------------
 3 files changed, 99 insertions(+), 73 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index ba57a14..8ad0ddd 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -19,4 +19,33 @@
   <modules>
     <module>java-client</module>
   </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven-and-java</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <dependencyConvergence>
+                  <excludedScopes>test</excludedScopes>
+                  <excludes>
+                    <exclude>io.swagger.core.v3:swagger-annotations</exclude>
+                    <exclude>org.springframework</exclude>
+                    <exclude>org.slf4j</exclude>
+                  </excludes>
+                </dependencyConvergence>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/pom.xml b/pom.xml
index 5a0bab7..3212541 100644
--- a/pom.xml
+++ b/pom.xml
@@ -503,5 +503,75 @@
         <module>examples</module>
       </modules>
     </profile>
+    <profile>
+      <id>dependencyConvergence</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <groupId>javax.measure</groupId>
+            <artifactId>unit-api</artifactId>
+            <version>2.2</version>
+          </dependency>
+          <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.2.0-jre</version>
+          </dependency>
+          <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+          </dependency>
+          <dependency>
+            <groupId>org.checkerframework</groupId>
+            <artifactId>checker-qual</artifactId>
+            <version>3.42.0</version>
+          </dependency>
+          <dependency>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <version>2.26.1</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-lang</groupId>
+            <artifactId>commons-lang</artifactId>
+            <version>2.5</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+          </dependency>
+          <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.16.1</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.12.0</version>
+          </dependency>
+          <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-core</artifactId>
+            <version>7.18.0</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
+    </profile>
   </profiles>
 </project>
diff --git a/src/pom.xml b/src/pom.xml
index 1e55611..385e853 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -211,77 +211,4 @@
       </plugin>
     </plugins>
   </build>
-  <profiles>
-    <profile>
-      <id>dependencyConvergence</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <dependencyManagement>
-        <dependencies>
-          <dependency>
-            <groupId>javax.measure</groupId>
-            <artifactId>unit-api</artifactId>
-            <version>2.2</version>
-          </dependency>
-          <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>33.2.0-jre</version>
-          </dependency>
-          <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-          </dependency>
-          <dependency>
-            <groupId>org.checkerframework</groupId>
-            <artifactId>checker-qual</artifactId>
-            <version>3.42.0</version>
-          </dependency>
-          <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <version>2.26.1</version>
-          </dependency>
-          <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4</version>
-          </dependency>
-          <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
-          </dependency>
-          <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.5</version>
-          </dependency>
-          <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.2</version>
-          </dependency>
-          <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.16.1</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.12.0</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.wicket</groupId>
-            <artifactId>wicket-core</artifactId>
-            <version>7.18.0</version>
-          </dependency>
-        </dependencies>
-      </dependencyManagement>
-    </profile>
-
-  </profiles>
 </project>

From b9bf2b65bdbab7842cc1bfc61ab6d8f985167c6f Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:34:08 -0300
Subject: [PATCH 15/16] Downgrade javax.measure:unit-api for gs_stable and
 gs_maintenance plugin profiles

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

diff --git a/src/plugin/pom.xml b/src/plugin/pom.xml
index 33e67b1..25be63e 100644
--- a/src/plugin/pom.xml
+++ b/src/plugin/pom.xml
@@ -173,9 +173,19 @@
         <activeByDefault>false</activeByDefault>
       </activation>
       <properties>
-        <gs.version>2.25.0</gs.version>
-        <gt.version>31.0</gt.version>
+        <gs.version>2.25.1</gs.version>
+        <gt.version>31.1</gt.version>
       </properties>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <!-- downgrade the root dependencyConvergence maven profile settled versions where appropriate -->
+            <groupId>javax.measure</groupId>
+            <artifactId>unit-api</artifactId>
+            <version>2.1.2</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
     </profile>
     <profile>
       <id>gs_maintenance</id>
@@ -183,9 +193,19 @@
         <activeByDefault>false</activeByDefault>
       </activation>
       <properties>
-        <gs.version>2.24.2</gs.version>
-        <gt.version>30.2</gt.version>
+        <gs.version>2.24.3</gs.version>
+        <gt.version>30.3</gt.version>
       </properties>
+      <dependencyManagement>
+        <dependencies>
+          <dependency>
+            <!-- downgrade the root dependencyConvergence maven profile settled versions where appropriate -->
+            <groupId>javax.measure</groupId>
+            <artifactId>unit-api</artifactId>
+            <version>2.1.2</version>
+          </dependency>
+        </dependencies>
+      </dependencyManagement>
     </profile>
   </profiles>
 </project>

From 1093cdb30641a077e6527ecc6894bfbec5b4bf81 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sun, 9 Jun 2024 16:47:00 -0300
Subject: [PATCH 16/16] Move default values for gs.version and gt.version to
 root pom

---
 pom.xml     | 5 +++++
 src/pom.xml | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3212541..c77f252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,6 +70,11 @@
   <properties>
     <revision>2.3-SNAPSHOT</revision>
     <java.version>17</java.version>
+    <!-- Default GeoServer version to build and test the plugin against-->
+    <gs.version>2.26-SNAPSHOT</gs.version>
+    <!-- GeoTools version used by gs-acl-authorization, doesn't need to match any version used by GeoServer -->
+    <gt.version>32-SNAPSHOT</gt.version>
+    <jts.version>1.19.0</jts.version>
     <fmt.action>format</fmt.action>
     <fmt.skip>false</fmt.skip>
     <openapi-generator-maven-plugin.version>7.0.1</openapi-generator-maven-plugin.version>
diff --git a/src/pom.xml b/src/pom.xml
index 385e853..595d081 100644
--- a/src/pom.xml
+++ b/src/pom.xml
@@ -28,11 +28,6 @@
     <spring-cloud.version>2021.0.8</spring-cloud.version>
     <spring-boot.version>2.7.18</spring-boot.version>
     <spring-boot-3.version>3.2.4</spring-boot-3.version>
-    <!-- Default GeoServer version to build and test the plugin against-->
-    <gs.version>2.26-SNAPSHOT</gs.version>
-    <!-- GeoTools version used by gs-acl-authorization, doesn't need to match any version used by GeoServer -->
-    <gt.version>32-SNAPSHOT</gt.version>
-    <jts.version>1.19.0</jts.version>
     <lombok.version>1.18.32</lombok.version>
     <mapstruct.version>1.6.0.Beta1</mapstruct.version>
     <testcontainers.version>1.19.7</testcontainers.version>