Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[3.0] versions update #5584

Merged
merged 2 commits into from
Mar 28, 2024
Merged
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion NOTICE.md
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@ Javassist Version 3.30.2-GA
* Project: http://www.javassist.org/
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.

Jackson JAX-RS Providers Version 2.16.2
Jackson JAX-RS Providers Version 2.17.0
* License: Apache License, 2.0
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
* Copyright: (c) 2009-2024 FasterXML, LLC. All rights reserved unless otherwise indicated.
Original file line number Diff line number Diff line change
@@ -119,7 +119,7 @@
<jersey.version>${project.version}</jersey.version>
<jetty.version>11.0.20</jetty.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.mvn.plugin.version>3.2.1</surefire.mvn.plugin.version>
<surefire.mvn.plugin.version>3.2.5</surefire.mvn.plugin.version>
<war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
</properties>
</project>
Original file line number Diff line number Diff line change
@@ -85,6 +85,6 @@
<jersey.version>${project.version}</jersey.version>
<junit-jupiter.version>5.10.2</junit-jupiter.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.mvn.plugin.version>3.2.1</surefire.mvn.plugin.version>
<surefire.mvn.plugin.version>3.2.5</surefire.mvn.plugin.version>
</properties>
</project>
9 changes: 9 additions & 0 deletions connectors/apache-connector/pom.xml
Original file line number Diff line number Diff line change
@@ -45,6 +45,10 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>

@@ -67,6 +71,11 @@
<artifactId>commons-codec</artifactId>
<version>${commons.codec.version}</version>
</dependency>

<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
</dependencies>

<build>
12 changes: 12 additions & 0 deletions connectors/jetty-http2-connector/pom.xml
Original file line number Diff line number Diff line change
@@ -48,10 +48,22 @@
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty.http2</groupId>
<artifactId>http2-http-client-transport</artifactId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
2 changes: 1 addition & 1 deletion examples/NOTICE.md
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ Javassist Version 3.30.2-GA
* Project: http://www.javassist.org/
* Copyright (C) 1999- Shigeru Chiba. All Rights Reserved.

