Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[3.1] versions update #5593

Merged
merged 1 commit into from
Apr 5, 2024
Merged

[3.1] versions update #5593

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions connectors/jetty-http2-connector/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 8 additions & 1 deletion connectors/jetty11-connector/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
9 changes: 8 additions & 1 deletion containers/jetty11-http/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
1 change: 1 addition & 0 deletions etc/jenkins/Jenkinsfile_ci_build
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,7 @@ pipeline {
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
'''
}
6 changes: 6 additions & 0 deletions ext/bean-validation/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
8 changes: 8 additions & 0 deletions ext/cdi/jersey-weld2-se/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
4 changes: 4 additions & 0 deletions media/json-binding/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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>

13 changes: 13 additions & 0 deletions media/moxy/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -110,6 +110,11 @@
<version>${asm.version}</version>
</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>
@@ -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>

14 changes: 7 additions & 7 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -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 -->