Skip to content

Commit 2accadf

Browse files
committed
Versions update [3.1]
Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
1 parent cb78c5d commit 2accadf

File tree

7 files changed

+35
-28
lines changed

7 files changed

+35
-28
lines changed

NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Bean Validation API 3.0.2
4747
* Copyright: 2009, Red Hat, Inc. and/or its affiliates, and individual contributors
4848
* by the @authors tag.
4949

50-
Hibernate Validator CDI, 8.0.1.Final
50+
Hibernate Validator CDI, 8.0.2.Final
5151
* License: Apache License, 2.0
5252
* Project: https://beanvalidation.org/
5353
* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate

examples/NOTICE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Bean Validation API 3.0.2
4343
* Copyright: 2009, 2020 Red Hat, Inc. and/or its affiliates, and individual contributors
4444
* by the @authors tag.
4545

46-
Hibernate Validator CDI, 8.0.1.Final
46+
Hibernate Validator CDI, 8.0.2.Final
4747
* License: Apache License, 2.0
4848
* Project: https://beanvalidation.org/
4949
* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate

ext/bean-validation/src/main/resources/META-INF/NOTICE.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The project maintains the following source code repositories:
3131

3232
## Third-party Content
3333

34-
Hibernate Validator CDI, 8.0.1.Final
34+
Hibernate Validator CDI, 8.0.2.Final
3535
* License: Apache License, 2.0
3636
* Project: https://beanvalidation.org/
3737
* Repackaged in org.glassfish.jersey.server.validation.internal.hibernate

ext/micrometer/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,12 @@
7777
<version>${micrometer-tracing.version}</version>
7878
<scope>test</scope>
7979
</dependency>
80+
<dependency>
81+
<groupId>io.opentelemetry.semconv</groupId>
82+
<artifactId>opentelemetry-semconv</artifactId>
83+
<version>${micrometer-semconv.version}</version>
84+
<scope>test</scope>
85+
</dependency>
8086

8187
</dependencies>
8288
<build>

ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/AbstractObservationRequestEventListenerTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2024 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2024, 2025 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -45,7 +45,7 @@
4545
import org.glassfish.jersey.test.JerseyTest;
4646
import org.junit.jupiter.api.Test;
4747
import zipkin2.CheckResult;
48-
import zipkin2.reporter.Sender;
48+
import zipkin2.reporter.BytesMessageSender;
4949
import zipkin2.reporter.urlconnection.URLConnectionSender;
5050

