Skip to content

Commit dc92f77

Browse files
authored
Merge pull request #958 from arjantijms/23x_update_versions
Update various versions in pom.xml
2 parents a4d6c67 + 6a95dee commit dc92f77

File tree

6 files changed

+52
-39
lines changed

6 files changed

+52
-39
lines changed

archetypes/echo/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
<plugin>
4545
<groupId>org.apache.maven.plugins</groupId>
4646
<artifactId>maven-resources-plugin</artifactId>
47-
<version>3.3.1</version>
47+
<version>3.5.0</version>
4848
<configuration>
4949
<escapeString>\</escapeString>
5050
</configuration>
5151
</plugin>
5252
<plugin>
5353
<groupId>org.apache.maven.plugins</groupId>
5454
<artifactId>maven-archetype-plugin</artifactId>
55-
<version>2.2</version>
55+
<version>3.4.1</version>
5656
<executions>
5757
<execution>
5858
<id>update-local-catalog</id>

archetypes/echo/src/main/resources/archetype-resources/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<java.version>21</java.version>
7272
<tyrus.version>${project.version}</tyrus.version>
7373
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
74-
<maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
75-
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>
74+
<maven.compiler.plugin.version>3.15.0</maven.compiler.plugin.version>
75+
<maven.war.plugin.version>3.5.1</maven.war.plugin.version>
7676
</properties>
7777
</project>

pom.xml

Lines changed: 24 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.eclipse.ee4j</groupId>
2525
<artifactId>project</artifactId>
26-
<version>2.0.0</version>
26+
<version>2.0.1</version>
2727
</parent>
2828

2929
<groupId>org.glassfish.tyrus</groupId>
@@ -153,7 +153,7 @@
153153
<json-api.version>2.1.3</json-api.version>
154154

155155
<annotation-api.version>3.0.0</annotation-api.version>
156-
<activation.api.version>2.1.3</activation.api.version> <!-- inherited from JAX-B -->
156+
<activation.api.version>2.2.0-M1</activation.api.version> <!-- inherited from JAX-B -->
157157
<cdi-api.version>5.0.0.Alpha3</cdi-api.version>
158158
<ejb-api.version>4.0.1</ejb-api.version>
159159
<glassfish.version>7.1.0</glassfish.version>
@@ -168,20 +168,20 @@
168168

169169

170170

171-
<maven.compiler.plugin.version>3.14.0</maven.compiler.plugin.version>
172-
<maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
173-
<maven.surefire.plugin.version>3.5.3</maven.surefire.plugin.version>
174-
<maven.war.plugin.version>3.4.0</maven.war.plugin.version>
175-
<maven.bundle.plugin.version>6.0.0</maven.bundle.plugin.version>
176-
<cyclonedx.mvn.plugin.version>2.8.0</cyclonedx.mvn.plugin.version>
171+
<maven.compiler.plugin.version>3.15.0</maven.compiler.plugin.version>
172+
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
173+
<maven.surefire.plugin.version>3.5.5</maven.surefire.plugin.version>
174+
<maven.war.plugin.version>3.5.1</maven.war.plugin.version>
175+
<maven.bundle.plugin.version>6.0.2</maven.bundle.plugin.version>
176+
<cyclonedx.mvn.plugin.version>2.9.1</cyclonedx.mvn.plugin.version>
177177

178178
<api_package>jakarta.websocket</api_package>
179179
<impl_namespace>org.glassfish</impl_namespace>
180180
<spec_version>0.0</spec_version>
181-
<new_spec_version>2.2</new_spec_version>
182-
<new_impl_version>2.2</new_impl_version>
181+
<new_spec_version>2.3</new_spec_version>
182+
<new_impl_version>2.3</new_impl_version>
183183
<build_number>11</build_number>
184-
<spec_impl_version>2.2.0</spec_impl_version>
184+
<spec_impl_version>2.3.0</spec_impl_version>
185185
<impl_version>0.0.0</impl_version>
186186

