ee10 versions update Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/connectors/jetty-http2-connector/pom.xml b/connectors/jetty-http2-connector/pom.xml index abd0cee..db93d6b 100644 --- a/connectors/jetty-http2-connector/pom.xml +++ b/connectors/jetty-http2-connector/pom.xml
@@ -48,6 +48,12 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -158,10 +164,22 @@ <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>jetty-http2-client</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.eclipse.jetty.http2</groupId> <artifactId>jetty-http2-client-transport</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.glassfish.jersey.containers</groupId>
diff --git a/connectors/jetty11-connector/pom.xml b/connectors/jetty11-connector/pom.xml index c25195f..228aba7 100644 --- a/connectors/jetty11-connector/pom.xml +++ b/connectors/jetty11-connector/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2023, 2024 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -151,6 +151,13 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <rulesToSkip>dependencyConvergence</rulesToSkip> + </configuration> + </plugin> </plugins> </build> </project> \ No newline at end of file
diff --git a/containers/jetty11-http/pom.xml b/containers/jetty11-http/pom.xml index c9f3bcf..1a669c0 100644 --- a/containers/jetty11-http/pom.xml +++ b/containers/jetty11-http/pom.xml
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2013, 2023 Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2013, 2024 Oracle and/or its affiliates. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v. 2.0, which is available at @@ -114,6 +114,13 @@ </instructions> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <configuration> + <rulesToSkip>dependencyConvergence</rulesToSkip> + </configuration> + </plugin> </plugins> <resources>
diff --git a/etc/jenkins/Jenkinsfile_ci_build b/etc/jenkins/Jenkinsfile_ci_build index 8f74bad..cc3401f 100644 --- a/etc/jenkins/Jenkinsfile_ci_build +++ b/etc/jenkins/Jenkinsfile_ci_build
@@ -34,6 +34,7 @@ steps { sh ''' bash ${WORKSPACE}/etc/jenkins/jenkins_build.sh + export EXCLUDE_ARGS=' -pl !:jersey-container-jetty11-http,!:jersey-jetty11-connector ' bash ${WORKSPACE}/etc/scripts/validation/dependency-convergence.sh ''' }
diff --git a/ext/bean-validation/pom.xml b/ext/bean-validation/pom.xml index ae8f5d8..39d32f2 100644 --- a/ext/bean-validation/pom.xml +++ b/ext/bean-validation/pom.xml
@@ -138,6 +138,12 @@ <dependency> <groupId>org.glassfish.expressly</groupId> <artifactId>expressly</artifactId> + <exclusions> + <exclusion> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
diff --git a/ext/cdi/jersey-weld2-se/pom.xml b/ext/cdi/jersey-weld2-se/pom.xml index 7d5e588..c16ad86 100644 --- a/ext/cdi/jersey-weld2-se/pom.xml +++ b/ext/cdi/jersey-weld2-se/pom.xml
@@ -66,6 +66,14 @@ <groupId>jakarta.inject</groupId> <artifactId>jakarta.inject-api</artifactId> </exclusion> + <exclusion> + <groupId>jakarta.el</groupId> + <artifactId>jakarta.el-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.annotation</groupId> + <artifactId>jakarta.annotation-api</artifactId> + </exclusion> </exclusions> </dependency> </dependencies>
diff --git a/media/json-binding/pom.xml b/media/json-binding/pom.xml index 7bc5769..17ebe68 100644 --- a/media/json-binding/pom.xml +++ b/media/json-binding/pom.xml
@@ -98,6 +98,10 @@ <groupId>org.glassfish</groupId> <artifactId>jakarta.json</artifactId> </exclusion> + <exclusion> + <groupId>org.eclipse.parsson</groupId> + <artifactId>parsson</artifactId> + </exclusion> </exclusions> </dependency>
diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml index 03ff1d3..9fa47bd 100644 --- a/media/moxy/pom.xml +++ b/media/moxy/pom.xml
@@ -111,6 +111,11 @@ </dependency> <dependency> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </dependency> + + <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>org.eclipse.persistence.moxy</artifactId> <exclusions> @@ -122,6 +127,14 @@ <groupId>org.eclipse.angus</groupId> <artifactId>angus-activation</artifactId> </exclusion> + <exclusion> + <groupId>jakarta.xml.bind</groupId> + <artifactId>jakarta.xml.bind-api</artifactId> + </exclusion> + <exclusion> + <groupId>jakarta.activation</groupId> + <artifactId>jakarta.activation-api</artifactId> + </exclusion> </exclusions> </dependency>
diff --git a/pom.xml b/pom.xml index 0d7206f..493e21f 100644 --- a/pom.xml +++ b/pom.xml
@@ -2291,8 +2291,8 @@ <jstl.version>3.0.0</jstl.version> <jta.api.version>2.0.1</jta.api.version> <istack.commons.runtime.version>4.1.2</istack.commons.runtime.version> - <jakarta.activation-api.version>2.1.2</jakarta.activation-api.version> - <jakarta.activation.version>2.0.1</jakarta.activation.version> + <jakarta.activation-api.version>2.1.3</jakarta.activation-api.version> + <jakarta.activation.version>2.0.2</jakarta.activation.version> <jakarta.el.version>5.0.1</jakarta.el.version> <jakarta.el.impl.version>5.0.0</jakarta.el.impl.version> <jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version> @@ -2302,18 +2302,18 @@ <jakarta.jsonp.version>2.1.3</jakarta.jsonp.version> <jakarta.persistence.version>3.1.0</jakarta.persistence.version> <jakarta.validation.api.version>3.0.2</jakarta.validation.api.version> - <jakarta.jaxb.api.version>4.0.1</jakarta.jaxb.api.version> - <jaxb.ri.version>4.0.4</jaxb.ri.version> + <jakarta.jaxb.api.version>4.0.2</jakarta.jaxb.api.version> + <jaxb.ri.version>4.0.5</jaxb.ri.version> <jaxrs.api.spec.version>3.1</jaxrs.api.spec.version> <jaxrs.api.impl.version>3.1.0</jaxrs.api.impl.version> <jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version> <jetty.version>12.0.7</jetty.version> <jetty9.version>9.4.54.v20240208</jetty9.version> <jetty11.version>11.0.20</jetty11.version> - <jetty.plugin.version>12.0.5</jetty.plugin.version> - <jsonb.api.version>3.0.0</jsonb.api.version> + <jetty.plugin.version>12.0.8</jetty.plugin.version> + <jsonb.api.version>3.0.1</jsonb.api.version> <jsonp.ri.version>1.1.5</jsonp.ri.version> - <jsonp.jaxrs.version>1.1.1</jsonp.jaxrs.version> + <jsonp.jaxrs.version>1.1.5</jsonp.jaxrs.version> <moxy.version>4.0.2</moxy.version> <yasson.version>3.0.3</yasson.version> <!-- END of Jakartified -->