Skip to content

Commit b92e57f

Browse files
committed
Dependencies versions update
Signed-off-by: Maxim Nesen <[email protected]>
1 parent 8c9f0f4 commit b92e57f

File tree

10 files changed

+66
-56
lines changed

10 files changed

+66
-56
lines changed

connectors/helidon-connector/pom.xml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,6 @@
7272
<target>11</target>
7373
</configuration>
7474
</plugin>
75-
<plugin>
76-
<groupId>org.apache.maven.plugins</groupId>
77-
<artifactId>maven-javadoc-plugin</artifactId>
78-
<configuration>
79-
<source>8</source>
80-
<detectJavaApiLink>false</detectJavaApiLink>
81-
</configuration>
82-
</plugin>
8375
</plugins>
8476
</build>
8577
</project>

pom.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2141,7 +2141,7 @@
21412141
</dependencyManagement>
21422142

21432143
<properties>
2144-
<archetype.mvn.plugin.version>3.2.1</archetype.mvn.plugin.version>
2144+
<archetype.mvn.plugin.version>3.4.0</archetype.mvn.plugin.version>
21452145

21462146
<findbugs.skip>false</findbugs.skip>
21472147
<findbugs.threshold>Low</findbugs.threshold>
@@ -2170,10 +2170,10 @@
21702170
<antrun.mvn.plugin.version>3.1.0</antrun.mvn.plugin.version>
21712171
<mvn.ant.version>1.10.15</mvn.ant.version>
21722172
<assembly.mvn.plugin.version>3.7.1</assembly.mvn.plugin.version>
2173-
<clean.mvn.plugin.version>3.4.1</clean.mvn.plugin.version>
2174-
<enforcer.mvn.plugin.version>3.5.0</enforcer.mvn.plugin.version>
2175-
<exec.mvn.plugin.version>3.5.0</exec.mvn.plugin.version>
2176-
<buildhelper.mvn.plugin.version>3.6.0</buildhelper.mvn.plugin.version>
2173+
<clean.mvn.plugin.version>3.5.0</clean.mvn.plugin.version>
2174+
<enforcer.mvn.plugin.version>3.6.1</enforcer.mvn.plugin.version>
2175+
<exec.mvn.plugin.version>3.5.1</exec.mvn.plugin.version>
2176+
<buildhelper.mvn.plugin.version>3.6.1</buildhelper.mvn.plugin.version>
21772177
<buildnumber.mvn.plugin.version>3.2.1</buildnumber.mvn.plugin.version>
21782178
<checkstyle.mvn.plugin.version>3.6.0</checkstyle.mvn.plugin.version>
21792179
<checkstyle.version>10.23.1</checkstyle.version>
@@ -2185,10 +2185,10 @@
21852185
but the jersey-common module which has to have the separate version for OSGi reasons.
21862186
-->
21872187
<compiler.common.mvn.plugin.version>3.9.0</compiler.common.mvn.plugin.version>
2188-
<cyclonedx.mvn.plugin.version>2.8.1</cyclonedx.mvn.plugin.version>
2188+
<cyclonedx.mvn.plugin.version>2.9.1</cyclonedx.mvn.plugin.version>
21892189
<dependency.mvn.plugin.version>3.8.1</dependency.mvn.plugin.version>
21902190
<deploy.mvn.plugin.version>3.1.4</deploy.mvn.plugin.version>
2191-
<ear.mvn.plugin.version>3.3.0</ear.mvn.plugin.version>
2191+
<ear.mvn.plugin.version>3.4.0</ear.mvn.plugin.version>
21922192
<failsafe.mvn.plugin.version>3.5.3</failsafe.mvn.plugin.version>
21932193
<felix.mvn.plugin.version>5.1.9</felix.mvn.plugin.version>
21942194
<findbugs.mvn.plugin.version>3.0.5</findbugs.mvn.plugin.version>
@@ -2226,17 +2226,17 @@
22262226
<felix.framework.security.version>2.8.4</felix.framework.security.version>
22272227
<felix.framework.version>7.0.5</felix.framework.version>
22282228
<findbugs.glassfish.version>1.7</findbugs.glassfish.version>
2229-
<freemarker.version>2.3.33</freemarker.version>
2230-
<gae.version>2.0.36</gae.version>
2229+
<freemarker.version>2.3.34</freemarker.version>
2230+
<gae.version>2.0.38</gae.version>
22312231
<groovy.version>5.0.0-alpha-12</groovy.version>
22322232
<gson.version>2.13.1</gson.version>
22332233
<guava.version>33.4.8-jre</guava.version>
22342234
<hamcrest.version>3.0</hamcrest.version>
22352235
<helidon.version>1.4.15</helidon.version>
2236-
<helidon.connector.version>2.6.11</helidon.connector.version>
2237-
<xmlunit.version>2.10.0</xmlunit.version>
2236+
<helidon.connector.version>2.6.12</helidon.connector.version>
2237+
<xmlunit.version>2.10.3</xmlunit.version>
22382238
<httpclient.version>4.5.14</httpclient.version>
2239-
<httpclient5.version>5.3.1</httpclient5.version>
2239+
<httpclient5.version>5.5</httpclient5.version>
22402240
<jackson.version>2.19.1</jackson.version>
22412241
<jackson1.version>1.9.13</jackson1.version>
22422242
<javassist.version>3.30.2-GA</javassist.version>
@@ -2249,13 +2249,13 @@
22492249
<jmh.version>1.37</jmh.version>
22502250
<jmockit.version>1.49</jmockit.version>
22512251
<junit4.version>4.13.2</junit4.version>
2252-
<junit5.version>5.12.2</junit5.version>
2253-
<junit5.jdk8.version>5.10.3</junit5.jdk8.version>
2254-
<junit-platform-suite.version>1.12.2</junit-platform-suite.version>
2252+
<junit5.version>5.13.4</junit5.version>
2253+
<junit5.jdk8.version>5.10.5</junit5.jdk8.version>
2254+
<junit-platform-suite.version>1.13.4</junit-platform-suite.version>
22552255
<kryo.version>4.0.3</kryo.version>
22562256
<mockito.version>4.11.0</mockito.version> <!-- CQ 17673 -->
22572257
<mustache.version>0.9.14</mustache.version>
2258-
<netty.version>4.1.121.Final</netty.version>
2258+
<netty.version>4.1.126.Final</netty.version>
22592259
<opentracing.version>0.33.0</opentracing.version>
22602260
<osgi.version>6.0.0</osgi.version>
22612261
<osgi.framework.version>1.10.0</osgi.framework.version>
@@ -2267,7 +2267,7 @@
22672267
<rxjava2.version>2.2.21</rxjava2.version>
22682268
<simple.version>6.0.1</simple.version>
22692269
<slf4j.version>2.0.17</slf4j.version>
2270-
<smallrye.config.version>1.3.11</smallrye.config.version>
2270+
<smallrye.config.version>1.4.1</smallrye.config.version>
22712271
<spring4.version>4.3.30.RELEASE</spring4.version>
22722272
<spring5.version>5.3.39</spring5.version>
22732273
<testng.version>7.11.0</testng.version>
@@ -2279,7 +2279,7 @@
22792279
<xerces.version>2.12.2</xerces.version>
22802280