187187
<impljar.extensionName>${api_package}</impljar.extensionName>
@@ -416,47 +416,47 @@
416416
<plugin>
417417
<groupId>org.apache.maven.plugins</groupId>
418418
<artifactId>maven-clean-plugin</artifactId>
419-
<version>3.4.1</version>
419+
<version>3.5.0</version>
420420
</plugin>
421421
<plugin>
422422
<artifactId>maven-antrun-plugin</artifactId>
423-
<version>3.1.0</version>
423+
<version>3.2.0</version>
424424
</plugin>
425425
<plugin>
426426
<artifactId>maven-assembly-plugin</artifactId>
427-
<version>3.7.1</version>
427+
<version>3.8.0</version>
428428
</plugin>
429429
<plugin>
430430
<artifactId>maven-source-plugin</artifactId>
431-
<version>3.3.1</version>
431+
<version>3.4.0</version>
432432
</plugin>
433433
<plugin>
434434
<artifactId>maven-compiler-plugin</artifactId>
435435
<version>${maven.compiler.plugin.version}</version>
436436
</plugin>
437437
<plugin>
438438
<artifactId>maven-release-plugin</artifactId>
439-
<version>3.0.1</version>
439+
<version>3.3.1</version>
440440
</plugin>
441441
<plugin>
442442
<artifactId>maven-dependency-plugin</artifactId>
443-
<version>3.6.1</version>
443+
<version>3.10.0</version>
444444
</plugin>
445445
<plugin>
446446
<artifactId>maven-deploy-plugin</artifactId>
447-
<version>3.1.2</version>
447+
<version>3.1.4</version>
448448
</plugin>
449449
<plugin>
450450
<artifactId>maven-surefire-plugin</artifactId>
451451
<version>${maven.surefire.plugin.version}</version>
452452
</plugin>
453453
<plugin>
454454
<artifactId>maven-failsafe-plugin</artifactId>
455-
<version>3.2.5</version>
455+
<version>3.5.5</version>
456456
</plugin>
457457
<plugin>
458458
<artifactId>maven-shade-plugin</artifactId>
459-
<version>3.5.3</version>
459+
<version>3.6.2</version>
460460
</plugin>
461461
<plugin>
462462
<artifactId>maven-war-plugin</artifactId>
@@ -468,7 +468,7 @@
468468
<plugin>
469469
<groupId>org.codehaus.mojo</groupId>
470470
<artifactId>build-helper-maven-plugin</artifactId>
471-
<version>3.6.0</version>
471+
<version>3.6.1</version>
472472
<executions>
473473
<execution>
474474
<phase>generate-sources</phase>
@@ -560,7 +560,7 @@
560560
<plugin>
561561
<groupId>org.codehaus.mojo</groupId>
562562
<artifactId>exec-maven-plugin</artifactId>
563-
<version>3.1.0</version>
563+
<version>3.6.3</version>
564564
</plugin>
565565
<plugin>
566566
<groupId>com.sun.tools.xjc.maven2</groupId>
@@ -570,14 +570,7 @@
570570
<plugin>
571571
<groupId>org.apache.maven.plugins</groupId>
572572
<artifactId>maven-checkstyle-plugin</artifactId>
573-
<version>3.1.0</version>
574-
<dependencies>
575-
<dependency>
576-
<groupId>com.puppycrawl.tools</groupId>
577-
<artifactId>checkstyle</artifactId>
578-
<version>8.30</version>
579-
</dependency>
580-
</dependencies>
573+
<version>3.6.0</version>
581574
</plugin>
582575
<plugin>
583576
<groupId>org.sonatype.plugins</groupId>
@@ -872,7 +865,7 @@
872865
<plugin>
873866
<groupId>org.owasp</groupId>
874867
<artifactId>dependency-check-maven</artifactId>
875-
<version>12.1.1</version>
868+
<version>12.2.0</version>
876869
<executions>
877870
<execution>
878871
<goals>

samples/shared-collection/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>org.glassfish.jersey.media</groupId>
5858
<artifactId>jersey-media-sse</artifactId>
59-
<version>4.0.2</version>
59+
<version>5.0.0-M1</version>
6060
<scope>provided</scope>
6161
</dependency>
6262

tests/plugins/pom.xml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.eclipse.ee4j</groupId>
2525
<artifactId>project</artifactId>
26-
<version>2.0.0</version>
26+
<version>2.0.1</version>
2727
</parent>
2828

2929
<artifactId>plugins-tests</artifactId>
@@ -60,6 +60,26 @@
6060
</pluginManagement>
6161

6262
<plugins>
63+
<!-- Sets minimal Maven version to 3.9.6 -->
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-enforcer-plugin</artifactId>
67+
<executions>
68+
<execution>
69+
<id>enforce-maven</id>
70+
<goals>
71+
<goal>enforce</goal>
72+
</goals>
73+
<configuration>
74+
<rules>
75+
<requireMavenVersion>
76+
<version>3.9.6</version>
77+
</requireMavenVersion>
78+
</rules>
79+
</configuration>
80+
</execution>
81+
</executions>
82+
</plugin>
6383
<plugin>
6484
<groupId>org.sonatype.central</groupId>
6585
<artifactId>central-publishing-maven-plugin</artifactId>
@@ -150,7 +170,7 @@
150170
<plugin>
151171
<groupId>org.apache.maven.plugins</groupId>
152172
<artifactId>maven-failsafe-plugin</artifactId>
153-
<version>3.5.3</version>
173+
<version>3.5.5</version>
154174
<executions>
155175
<execution>
156176
<id>VerifyUpdatableJar</id>

tests/release-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<maven.compiler.source>${java.version}</maven.compiler.source>
3939
<maven.compiler.target>${java.version}</maven.compiler.target>
4040
<maven.version>3.8.6</maven.version>
41-
<maven.resolver.version>1.7.3</maven.resolver.version><!-- 1.8.2 does not work-->
41+
<maven.resolver.version>1.7.3</maven.resolver.version><!-- 1.8.2 and 2.0.16 do not work-->
4242
<httpclient.version>4.5.14</httpclient.version>
4343
</properties>
4444

0 commit comments

Comments
 (0)