Jakarta versions update

Signed-off-by: Maxim Nesen <[email protected]>
eclipse-ee4j · Aug 21, 2024 · 5c05f15 · 5c05f15
1 parent f1177cd
commit 5c05f15
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 34 deletions.
diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml
@@ -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>

diff --git a/...ish/jersey/micrometer/server/observation/AbstractObservationRequestEventListenerTest.java b/...ish/jersey/micrometer/server/observation/AbstractObservationRequestEventListenerTest.java
@@ -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
@@ -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;
 

diff --git a/...assfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java b/...assfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java
@@ -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
@@ -45,6 +45,7 @@
 import io.micrometer.tracing.otel.bridge.OtelTracer;
 import io.micrometer.tracing.otel.bridge.Slf4JBaggageEventListener;
 import io.micrometer.tracing.otel.bridge.Slf4JEventListener;
+import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.context.propagation.ContextPropagators;
 import io.opentelemetry.exporter.zipkin.ZipkinSpanExporterBuilder;
@@ -55,7 +56,6 @@
 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 org.glassfish.jersey.micrometer.server.ObservationApplicationEventListener;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Nested;
@@ -64,6 +64,7 @@
 import zipkin2.reporter.brave.ZipkinSpanHandler;
 
 import static io.opentelemetry.sdk.trace.samplers.Sampler.alwaysOn;
+import static io.opentelemetry.semconv.ResourceAttributes.SERVICE_NAME;
 
 /**
  * Tests for {@link ObservationApplicationEventListener}.
@@ -151,7 +152,7 @@ void configureRegistry(ObservationRegistry registry) {
             SdkTracerProviderBuilder builder = SdkTracerProvider.builder()
                     .setSampler(alwaysOn())
                     .addSpanProcessor(processor)
-                    .setResource(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "otel-test")));
+                    .setResource(Resource.create(Attributes.of(SERVICE_NAME, "otel-test")));
 
             if (isZipkinAvailable()) {
                 builder.addSpanProcessor(SimpleSpanProcessor.create(spanExporter));

diff --git a/pom.xml b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -2191,25 +2190,27 @@
         <graalvm.version>20.3.14</graalvm.version>
 
         <!-- do not need CQs (below this line till the end of version properties)-->
-        <gf.impl.version>8.0.0-JDK17-M6</gf.impl.version>
+        <gf.impl.version>8.0.0-JDK17-M7</gf.impl.version>
         <!-- Jakartified -->
         <cdi.api.version>4.1.0</cdi.api.version>
         <cdi.osgi.version>jakarta.enterprise.*;version="[4.0,5)"</cdi.osgi.version>
         <ejb.version>4.0.1</ejb.version>
         <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>
+        <hk2.config.version>8.0.0-JDK17-M7</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>
@@ -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 -->

diff --git a/tests/integration/property-check/pom.xml b/tests/integration/property-check/pom.xml
@@ -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>