From 5c05f158b6603fa53b4de4250a5fa4c954a3410b Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Wed, 21 Aug 2024 14:36:14 +0200 Subject: [PATCH] Jakarta versions update Signed-off-by: Maxim Nesen --- examples/extended-wadl-webapp/pom.xml | 2 +- ...ctObservationRequestEventListenerTest.java | 4 +- ...servationApplicationEventListenerTest.java | 7 +-- pom.xml | 47 ++++++++++--------- tests/integration/property-check/pom.xml | 5 -- 5 files changed, 31 insertions(+), 34 deletions(-) diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml index 0d0580cb26..751a7dd9c3 100644 --- a/examples/extended-wadl-webapp/pom.xml +++ b/examples/extended-wadl-webapp/pom.xml @@ -108,7 +108,7 @@ org.slf4j - slf4j-log4j12 + slf4j-reload4j ${slf4j.version} test diff --git a/ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/AbstractObservationRequestEventListenerTest.java b/ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/AbstractObservationRequestEventListenerTest.java index 0ae7ab6401..8813762631 100644 --- a/ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/AbstractObservationRequestEventListenerTest.java +++ b/ext/micrometer/src/test/java/org/glassfish/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/ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java b/ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java index 0490129633..9d8eba53fa 100644 --- a/ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java +++ b/ext/micrometer/src/test/java/org/glassfish/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 index f893990bde..a530b7c22c 100644 --- a/pom.xml +++ b/pom.xml @@ -2097,8 +2097,8 @@ ${project.version} - 1.8.0.Final - 3.0.1.Final + 1.9.1.Final + 4.0.0.Final 9.7 @@ -2127,15 +2127,15 @@ - 1.12.4 - 1.0.12 + 1.13.3 + 1.3.3 3.0.3 3.0.1 - 3.2.6 + 3.2.8 3.2.8 - 3.7.1 + 3.9.1 33.1.0-jre 2.2 @@ -2171,17 +2171,16 @@ 1.3.8 2.2.21 - 4.0.3 - 6.1.0-M2 + 4.0.4 + 6.1.0 2.0.13 - 6.0.18 - 7.9.0 + 6.0.23 + 7.10.2 6.9.13.6 3.1.2.RELEASE - 6.0.0.Beta1 - 3.1.9.Final + 6.0.0.Beta4 8.0.1.Final 2.27.2 @@ -2191,7 +2190,7 @@ 20.3.14 - 8.0.0-JDK17-M6 + 8.0.0-JDK17-M7 4.1.0 jakarta.enterprise.*;version="[4.0,5)" @@ -2199,17 +2198,19 @@ 4.0.2 1.16 2.0.0 - 4.0.0-M1 + 4.0.0-M3 org.glassfish.hk2.*;version="[4.0,5)" org.jvnet.hk2.*;version="[4.0,5)" - 8.0.0-JDK17-M6 + 8.0.0-JDK17-M7 4.0.0-M2 - 3.0.0 + 3.0.1 2.0.1 - 4.1.2 + 4.2.0 2.1.3 2.0.2 + 5.0.1 + 5.0.0 jakarta.annotation.*;version="[3.0,4)" 3.0.0 @@ -2225,16 +2226,16 @@ 4.0.0 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)" org.eclipse.jetty.*;version="[11,15)" - 12.0.9 - 9.4.54.v20240208 - 11.0.21 + 12.0.12 + 9.4.55.v20240627 + 11.0.22 12.0.8 3.0.1 - 1.1.6 - 1.1.6 + 1.1.7 + 1.1.7 5.0.0-B02 9.7.0 - 3.0.3 + 3.0.4 1.3.2 diff --git a/tests/integration/property-check/pom.xml b/tests/integration/property-check/pom.xml index 9cb0b3e9ab..326a62e39a 100644 --- a/tests/integration/property-check/pom.xml +++ b/tests/integration/property-check/pom.xml @@ -73,11 +73,6 @@ jersey-apache5-connector test - - org.glassfish.jersey.connectors - jersey-apache5-connector - test - org.glassfish.jersey.connectors jersey-jnh-connector