Versions update [3.1] Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/NOTICE.md b/NOTICE.md index 4f33066..38fdd34 100644 --- a/NOTICE.md +++ b/NOTICE.md
@@ -47,7 +47,7 @@ * Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors * by the @authors tag. -Hibernate Validator CDI, 8.0.1.Final +Hibernate Validator CDI, 8.0.2.Final * License: Apache License, 2.0 * Project: https://beanvalidation.org/ * Repackaged in org.glassfish.jersey.server.validation.internal.hibernate
diff --git a/examples/NOTICE.md b/examples/NOTICE.md index d1be3d9..c4fb81d 100644 --- a/examples/NOTICE.md +++ b/examples/NOTICE.md
@@ -43,7 +43,7 @@ * Copyright: 2009, 2020 Red Hat, Inc. and/or its affiliates, and individual contributors * by the @authors tag. -Hibernate Validator CDI, 8.0.1.Final +Hibernate Validator CDI, 8.0.2.Final * License: Apache License, 2.0 * Project: https://beanvalidation.org/ * Repackaged in org.glassfish.jersey.server.validation.internal.hibernate
diff --git a/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown b/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown index 07e6ca5..eb62a05 100644 --- a/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown +++ b/ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown
@@ -31,7 +31,7 @@ ## Third-party Content -Hibernate Validator CDI, 8.0.1.Final +Hibernate Validator CDI, 8.0.2.Final * License: Apache License, 2.0 * Project: https://beanvalidation.org/ * Repackaged in org.glassfish.jersey.server.validation.internal.hibernate
diff --git a/ext/micrometer/pom.xml b/ext/micrometer/pom.xml index 2c815f2..31af67d 100644 --- a/ext/micrometer/pom.xml +++ b/ext/micrometer/pom.xml
@@ -77,6 +77,12 @@ <version>${micrometer-tracing.version}</version> <scope>test</scope> </dependency> + <dependency> + <groupId>io.opentelemetry.semconv</groupId> + <artifactId>opentelemetry-semconv</artifactId> + <version>${micrometer-semconv.version}</version> + <scope>test</scope> + </dependency> </dependencies> <build>
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 d46e855..1903d04 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) 2024 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2024, 2025 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,7 +45,7 @@ import org.glassfish.jersey.test.JerseyTest; import org.junit.jupiter.api.Test; import zipkin2.CheckResult; -import zipkin2.reporter.Sender; +import zipkin2.reporter.BytesMessageSender; import zipkin2.reporter.urlconnection.URLConnectionSender; import static org.assertj.core.api.Assertions.assertThat; @@ -69,7 +69,7 @@ Boolean zipkinAvailable; - Sender sender; + BytesMessageSender sender; @Override protected Application configure() { @@ -98,7 +98,7 @@ boolean isZipkinAvailable() { if (zipkinAvailable == null) { - CheckResult checkResult = sender.check(); + CheckResult checkResult = CheckResult.OK; zipkinAvailable = checkResult.ok(); } return zipkinAvailable;
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 0490129..22d4452 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, 2025 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 @@ -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.ServiceAttributes; import org.glassfish.jersey.micrometer.server.ObservationApplicationEventListener; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Nested; @@ -151,7 +151,7 @@ SdkTracerProviderBuilder builder = SdkTracerProvider.builder() .setSampler(alwaysOn()) .addSpanProcessor(processor) - .setResource(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "otel-test"))); + .setResource(Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, "otel-test"))); if (isZipkinAvailable()) { builder.addSpanProcessor(SimpleSpanProcessor.create(spanExporter));
diff --git a/pom.xml b/pom.xml index b3ed8d1..b4121f0 100644 --- a/pom.xml +++ b/pom.xml
@@ -2064,7 +2064,7 @@ </dependencyManagement> <properties> - <archetype.mvn.plugin.version>3.2.1</archetype.mvn.plugin.version> + <archetype.mvn.plugin.version>3.4.0</archetype.mvn.plugin.version> <findbugs.skip>false</findbugs.skip> <findbugs.threshold>Low</findbugs.threshold> @@ -2093,7 +2093,7 @@ <antrun.mvn.plugin.version>3.1.0</antrun.mvn.plugin.version> <mvn.ant.version>1.10.15</mvn.ant.version> <assembly.mvn.plugin.version>3.7.1</assembly.mvn.plugin.version> - <clean.mvn.plugin.version>3.4.1</clean.mvn.plugin.version> + <clean.mvn.plugin.version>3.5.0</clean.mvn.plugin.version> <enforcer.mvn.plugin.version>3.5.0</enforcer.mvn.plugin.version> <exec.mvn.plugin.version>3.5.0</exec.mvn.plugin.version> <buildhelper.mvn.plugin.version>3.6.0</buildhelper.mvn.plugin.version> @@ -2107,13 +2107,13 @@ introduces the fix for the excludeTests issue. Which makes it preferable for the whole project but the jersey-common module which has to have the separate version for OSGi reasons. --> - <compiler.common.mvn.plugin.version>3.9.0</compiler.common.mvn.plugin.version> + <compiler.common.mvn.plugin.version>3.14.0</compiler.common.mvn.plugin.version> <cyclonedx.mvn.plugin.version>2.8.1</cyclonedx.mvn.plugin.version> <dependency.mvn.plugin.version>3.8.1</dependency.mvn.plugin.version> <deploy.mvn.plugin.version>3.1.4</deploy.mvn.plugin.version> <ear.mvn.plugin.version>3.3.0</ear.mvn.plugin.version> <failsafe.mvn.plugin.version>3.5.3</failsafe.mvn.plugin.version> - <felix.mvn.plugin.version>5.1.9</felix.mvn.plugin.version> + <felix.mvn.plugin.version>5.1.9</felix.mvn.plugin.version> <!-- newer versions are not supported by JDK 11- --> <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.4</install.mvn.plugin.version> @@ -2136,12 +2136,12 @@ <!-- 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.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.8</asm.version> <!--required for spring (ext) modules integration --> - <aspectj.weaver.version>1.9.22.1</aspectj.weaver.version> + <aspectj.weaver.version>1.9.24</aspectj.weaver.version> <!-- <bnd.plugin.version>2.3.6</bnd.plugin.version>--> <bouncycastle.version>1.70</bouncycastle.version> <commons.codec.version>1.18.0</commons.codec.version> @@ -2152,7 +2152,7 @@ <felix.framework.security.version>2.8.4</felix.framework.security.version> <felix.framework.version>7.0.5</felix.framework.version> <findbugs.glassfish.version>1.7</findbugs.glassfish.version> - <freemarker.version>2.3.33</freemarker.version> + <freemarker.version>2.3.34</freemarker.version> <gae.version>2.0.36</gae.version> <groovy.version>5.0.0-alpha-12</groovy.version> <gson.version>2.13.1</gson.version> @@ -2164,8 +2164,9 @@ <!-- end of versions extracted here due to maven-enforcer-plugin --> <!-- micrometer --> - <micrometer.version>1.15.0</micrometer.version> - <micrometer-tracing.version>1.0.12</micrometer-tracing.version> + <micrometer.version>1.15.1</micrometer.version> + <micrometer-tracing.version>1.5.1</micrometer-tracing.version> + <micrometer-semconv.version>1.32.0</micrometer-semconv.version> <!-- microprofile --> <microprofile.config.version>3.0.3</microprofile.config.version> @@ -2200,8 +2201,8 @@ <osgi.version>6.0.0</osgi.version> <osgi.framework.version>1.10.0</osgi.framework.version> <osgi.compendium.version>5.0.0</osgi.compendium.version> - <osgi.service.cm.version>1.6.0</osgi.service.cm.version> - <pax.exam.version>4.13.4</pax.exam.version> + <osgi.service.cm.version>1.6.1</osgi.service.cm.version> + <pax.exam.version>4.14.0</pax.exam.version> <pax.web.version>0.7.4</pax.web.version><!-- TODO: UPGRADE! --> <reactive.streams.version>1.0.4</reactive.streams.version> <rxjava.version>1.3.8</rxjava.version> @@ -2215,18 +2216,18 @@ <spring6.version>6.0.23</spring6.version> <testng.version>7.11.0</testng.version> <testng6.version>6.14.3</testng6.version> - <thymeleaf.version>3.1.2.RELEASE</thymeleaf.version> + <thymeleaf.version>3.1.3.RELEASE</thymeleaf.version> <!-- Jakartified, eligible for CQ --> - <weld.version>5.1.1.Final</weld.version> - <weld3.version>3.1.9.Final</weld3.version> - <validation.impl.version>8.0.1.Final</validation.impl.version> + <weld.version>5.1.6.Final</weld.version> + <validation.impl.version>8.0.2.Final</validation.impl.version> <!-- END of Jakartified, eligible for CQ --> <wiremock.jetty9.version>2.27.2</wiremock.jetty9.version> - <wiremock.jetty11.version>3.10.0</wiremock.jetty11.version> + <wiremock.jetty11.version>3.10.0</wiremock.jetty11.version> <!-- Do not update, + newer versions fail jersey-rest-client-tck --> <xerces.version>2.12.2</xerces.version> <!-- Graal VM --> - <graalvm.version>20.3.15</graalvm.version> + <graalvm.version>20.3.17</graalvm.version> <!-- do not need CQs (below this line till the end of version properties)--> <gf.impl.version>7.0.6</gf.impl.version> @@ -2268,7 +2269,7 @@ <jsonb.api.version>3.0.1</jsonb.api.version> <jsonp.ri.version>1.1.7</jsonp.ri.version> <jsonp.jaxrs.version>1.1.7</jsonp.jaxrs.version> - <moxy.version>4.0.6</moxy.version> + <moxy.version>4.0.7</moxy.version> <yasson.version>3.0.4</yasson.version> <!-- END of Jakartified -->