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.

Sign up for GitHub

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

Jump to bottom

Jakarta versions update #5726

Merged
merged 2 commits into from
Oct 17, 2024
Merged

Jakarta versions update #5726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c05f15
Jakarta versions update
senivam Aug 21, 2024
0ac9c96
Dependency Convergence validation
senivam Aug 22, 2024
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 examples/extended-wadl-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<!-- logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<artifactId>slf4j-reload4j</artifactId>
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 8 additions & 0 deletions examples/groovy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</exclusion>
<exclusion>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-commons</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions ...ish/jersey/micrometer/server/observation/AbstractObservationRequestEventListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down Expand Up @@ -42,7 +42,7 @@
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.junit.jupiter.api.Test;
import zipkin2.CheckResult;
import zipkin2.reporter.CheckResult;
import zipkin2.reporter.Sender;
import zipkin2.reporter.urlconnection.URLConnectionSender;

Expand Down
4 changes: 2 additions & 2 deletions ...assfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* 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
Expand Down Expand Up @@ -55,7 +55,7 @@
import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.sdk.trace.export.SpanExporter;
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
import io.opentelemetry.semconv.ResourceAttributes;
import org.glassfish.jersey.micrometer.server.ObservationApplicationEventListener;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Nested;
Expand Down
6 changes: 6 additions & 0 deletions media/json-gson/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down
43 changes: 22 additions & 21 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2097,8 +2097,8 @@

<!-- Dependency versions -->
<jersey.version>${project.version}</jersey.version>
<arquillian.version>1.8.0.Final</arquillian.version>
<arquillian.weld.version>3.0.1.Final</arquillian.weld.version> <!-- 3.0.2.Final fails microprofile TCK tests -->
<arquillian.version>1.9.1.Final</arquillian.version>
<arquillian.weld.version>4.0.0.Final</arquillian.weld.version> <!-- 3.0.2.Final fails microprofile TCK tests -->
<!-- asm is now source integrated - keeping this property to see the version -->
<!-- see core-server/src/main/java/jersey/repackaged/asm/.. -->
<asm.version>9.7</asm.version>
Expand Down Expand Up @@ -2127,15 +2127,15 @@
<!-- end of versions extracted here due to maven-enforcer-plugin -->

<!-- micrometer -->
<micrometer.version>1.12.4</micrometer.version>
<micrometer-tracing.version>1.0.12</micrometer-tracing.version>
<micrometer.version>1.13.3</micrometer.version>
<micrometer-tracing.version>1.3.3</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.config.version>3.2.8</helidon.config.version>
<helidon.jersey.connector.version>3.2.8</helidon.jersey.connector.version>
<smallrye.config.version>3.7.1</smallrye.config.version>
<smallrye.config.version>3.9.1</smallrye.config.version>

<guava.version>33.1.0-jre</guava.version>
<hamcrest.version>2.2</hamcrest.version>
Expand Down Expand Up @@ -2171,17 +2171,16 @@
<rxjava.version>1.3.8</rxjava.version>
<rxjava2.version>2.2.21</rxjava2.version>

<servlet4.version>4.0.3</servlet4.version>
<servlet6.version>6.1.0-M2</servlet6.version>
<servlet4.version>4.0.4</servlet4.version>
<servlet6.version>6.1.0</servlet6.version>

<slf4j.version>2.0.13</slf4j.version>
<spring6.version>6.0.18</spring6.version>
<testng.version>7.9.0</testng.version>
<spring6.version>6.0.23</spring6.version>
<testng.version>7.10.2</testng.version>
<testng6.version>6.9.13.6</testng6.version>
<thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
<!-- Jakartified, eligible for CQ -->
<weld.version>6.0.0.Beta1</weld.version>
<weld3.version>3.1.9.Final</weld3.version>
<weld.version>6.0.0.Beta4</weld.version>
<validation.impl.version>8.0.1.Final</validation.impl.version>
<!-- END of Jakartified, eligible for CQ -->
<wiremock.version>2.27.2</wiremock.version>
Expand All @@ -2199,17 +2198,19 @@
<grizzly2.version>4.0.2</grizzly2.version>
<grizzly.client.version>1.16</grizzly.client.version>
<grizzly.npn.version>2.0.0</grizzly.npn.version>
<hk2.version>4.0.0-M1</hk2.version>
<hk2.version>4.0.0-M3</hk2.version>
<hk2.osgi.version>org.glassfish.hk2.*;version="[4.0,5)"</hk2.osgi.version>
<hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[4.0,5)"</hk2.jvnet.osgi.version>
<hk2.config.version>8.0.0-JDK17-M6</hk2.config.version>
<jsp.version>4.0.0-M2</jsp.version>
<jstl.version>3.0.0</jstl.version>
<jstl.version>3.0.1</jstl.version>
<jta.api.version>2.0.1</jta.api.version>
<istack.commons.runtime.version>4.1.2</istack.commons.runtime.version>
<istack.commons.runtime.version>4.2.0</istack.commons.runtime.version>
<jakarta.activation-api.version>2.1.3</jakarta.activation-api.version>
<jakarta.activation.version>2.0.2</jakarta.activation.version>
<!-- org.hibernate.validator has lookup limitation up to the 6 version of EL API-->
<jakarta.el.version>5.0.1</jakarta.el.version> <!-- el6 does not work with OSGi with expressly 5 -->
<!-- org.hibernate.validator has lookup limitation up to the 6 version of EL IMPL -->
<jakarta.el.impl.version>5.0.0</jakarta.el.impl.version> <!-- EE11 expressly 6 does not work with EE10 BV 8.0.1 (OSGi) -->
<jakarta.annotation.osgi.version>jakarta.annotation.*;version="[3.0,4)"</jakarta.annotation.osgi.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
Expand All @@ -2225,16 +2226,16 @@
<jaxrs.api.impl.version>4.0.0</jaxrs.api.impl.version>
<jakarta.rest.osgi.version>jakarta.ws.rs;version="[3.1,5)",jakarta.ws.rs.client;version="[3.1,5)",jakarta.ws.rs.container;version="[3.1,5)",jakarta.ws.rs.core;version="[3.1,5)",jakarta.ws.rs.ext;version="[3.1,5)",jakarta.ws.rs.sse;version="[3.1,5)"</jakarta.rest.osgi.version>
<jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
<jetty.version>12.0.9</jetty.version>
<jetty9.version>9.4.54.v20240208</jetty9.version>
<jetty11.version>11.0.21</jetty11.version>
<jetty.version>12.0.12</jetty.version>
<jetty9.version>9.4.55.v20240627</jetty9.version>
<jetty11.version>11.0.22</jetty11.version>
<jetty.plugin.version>12.0.8</jetty.plugin.version>
<jsonb.api.version>3.0.1</jsonb.api.version>
<jsonp.ri.version>1.1.6</jsonp.ri.version>
<jsonp.jaxrs.version>1.1.6</jsonp.jaxrs.version>
<jsonp.ri.version>1.1.7</jsonp.ri.version>
<jsonp.jaxrs.version>1.1.7</jsonp.jaxrs.version>
<moxy.version>5.0.0-B02</moxy.version>
<moxy.asm.version>9.7.0</moxy.asm.version>
<yasson.version>3.0.3</yasson.version>
<yasson.version>3.0.4</yasson.version>
<!-- END of Jakartified -->

<javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->
Expand Down
5 changes: 0 additions & 5 deletions tests/integration/property-check/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@
<artifactId>jersey-apache5-connector</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache5-connector</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-jnh-connector</artifactId>
Expand Down