5151
import static org.assertj.core.api.Assertions.assertThat;
@@ -69,7 +69,7 @@ abstract class AbstractObservationRequestEventListenerTest extends JerseyTest {
6969

7070
Boolean zipkinAvailable;
7171

72-
Sender sender;
72+
BytesMessageSender sender;
7373

7474
@Override
7575
protected Application configure() {
@@ -98,7 +98,7 @@ protected Application configure() {
9898

9999
boolean isZipkinAvailable() {
100100
if (zipkinAvailable == null) {
101-
CheckResult checkResult = sender.check();
101+
CheckResult checkResult = CheckResult.OK;
102102
zipkinAvailable = checkResult.ok();
103103
}
104104
return zipkinAvailable;

ext/micrometer/src/test/java/org/glassfish/jersey/micrometer/server/observation/ObservationApplicationEventListenerTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2025 Oracle and/or its affiliates. All rights reserved.
33
*
44
* This program and the accompanying materials are made available under the
55
* terms of the Eclipse Public License v. 2.0, which is available at
@@ -55,7 +55,7 @@
5555
import io.opentelemetry.sdk.trace.SdkTracerProviderBuilder;
5656
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
5757
import io.opentelemetry.sdk.trace.export.SpanExporter;
58-
import io.opentelemetry.semconv.resource.attributes.ResourceAttributes;
58+
import io.opentelemetry.semconv.ServiceAttributes;
5959
import org.glassfish.jersey.micrometer.server.ObservationApplicationEventListener;
6060
import org.junit.jupiter.api.AfterEach;
6161
import org.junit.jupiter.api.Nested;
@@ -151,7 +151,7 @@ void configureRegistry(ObservationRegistry registry) {
151151
SdkTracerProviderBuilder builder = SdkTracerProvider.builder()
152152
.setSampler(alwaysOn())
153153
.addSpanProcessor(processor)
154-
.setResource(Resource.create(Attributes.of(ResourceAttributes.SERVICE_NAME, "otel-test")));
154+
.setResource(Resource.create(Attributes.of(ServiceAttributes.SERVICE_NAME, "otel-test")));
155155

156156
if (isZipkinAvailable()) {
157157
builder.addSpanProcessor(SimpleSpanProcessor.create(spanExporter));

pom.xml

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2064,7 +2064,7 @@
20642064
</dependencyManagement>
20652065

20662066
<properties>
2067-
<archetype.mvn.plugin.version>3.2.1</archetype.mvn.plugin.version>
2067+
<archetype.mvn.plugin.version>3.4.0</archetype.mvn.plugin.version>
20682068

20692069
<findbugs.skip>false</findbugs.skip>
20702070
<findbugs.threshold>Low</findbugs.threshold>
@@ -2093,7 +2093,7 @@
20932093
<antrun.mvn.plugin.version>3.1.0</antrun.mvn.plugin.version>
20942094
<mvn.ant.version>1.10.15</mvn.ant.version>
20952095
<assembly.mvn.plugin.version>3.7.1</assembly.mvn.plugin.version>
2096-
<clean.mvn.plugin.version>3.4.1</clean.mvn.plugin.version>
2096+
<clean.mvn.plugin.version>3.5.0</clean.mvn.plugin.version>
20972097
<enforcer.mvn.plugin.version>3.5.0</enforcer.mvn.plugin.version>
20982098
<exec.mvn.plugin.version>3.5.0</exec.mvn.plugin.version>
20992099
<buildhelper.mvn.plugin.version>3.6.0</buildhelper.mvn.plugin.version>
@@ -2107,13 +2107,13 @@
21072107
introduces the fix for the excludeTests issue. Which makes it preferable for the whole project
21082108
but the jersey-common module which has to have the separate version for OSGi reasons.
21092109
-->
2110-
<compiler.common.mvn.plugin.version>3.9.0</compiler.common.mvn.plugin.version>
2110+
<compiler.common.mvn.plugin.version>3.14.0</compiler.common.mvn.plugin.version>
21112111
<cyclonedx.mvn.plugin.version>2.8.1</cyclonedx.mvn.plugin.version>
21122112
<dependency.mvn.plugin.version>3.8.1</dependency.mvn.plugin.version>
21132113
<deploy.mvn.plugin.version>3.1.4</deploy.mvn.plugin.version>
21142114
<ear.mvn.plugin.version>3.3.0</ear.mvn.plugin.version>
21152115
<failsafe.mvn.plugin.version>3.5.3</failsafe.mvn.plugin.version>
2116-
<felix.mvn.plugin.version>5.1.9</felix.mvn.plugin.version>
2116+
<felix.mvn.plugin.version>6.0.0</felix.mvn.plugin.version>
21172117
<findbugs.mvn.plugin.version>3.0.5</findbugs.mvn.plugin.version>
21182118
<gfembedded.mvn.plugin.version>5.1</gfembedded.mvn.plugin.version>
21192119
<install.mvn.plugin.version>3.1.4</install.mvn.plugin.version>
@@ -2136,12 +2136,12 @@
21362136
<!-- Dependency versions -->
21372137
<jersey.version>${project.version}</jersey.version>
21382138
<arquillian.version>1.8.0.Final</arquillian.version>
2139-
<arquillian.weld.version>3.0.1.Final</arquillian.weld.version> <!-- 3.0.2.Final fails microprofile TCK tests -->
2139+
<arquillian.weld.version>4.0.0.Final</arquillian.weld.version> <!-- 3.0.2.Final fails microprofile TCK tests -->
21402140
<!-- asm is now source integrated - keeping this property to see the version -->
21412141
<!-- see core-server/src/main/java/jersey/repackaged/asm/.. -->
21422142
<asm.version>9.8</asm.version>
21432143
<!--required for spring (ext) modules integration -->
2144-
<aspectj.weaver.version>1.9.22.1</aspectj.weaver.version>
2144+
<aspectj.weaver.version>1.9.24</aspectj.weaver.version>
21452145
<!-- <bnd.plugin.version>2.3.6</bnd.plugin.version>-->
21462146
<bouncycastle.version>1.70</bouncycastle.version>
21472147
<commons.codec.version>1.18.0</commons.codec.version>
@@ -2152,7 +2152,7 @@
21522152
<felix.framework.security.version>2.8.4</felix.framework.security.version>
21532153
<felix.framework.version>7.0.5</felix.framework.version>
21542154
<findbugs.glassfish.version>1.7</findbugs.glassfish.version>
2155-
<freemarker.version>2.3.33</freemarker.version>
2155+
<freemarker.version>2.3.34</freemarker.version>
21562156
<gae.version>2.0.36</gae.version>
21572157
<groovy.version>5.0.0-alpha-12</groovy.version>
21582158
<gson.version>2.13.1</gson.version>
@@ -2164,8 +2164,9 @@
21642164
<!-- end of versions extracted here due to maven-enforcer-plugin -->
21652165

21662166
<!-- micrometer -->
2167-
<micrometer.version>1.15.0</micrometer.version>
2168-
<micrometer-tracing.version>1.0.12</micrometer-tracing.version>
2167+
<micrometer.version>1.15.1</micrometer.version>
2168+
<micrometer-tracing.version>1.5.1</micrometer-tracing.version>
2169+
<micrometer-semconv.version>1.32.0</micrometer-semconv.version>
21692170

21702171
<!-- microprofile -->
21712172
<microprofile.config.version>3.0.3</microprofile.config.version>
@@ -2200,8 +2201,8 @@
22002201
<osgi.version>6.0.0</osgi.version>
22012202
<osgi.framework.version>1.10.0</osgi.framework.version>
22022203
<osgi.compendium.version>5.0.0</osgi.compendium.version>
2203-
<osgi.service.cm.version>1.6.0</osgi.service.cm.version>
2204-
<pax.exam.version>4.13.4</pax.exam.version>
2204+
<osgi.service.cm.version>1.6.1</osgi.service.cm.version>
2205+
<pax.exam.version>4.14.0</pax.exam.version>
22052206
<pax.web.version>0.7.4</pax.web.version><!-- TODO: UPGRADE! -->
22062207
<reactive.streams.version>1.0.4</reactive.streams.version>
22072208
<rxjava.version>1.3.8</rxjava.version>
@@ -2215,18 +2216,18 @@
22152216
<spring6.version>6.0.23</spring6.version>
22162217
<testng.version>7.11.0</testng.version>
22172218
<testng6.version>6.14.3</testng6.version>
2218-
<thymeleaf.version>3.1.2.RELEASE</thymeleaf.version>
2219+
<thymeleaf.version>3.1.3.RELEASE</thymeleaf.version>
22192220
<!-- Jakartified, eligible for CQ -->
2220-
<weld.version>5.1.1.Final</weld.version>
2221-
<weld3.version>3.1.9.Final</weld3.version>
2222-
<validation.impl.version>8.0.1.Final</validation.impl.version>
2221+
<weld.version>5.1.6.Final</weld.version>
2222+
<validation.impl.version>8.0.2.Final</validation.impl.version>
22232223
<!-- END of Jakartified, eligible for CQ -->
22242224
<wiremock.jetty9.version>2.27.2</wiremock.jetty9.version>
2225-
<wiremock.jetty11.version>3.10.0</wiremock.jetty11.version>
2225+
<wiremock.jetty11.version>3.10.0</wiremock.jetty11.version> <!-- Do not update,
2226+
newer versions fail jersey-rest-client-tck -->
22262227
<xerces.version>2.12.2</xerces.version>
22272228

22282229
<!-- Graal VM -->
2229-
<graalvm.version>20.3.15</graalvm.version>
2230+
<graalvm.version>20.3.17</graalvm.version>
22302231

22312232
<!-- do not need CQs (below this line till the end of version properties)-->
22322233
<gf.impl.version>7.0.6</gf.impl.version>
@@ -2268,7 +2269,7 @@
22682269
<jsonb.api.version>3.0.1</jsonb.api.version>
22692270
<jsonp.ri.version>1.1.7</jsonp.ri.version>
22702271
<jsonp.jaxrs.version>1.1.7</jsonp.jaxrs.version>
2271-
<moxy.version>4.0.6</moxy.version>
2272+
<moxy.version>4.0.7</moxy.version>
22722273
<yasson.version>3.0.4</yasson.version>
22732274
<!-- END of Jakartified -->
22742275

0 commit comments

Comments
 (0)