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 ```
geoserver · Jun 9, 2024 · 8d68ed2 · 8d68ed2
1 parent 782072c
commit 8d68ed2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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>