add dependencyConvergence rule to the maven-enforcer-plugin Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/containers/pom.xml b/containers/pom.xml index 5e9e98f..00ee924 100644 --- a/containers/pom.xml +++ b/containers/pom.xml
@@ -61,6 +61,12 @@ <dependency> <groupId>jakarta.ws.rs</groupId> <artifactId>jakarta.ws.rs-api</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
diff --git a/examples/entity-filtering-security/pom.xml b/examples/entity-filtering-security/pom.xml index 79ba621..36427c2 100644 --- a/examples/entity-filtering-security/pom.xml +++ b/examples/entity-filtering-security/pom.xml
@@ -30,6 +30,12 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId>
diff --git a/examples/entity-filtering-selectable/pom.xml b/examples/entity-filtering-selectable/pom.xml index 463b10f..564e077 100644 --- a/examples/entity-filtering-selectable/pom.xml +++ b/examples/entity-filtering-selectable/pom.xml
@@ -30,6 +30,12 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId>
diff --git a/examples/entity-filtering/pom.xml b/examples/entity-filtering/pom.xml index 6c15e19..e7a4484 100644 --- a/examples/entity-filtering/pom.xml +++ b/examples/entity-filtering/pom.xml
@@ -30,6 +30,12 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId>
diff --git a/examples/open-tracing/pom.xml b/examples/open-tracing/pom.xml index 1bf2dc1..7c404ba 100644 --- a/examples/open-tracing/pom.xml +++ b/examples/open-tracing/pom.xml
@@ -52,7 +52,17 @@ <dependency> <groupId>com.uber.jaeger</groupId> <artifactId>jaeger-core</artifactId> - <version>0.20.0</version> + <version>0.27.0</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </exclusion> + </exclusions> </dependency>
diff --git a/ext/microprofile/mp-rest-client/pom.xml b/ext/microprofile/mp-rest-client/pom.xml index a07cb30..730b946 100644 --- a/ext/microprofile/mp-rest-client/pom.xml +++ b/ext/microprofile/mp-rest-client/pom.xml
@@ -37,7 +37,7 @@ <dependency> <groupId>org.eclipse.microprofile.config</groupId> <artifactId>microprofile-config-api</artifactId> - <version>1.3</version> + <version>1.4</version> </dependency> <dependency> <groupId>org.glassfish.jersey.core</groupId>
diff --git a/ext/spring4/pom.xml b/ext/spring4/pom.xml index 4ac0dc6..70ff798 100644 --- a/ext/spring4/pom.xml +++ b/ext/spring4/pom.xml
@@ -88,6 +88,18 @@ <groupId>org.glassfish.hk2</groupId> <artifactId>hk2-api</artifactId> </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-context</artifactId> + </exclusion> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-beans</artifactId> + </exclusion> </exclusions> </dependency>
diff --git a/incubator/html-json/pom.xml b/incubator/html-json/pom.xml index 1602636..1714b34 100644 --- a/incubator/html-json/pom.xml +++ b/incubator/html-json/pom.xml
@@ -40,6 +40,7 @@ <properties> <net.java.html.version>1.5.1</net.java.html.version> + <enforcer.skip>true</enforcer.skip> </properties> <dependencies>
diff --git a/media/json-jackson/pom.xml b/media/json-jackson/pom.xml index ccfb15a..d99b900 100644 --- a/media/json-jackson/pom.xml +++ b/media/json-jackson/pom.xml
@@ -95,6 +95,12 @@ <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.ext</groupId> @@ -121,6 +127,12 @@ <dependency> <groupId>com.fasterxml.jackson.module</groupId> <artifactId>jackson-module-jaxb-annotations</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId>
diff --git a/pom.xml b/pom.xml index 5d47d1b..2ed2d53 100644 --- a/pom.xml +++ b/pom.xml
@@ -236,7 +236,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>3.0.0-M2</version> + <version>3.1.0</version> <executions> <execution> <id>enforce-versions</id> @@ -248,6 +248,7 @@ <requireJavaVersion> <version>${java.version}</version> </requireJavaVersion> + <dependencyConvergence/> </rules> </configuration> </execution> @@ -2192,7 +2193,7 @@ <rxjava2.version>2.0.4</rxjava2.version> <simple.version>6.0.1</simple.version> <skip.e2e>false</skip.e2e> - <slf4j.version>1.7.21</slf4j.version> + <slf4j.version>2.0.3</slf4j.version> <spring4.version>4.3.20.RELEASE</spring4.version> <spring5.version>5.3.18</spring5.version> <surefire.version>3.0.0-M5</surefire.version> @@ -2216,7 +2217,7 @@ <hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,4)"</hk2.osgi.version> <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version> <hk2.config.version>5.1.0</hk2.config.version> - <istack.commons.runtime.version>3.0.8</istack.commons.runtime.version> + <istack.commons.runtime.version>3.0.12</istack.commons.runtime.version> <jakarta.activation.version>1.2.2</jakarta.activation.version> <javax.el.version>3.0.3</javax.el.version> <javax.el.impl.version>3.0.4</javax.el.impl.version> @@ -2231,7 +2232,7 @@ <jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version> <jetty.plugin.version>6.1.26</jetty.plugin.version> <jetty.osgi.version>org.eclipse.jetty.*;version="[9.4,11)"</jetty.osgi.version> - <jetty.version>9.4.46.v20220331</jetty.version> + <jetty.version>9.4.49.v20220914</jetty.version> <jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version> <jsonb.api.version>1.0.2</jsonb.api.version> <jsonp.ri.version>1.1.6</jsonp.ri.version>
diff --git a/security/oauth2-client/pom.xml b/security/oauth2-client/pom.xml index e9f8c7f..84afcd6 100644 --- a/security/oauth2-client/pom.xml +++ b/security/oauth2-client/pom.xml
@@ -57,6 +57,12 @@ <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-client</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <!--<dependency>-->
diff --git a/test-framework/maven/container-runner-maven-plugin/pom.xml b/test-framework/maven/container-runner-maven-plugin/pom.xml index 4b98928..c7571c3 100644 --- a/test-framework/maven/container-runner-maven-plugin/pom.xml +++ b/test-framework/maven/container-runner-maven-plugin/pom.xml
@@ -39,8 +39,8 @@ <groovy.version>3.0.2</groovy.version> <groovy-eclipse-compiler.version>3.6.0-03</groovy-eclipse-compiler.version> <groovy-eclipse-batch.version>3.0.2-02</groovy-eclipse-batch.version> - <maven.version>3.6.0</maven.version> - <maven-plugin.version>3.6.0</maven-plugin.version> + <maven.version>3.8.6</maven.version> + <maven-plugin.version>3.6.4</maven-plugin.version> </properties> <dependencies> @@ -49,16 +49,37 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <version>${maven.version}</version> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-annotations</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-classworlds</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> <version>${maven.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> <version>${maven.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.maven</groupId> @@ -71,6 +92,7 @@ <groupId>org.apache.maven</groupId> <artifactId>maven-artifact</artifactId> <version>${maven.version}</version> + <scope>provided</scope> </dependency> <!-- dependencies to annotations --> @@ -98,7 +120,41 @@ <dependency> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> - <version>1.7.0</version> + <version>1.13.1</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-shared-utils</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-interpolation</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -107,10 +163,26 @@ </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4j.version}</version> + </dependency> + + <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-all</artifactId> <type>pom</type> <version>${groovy.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
diff --git a/test-framework/maven/custom-enforcer-rules/pom.xml b/test-framework/maven/custom-enforcer-rules/pom.xml index ad2c6fe..46b9a43 100644 --- a/test-framework/maven/custom-enforcer-rules/pom.xml +++ b/test-framework/maven/custom-enforcer-rules/pom.xml
@@ -34,12 +34,32 @@ <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-enforcer-plugin</artifactId> - <version>1.4.1</version> + <version>3.1.0</version> <exclusions> <exclusion> <groupId>junit</groupId> <artifactId>junit</artifactId> </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-classworlds</artifactId> + </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.aether</groupId> + <artifactId>aether-util</artifactId> + </exclusion> </exclusions> </dependency>
diff --git a/test-framework/providers/bundle/pom.xml b/test-framework/providers/bundle/pom.xml index 057f0b6..467b4db 100644 --- a/test-framework/providers/bundle/pom.xml +++ b/test-framework/providers/bundle/pom.xml
@@ -62,6 +62,12 @@ <groupId>org.glassfish.jersey.test-framework.providers</groupId> <artifactId>jersey-test-framework-provider-jetty</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/tests/integration/j-376/pom.xml b/tests/integration/j-376/pom.xml index 0e49f70..d6453e7 100644 --- a/tests/integration/j-376/pom.xml +++ b/tests/integration/j-376/pom.xml
@@ -86,7 +86,6 @@ <dependency> <groupId>org.glassfish.grizzly</groupId> <artifactId>grizzly-http-server</artifactId> - <version>2.3.16</version> <scope>compile</scope> </dependency>
diff --git a/tests/integration/jersey-2689/pom.xml b/tests/integration/jersey-2689/pom.xml index b6409a5..07de126 100644 --- a/tests/integration/jersey-2689/pom.xml +++ b/tests/integration/jersey-2689/pom.xml
@@ -61,6 +61,12 @@ <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> <version>${jackson.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
diff --git a/tests/integration/microprofile/config/webapp/pom.xml b/tests/integration/microprofile/config/webapp/pom.xml index b58f943..3e21f2e 100644 --- a/tests/integration/microprofile/config/webapp/pom.xml +++ b/tests/integration/microprofile/config/webapp/pom.xml
@@ -33,6 +33,12 @@ <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.bundles</groupId>
diff --git a/tests/osgi/functional/pom.xml b/tests/osgi/functional/pom.xml index 681e8fd..5b0a889 100644 --- a/tests/osgi/functional/pom.xml +++ b/tests/osgi/functional/pom.xml
@@ -426,4 +426,8 @@ </profile> </profiles> + <properties> + <enforcer.skip>true</enforcer.skip> + </properties> + </project>
diff --git a/tests/performance/benchmarks/pom.xml b/tests/performance/benchmarks/pom.xml index b8b6a67..b977edc 100644 --- a/tests/performance/benchmarks/pom.xml +++ b/tests/performance/benchmarks/pom.xml
@@ -37,6 +37,12 @@ <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-server</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.media</groupId>