22812281
<!-- Graal VM -->
2282-
<graalvm.version>20.3.15</graalvm.version>
2282+
<graalvm.version>20.3.17</graalvm.version>
22832283

22842284
<!-- do not need CQs -->
22852285
<cdi.api.version>2.0.SP1</cdi.api.version>
@@ -2308,20 +2308,20 @@
23082308
<jaxrs.api.impl.version>2.1.6</jaxrs.api.impl.version>
23092309
<jetty.plugin.version>6.1.26</jetty.plugin.version>
23102310
<jetty.osgi.version>org.eclipse.jetty.*;version="[9.4,11)"</jetty.osgi.version>
2311-
<jetty.version>9.4.57.v20241219</jetty.version>
2311+
<jetty.version>9.4.58.v20250814</jetty.version>
23122312
<jetty.servlet.api.25.version>6.1.14</jetty.servlet.api.25.version>
23132313
<jsonb.api.version>1.0.2</jsonb.api.version>
23142314
<jsonp.ri.version>1.1.6</jsonp.ri.version>
23152315
<jsonp.jaxrs.version>1.1.6</jsonp.jaxrs.version>
23162316
<jsp.version>2.3.6</jsp.version>
23172317
<jstl.version>1.2.7</jstl.version>
23182318
<jta.api.version>1.3.3</jta.api.version>
2319-
<micrometer.version>1.15.0</micrometer.version>
2319+
<micrometer.version>1.15.3</micrometer.version>
23202320
<micrometer-tracing.version>1.0.12</micrometer-tracing.version>
23212321
<microprofile.config.version>2.0.1</microprofile.config.version>
23222322
<microprofile.rest.client.version>2.0</microprofile.rest.client.version>
23232323
<mimepull.version>1.9.15</mimepull.version>
2324-
<moxy.version>2.7.15</moxy.version>
2324+
<moxy.version>2.7.16</moxy.version>
23252325
<osgi.service.cm.version>1.6.1</osgi.service.cm.version>
23262326
<servlet2.version>2.5</servlet2.version>
23272327
<servlet3.version>3.1.0</servlet3.version>

