Skip to content

Commit

Permalink
Merge pull request #66 from groldan/maven_dependency_convergence
Browse files Browse the repository at this point in the history 
Maven dependency convergence enforcement
  • Loading branch information
@groldan
groldan committed Jun 9, 2024
2 parents 782072c + 1093cdb commit 16bd6a2
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 12 deletions.
29 changes: 29 additions & 0 deletions examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
81 changes: 81 additions & 0 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -433,6 +438,12 @@
<requireMavenVersion>
<version>[3.6.3,)</version>
</requireMavenVersion>
<dependencyConvergence>
<excludedScopes>test</excludedScopes>
<excludes>
<exclude>io.swagger.core.v3:swagger-annotations</exclude>
</excludes>
</dependencyConvergence>
</rules>
</configuration>
</execution>
Expand Down Expand Up @@ -497,5 +508,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>
33 changes: 24 additions & 9 deletions src/plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -178,19 +173,39 @@
<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>
<activation>
<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>
3 changes: 0 additions & 3 deletions src/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +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>
<!-- GeoTools version used by gs-acl-authorization, doesn't need to match any version used by GeoServer -->
<gt.version>31.0</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>
Expand Down

0 comments on commit 16bd6a2

Please sign in to comment.