Jackson JAX-RS Providers Version 2.16.2
Jackson JAX-RS Providers Version 2.17.0
* License: Apache License, 2.0
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
* Copyright: (c) 2009-2023 FasterXML, LLC. All rights reserved unless otherwise indicated.
2 changes: 1 addition & 1 deletion examples/extended-wadl-webapp/pom.xml
Original file line number Diff line number Diff line change
@@ -177,7 +177,7 @@
<dependency>
<groupId>jakarta.activation</groupId>
<artifactId>jakarta.activation-api</artifactId>
<version>${jakarta.activation.version}</version>
<version>${jakarta.activation-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
4 changes: 4 additions & 0 deletions examples/groovy/pom.xml
Original file line number Diff line number Diff line change
@@ -34,6 +34,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
2 changes: 1 addition & 1 deletion examples/helloworld-spring-annotations/pom.xml
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.2</version>
<version>${commons.logging.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
*/
public final class PackageVersion implements Versioned {
public final static Version VERSION = VersionUtil.parseVersion(
"2.16.2", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider");
"2.17.0", "com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider");

@Override
public Version version() {
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ The project maintains the following source code repositories:

## Third-party Content

Jackson JAX-RS Providers version 2.16.2
Jackson JAX-RS Providers version 2.17.0
* License: Apache License, 2.0
* Project: https://github.com/FasterXML/jackson-jaxrs-providers
* Copyright: (c) 2009-2023 FasterXML, LLC. All rights reserved unless otherwise indicated.
51 changes: 25 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -820,7 +820,7 @@
<dependency>
<groupId>net.sf.proguard</groupId>
<artifactId>proguard-base</artifactId>
<version>5.1</version><!-- transitive dependency version increased from 5.0 -->
<version>6.2.2</version><!-- transitive dependency version increased from 5.0 -->
<scope>runtime</scope>
</dependency>
</dependencies>
@@ -2194,14 +2194,14 @@

<!-- Versions of Maven plugins -->
<antrun.mvn.plugin.version>3.1.0</antrun.mvn.plugin.version>
<assembly.mvn.plugin.version>3.6.0</assembly.mvn.plugin.version>
<assembly.mvn.plugin.version>3.7.1</assembly.mvn.plugin.version>
<enforcer.mvn.plugin.version>3.4.1</enforcer.mvn.plugin.version>
<exec.mvn.plugin.version>3.1.0</exec.mvn.plugin.version>
<buildhelper.mvn.plugin.version>3.4.0</buildhelper.mvn.plugin.version>
<exec.mvn.plugin.version>3.2.0</exec.mvn.plugin.version>
<buildhelper.mvn.plugin.version>3.5.0</buildhelper.mvn.plugin.version>
<buildnumber.mvn.plugin.version>3.2.0</buildnumber.mvn.plugin.version>
<checkstyle.mvn.plugin.version>3.3.1</checkstyle.mvn.plugin.version>
<checkstyle.version>10.12.4</checkstyle.version>
<compiler.mvn.plugin.version>3.11.0</compiler.mvn.plugin.version>
<checkstyle.version>10.14.2</checkstyle.version>
<compiler.mvn.plugin.version>3.13.0</compiler.mvn.plugin.version>
<!--
Special version of the compiler plugin just for the jersey-common. All versions above
generate too much for OSGi manifest.mf imports (awt etc). The version 3.11.0 however
@@ -2212,22 +2212,22 @@
<dependency.mvn.plugin.version>3.6.1</dependency.mvn.plugin.version>
<deploy.mvn.plugin.version>3.1.1</deploy.mvn.plugin.version>
<ear.mvn.plugin.version>3.3.0</ear.mvn.plugin.version>
<failsafe.mvn.plugin.version>3.2.1</failsafe.mvn.plugin.version>
<failsafe.mvn.plugin.version>3.2.5</failsafe.mvn.plugin.version>
<felix.mvn.plugin.version>5.1.9</felix.mvn.plugin.version>
<findbugs.mvn.plugin.version>3.0.5</findbugs.mvn.plugin.version>
<gfembedded.mvn.plugin.version>5.1</gfembedded.mvn.plugin.version>
<install.mvn.plugin.version>3.1.1</install.mvn.plugin.version>
<istack.mvn.plugin.version>4.2.0</istack.mvn.plugin.version>
<jar.mvn.plugin.version>3.3.0</jar.mvn.plugin.version>
<javadoc.mvn.plugin.version>3.6.0</javadoc.mvn.plugin.version>
<jxr.mvn.plugin.version>3.3.1</jxr.mvn.plugin.version>
<javadoc.mvn.plugin.version>3.6.3</javadoc.mvn.plugin.version>
<jxr.mvn.plugin.version>3.3.2</jxr.mvn.plugin.version>
<paxexam.mvn.plugin.version>1.2.4</paxexam.mvn.plugin.version>
<proguard.mvn.plugin.version>2.6.0</proguard.mvn.plugin.version>
<proguard.mvn.plugin.version>2.6.1</proguard.mvn.plugin.version>
<resources.mvn.plugin.version>3.3.1</resources.mvn.plugin.version>
<shade.mvn.plugin.version>3.5.1</shade.mvn.plugin.version>
<site.mvn.plugin.version>3.9.1</site.mvn.plugin.version>
<shade.mvn.plugin.version>3.5.2</shade.mvn.plugin.version>
<site.mvn.plugin.version>3.12.1</site.mvn.plugin.version>
<source.mvn.plugin.version>3.3.0</source.mvn.plugin.version>
<surefire.mvn.plugin.version>3.2.1</surefire.mvn.plugin.version>
<surefire.mvn.plugin.version>3.2.5</surefire.mvn.plugin.version>
<war.mvn.plugin.version>3.4.0</war.mvn.plugin.version>
<wiremock.mvn.plugin.version>2.11.0</wiremock.mvn.plugin.version>
<xml.mvn.plugin.version>1.1.0</xml.mvn.plugin.version>
@@ -2242,13 +2242,13 @@
<!-- see core-server/src/main/java/jersey/repackaged/asm/.. -->
<asm.version>9.6</asm.version>
<!--required for spring (ext) modules integration -->
<aspectj.weaver.version>1.9.21.1</aspectj.weaver.version>
<aspectj.weaver.version>1.9.22</aspectj.weaver.version>
<!-- <bnd.plugin.version>2.3.6</bnd.plugin.version>-->
<bouncycastle.version>1.70</bouncycastle.version>
<commons.io.version>2.15.1</commons.io.version>
<commons.codec.version>1.16.1</commons.codec.version>
<!-- <commons-lang3.version>3.3.2</commons-lang3.version>-->
<commons.logging.version>1.3.0</commons.logging.version>
<commons.logging.version>1.3.1</commons.logging.version>
<fasterxml.classmate.version>1.7.0</fasterxml.classmate.version>
<felix.eventadmin.version>1.6.4</felix.eventadmin.version>
<felix.framework.security.version>2.8.4</felix.framework.security.version>
@@ -2266,26 +2266,25 @@
<!-- end of versions extracted here due to maven-enforcer-plugin -->

<!-- micrometer -->
<micrometer.version>1.11.5</micrometer.version>
<micrometer-tracing.version>1.0.11</micrometer-tracing.version>
<micrometer.version>1.12.4</micrometer.version>
<micrometer-tracing.version>1.0.12</micrometer-tracing.version>

<!-- microprofile -->
<microprofile.config.version>3.0.3</microprofile.config.version>
<microprofile.rest.client.version>3.0.1</microprofile.rest.client.version>
<helidon.config.version>3.2.6</helidon.config.version>
<helidon.jersey.connector.version>3.2.6</helidon.jersey.connector.version>
<helidon.config.11.version>1.4.14</helidon.config.11.version> <!-- JDK 11- support -->
<smallrye.config.version>3.0.0</smallrye.config.version>
<smallrye.config.version>3.7.1</smallrye.config.version>

<guava.version>31.1-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
<helidon.version>1.4.14</helidon.version>
<helidon.jersey.connector.version>3.0.2</helidon.jersey.connector.version>
<xmlunit.version>2.9.1</xmlunit.version>
<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>
<httpclient.version>4.5.14</httpclient.version>
<httpclient5.version>5.2.1</httpclient5.version>
<jackson.version>2.16.2</jackson.version>
<httpclient5.version>5.3.1</httpclient5.version>
<jackson.version>2.17.0</jackson.version>
<javassist.version>3.30.2-GA</javassist.version>
<jboss.logging.version>3.5.3.Final</jboss.logging.version>
<jboss.logging.8.version>3.4.3.Final</jboss.logging.8.version>
@@ -2296,11 +2295,11 @@
<jmockit.version>1.49</jmockit.version>
<junit4.version>4.13.2</junit4.version>
<junit5.version>5.10.2</junit5.version>
<junit-platform-suite.version>1.10.0</junit-platform-suite.version>
<junit-platform-suite.version>1.10.2</junit-platform-suite.version>
<kryo.version>4.0.3</kryo.version>
<mockito.version>3.12.4</mockito.version> <!-- CQ 17673 -->
<mustache.version>0.9.11</mustache.version>
<netty.version>4.1.107.Final</netty.version>
<netty.version>4.1.108.Final</netty.version>
<opentracing.version>0.33.0</opentracing.version>
<osgi.version>6.0.0</osgi.version>
<osgi.framework.version>1.10.0</osgi.framework.version>
@@ -2313,7 +2312,7 @@
<rxjava2.version>2.2.21</rxjava2.version>
<simple.version>6.0.1</simple.version>
<slf4j.version>2.0.12</slf4j.version>
<spring6.version>6.0.13</spring6.version>
<spring6.version>6.0.18</spring6.version>
<testng.version>7.9.0</testng.version>
<testng6.version>6.9.13.6</testng6.version>
<!-- Jakartified, eligible for CQ -->
@@ -2361,7 +2360,7 @@
<jaxrs.api.impl.version>3.0.0</jaxrs.api.impl.version>
<jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
<jetty.version>11.0.20</jetty.version>
<jetty.tracing.version>11.0.15</jetty.tracing.version> <!-- special version for tracing support tests-->
<jetty.tracing.version>11.0.15</jetty.tracing.version> <!-- special version for tracing support tests, applied before JDK 21-->
<jetty9.version>9.4.54.v20240208</jetty9.version>
<jetty.plugin.version>11.0.20</jetty.plugin.version>
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
13 changes: 12 additions & 1 deletion tests/integration/tracing-support/pom.xml
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.tracing.version}</version>
<version>${jetty.version}</version>
<configuration>
<connectors>
<connector>
@@ -86,4 +86,15 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>jdk11</id>
<activation>
<jdk>[11,21)</jdk>
</activation>
<properties>
<jetty.version>${jetty.tracing.version}</jetty.version>
</properties>
</profile>
</profiles>
</project>