test-framework/util/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@
5454
<artifactId>hamcrest</artifactId>
5555
<scope>test</scope>
5656
</dependency>
57+
<dependency> <!--added due to an issue in JUnit 5 dependencies for junit-vintage-engine -->
58+
<groupId>org.junit.platform</groupId>
59+
<artifactId>junit-platform-launcher</artifactId>
60+
<version>${junit-platform-suite.version}</version>
61+
<scope>test</scope>
62+
</dependency>
5763
</dependencies>
5864

5965
<build>
@@ -66,6 +72,12 @@
6672
<groupId>org.junit.vintage</groupId>
6773
<artifactId>junit-vintage-engine</artifactId>
6874
<version>${junit5.version}</version>
75+
<exclusions>
76+
<exclusion>
77+
<groupId>org.junit.platform</groupId>
78+
<artifactId>junit-platform-launcher</artifactId>
79+
</exclusion>
80+
</exclusions>
6981
</dependency>
7082
</dependencies>
7183
</plugin>

tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/ContextResolverMediaTypeTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 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
@@ -134,7 +134,7 @@ public String get(@PathParam("id") MediaType m) {
134134
}
135135

136136
@Nested
137-
public static class ProduceTest extends JerseyTest {
137+
class ProduceTest extends JerseyTest {
138138

139139
@Override
140140
protected Application configure() {
@@ -161,7 +161,7 @@ public void testProduce() throws IOException {
161161
}
162162

163163
@Nested
164-
public static class ProducesTest extends JerseyTest {
164+
class ProducesTest extends JerseyTest {
165165

166166
@Override
167167
protected Application configure() {
@@ -188,7 +188,7 @@ public void testProduces() throws IOException {
188188
}
189189

190190
@Nested
191-
public static class ProducesSeparateTest extends JerseyTest {
191+
class ProducesSeparateTest extends JerseyTest {
192192

193193
@Override
194194
protected Application configure() {
@@ -216,7 +216,7 @@ public void testProducesSeparate() throws IOException {
216216
}
217217

218218
@Nested
219-
public static class ProducesXXXTest extends JerseyTest {
219+
class ProducesXXXTest extends JerseyTest {
220220

221221
@Override
222222
protected Application configure() {

tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/EmptyRequestWithJaxbTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 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
@@ -96,7 +96,7 @@ public void arrayType(JaxbBeanType[] b) {
9696
}
9797

9898
@Nested
99-
public static class EmptyRequestTest extends JerseyTest {
99+
class EmptyRequestTest extends JerseyTest {
100100

101101
@Override
102102
protected Application configure() {
@@ -162,7 +162,7 @@ public JAXBContext getContext(Class<?> objectType) {
162162
}
163163

164164
@Nested
165-
public static class MappedJettisonCRTest extends JerseyTest {
165+
class MappedJettisonCRTest extends JerseyTest {
166166

167167
@Override
168168
protected Application configure() {
@@ -174,7 +174,7 @@ protected void configureClient(ClientConfig config) {
174174
config.register(JettisonFeature.class);
175175
}
176176

177-
public static class MappedJettisonCR extends CR {
177+
class MappedJettisonCR extends CR {
178178

179179
protected JAXBContext configure(Class[] classes) throws JAXBException {
180180
return new JettisonJaxbContext(JettisonConfig.mappedJettison().build(), classes);
@@ -188,7 +188,7 @@ public void testMappedJettisonCR() {
188188
}
189189

190190
@Nested
191-
public static class BadgerFishCRTest extends JerseyTest {
191+
class BadgerFishCRTest extends JerseyTest {
192192

193193
@Override
194194
protected Application configure() {
@@ -200,7 +200,7 @@ protected void configureClient(ClientConfig config) {
200200
config.register(JettisonFeature.class);
201201
}
202202

203-
public static class BadgerFishCR extends CR {
203+
class BadgerFishCR extends CR {
204204

205205
protected JAXBContext configure(Class[] classes) throws JAXBException {
206206
return new JettisonJaxbContext(JettisonConfig.badgerFish().build(), classes);

tests/e2e-entity/src/test/java/org/glassfish/jersey/tests/e2e/entity/JAXBContextResolverTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2010, 2022 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2010, 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
@@ -191,7 +191,7 @@ public void testJAXBContext() throws Exception {
191191
}
192192

193193
@Nested
194-
public static class UnmarshallerTest extends AbstractTypeTester {
194+
class UnmarshallerTest extends AbstractTypeTester {
195195

196196
private JAXBContextResolver cr;
197197
private MarshallerResolver mr;
@@ -244,7 +244,7 @@ public static class JaxbBeanResourceApp extends JaxbBeanResource {
244244
}
245245

246246
@Nested
247-
public static class JAXBContextAppTest extends AbstractTypeTester {
247+
class JAXBContextAppTest extends AbstractTypeTester {
248248

249249
private JAXBContextResolver cr;
250250
private JAXBContextResolverApp crApp;
@@ -266,7 +266,7 @@ public void testJAXBContextApp() throws Exception {
266266
}
267267

268268
@Nested
269-
public static class UnmarshallerAppTest extends AbstractTypeTester {
269+
class UnmarshallerAppTest extends AbstractTypeTester {
270270

271271
private JAXBContextResolver cr;
272272
private MarshallerResolver mr;
@@ -330,7 +330,7 @@ public static class JaxbBeanResourceText extends JaxbBeanResource {
330330
}
331331

332332
@Nested
333-
public static class JAXBContextTextTest extends AbstractTypeTester {
333+
class JAXBContextTextTest extends AbstractTypeTester {
334334

335335
private JAXBContextResolver cr;
336336
private JAXBContextResolverText crText;
@@ -351,7 +351,7 @@ public void testJAXBContextText() throws Exception {
351351
}
352352

353353
@Nested
354-
public static class UnmarshallerTextTest extends AbstractTypeTester {
354+
class UnmarshallerTextTest extends AbstractTypeTester {
355355

356356
private JAXBContextResolver cr;
357357
private MarshallerResolver mr;
@@ -400,7 +400,7 @@ public static class JaxbBeanResourceFoo extends JaxbBeanResource {
400400
}
401401

402402
@Nested
403-
public static class UnmarshallerFooTest extends AbstractTypeTester {
403+
class UnmarshallerFooTest extends AbstractTypeTester {
404404

405405
private JAXBContextResolver cr;
406406
private MarshallerResolver mr;
@@ -465,7 +465,7 @@ public JaxbBean getText(JaxbBean b) {
465465
}
466466

467467
@Nested
468-
public static class JAXBContextAllTest extends AbstractTypeTester {
468+
class JAXBContextAllTest extends AbstractTypeTester {
469469

470470
private JAXBContextResolver cr;
471471
private JAXBContextResolverApp crApp;
@@ -501,7 +501,7 @@ public void testJAXBContextAll() throws Exception {
501501
}
502502

503503
@Nested
504-
public static class UnmarshallerAllTest extends AbstractTypeTester {
504+
class UnmarshallerAllTest extends AbstractTypeTester {
505505

506506
private JAXBContextResolver cr;
507507
private JAXBContextResolverApp crApp;
@@ -616,7 +616,7 @@ public OtherJaxbBean getText(OtherJaxbBean b) {
616616
}
617617

618618
@Nested
619-
public static class JAXBContextAllWithOtherJaxbBeanTest extends AbstractTypeTester {
619+
class JAXBContextAllWithOtherJaxbBeanTest extends AbstractTypeTester {
620620

621621
private JAXBContextResolver cr;
622622
private JAXBContextResolverApp crApp;

tests/e2e-testng/src/test/java/org/glassfish/jersey/tests/e2e/ContainerPerClassTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2014, 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
@@ -27,8 +27,8 @@
2727
import org.glassfish.jersey.server.ResourceConfig;
2828
import org.glassfish.jersey.test.JerseyTestNg;
2929

30+
import org.testng.Assert;
3031
import org.testng.annotations.Test;
31-
import static org.testng.Assert.assertEquals;
3232

3333
/**
3434
* Tests that container is created only once per class and each test method sends request to the same container.
@@ -73,7 +73,7 @@ public void third() throws Exception {
7373
private void test(final Integer expected) {
7474
final Response response = target().request().get();
7575

76-
assertEquals(response.getStatus(), 200);
77-
assertEquals(response.readEntity(Integer.class), expected);
76+
Assert.assertEquals(response.getStatus(), 200);
77+
Assert.assertEquals(response.readEntity(Integer.class), expected);
7878
}
7979
}

tests/e2e-tls/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
<dependency>
9797
<groupId>io.specto</groupId>
9898
<artifactId>hoverfly-java-junit5</artifactId>
99-
<version>0.18.1</version>
99+
<version>0.20.2</version>
100100
<scope>test</scope>
101101
</dependency>
102102

tests/integration/microprofile/rest-client/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,12 @@
8686
<version>${junit4.version}</version>
8787
<scope>test</scope>
8888
</dependency>
89+
<dependency> <!--added due to an issue in JUnit 5 dependencies for junit-vintage-engine -->
90+
<groupId>org.junit.platform</groupId>
91+
<artifactId>junit-platform-launcher</artifactId>
92+
<version>${junit-platform-suite.version}</version>
93+
<scope>test</scope>
94+
</dependency>
8995
<dependency>
9096
<groupId>com.github.tomakehurst</groupId>
9197
<artifactId>wiremock</artifactId>

0 commit comments

Comments
 (0)