Skip to content

Commit 8e4a0ca

Browse files
robertlazarskirobertlazarski
committed
RAMPART-454 Bump build to JDK 17 baseline; refresh plugin and library versions
Build / toolchain: - maven-compiler-plugin: <source>/<target>11 -> <release>17 (and property maven.compiler.target -> maven.compiler.release=17). - Enforcer: add requireJavaVersion [17,) so the build fails fast on older JDKs. Still tested on OpenJDK 17, 21 and 25. - Drop animal-sniffer-maven-plugin: it was pinned to the java18 (JDK 1.8) signature, which is meaningless once the baseline is 17; --release 17 already provides an equivalent (stronger) API bound via ct.sym. - jacoco-maven-plugin: pick up the ${jacoco.version} property instead of hard-coding 0.8.12, and bump to 0.8.14 (supports Java 25 class files, which Ubuntu 25.10's default JVM emits when the sample Ant tasks fork). - Drop the duplicate <dependencyManagement> block for the wss4j artifacts that Maven was warning about ("must be unique"). Plugin bumps: - maven-surefire-plugin 3.5.2 -> 3.5.5 - build-helper-maven-plugin 3.6.0 -> 3.6.1 - gmavenplus-plugin 4.0.1 -> 4.3.1 - maven-dependency-plugin 3.8.0 -> 3.10.0 - maven-antrun-plugin 3.1.0 -> 3.2.0 - maven-assembly-plugin 3.7.1 -> 3.8.0 - maven-javadoc-plugin 3.11.1 -> 3.12.0 - maven-enforcer-plugin 3.5.0 -> 3.6.2 - maven-compiler-plugin 3.13.0 -> 3.15.0 - maven-project-info-reports-plugin 3.8.0 -> 3.9.0 Library bumps: - dropwizard metrics-core 4.2.19 -> 4.2.38 - cryptacular 1.2.4 -> 1.3.0 - bouncycastle bcprov/bcpkix-jdk18on 1.79 -> 1.83 - santuario xmlsec 4.0.3 -> 4.0.4 - aspectjrt / aspectjweaver 1.9.22.1 -> 1.9.25.1 - jakarta.xml.bind-api 4.0.2 -> 4.0.5 Intentionally skipped (alpha/beta/milestone or cross-major): log4j 3.x, slf4j 2.1.0-alpha1, jakarta.servlet-api 6.2.0-M1, maven-compiler-plugin 4.0.0-beta-*, maven-site-plugin 4.0.0-M16, groovy-all 5.x, esapi 2.7.x-RC1.
1 parent 55f3274 commit 8e4a0ca

1 file changed

Lines changed: 42 additions & 68 deletions

File tree

‎pom.xml‎

Lines changed: 42 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,17 @@
169169
<plugin>
170170
<groupId>org.apache.maven.plugins</groupId>
171171
<artifactId>maven-surefire-plugin</artifactId>
172-
<version>3.5.2</version>
172+
<version>3.5.5</version>
173173
</plugin>
174174
<plugin>
175175
<groupId>org.codehaus.mojo</groupId>
176176
<artifactId>build-helper-maven-plugin</artifactId>
177-
<version>3.6.0</version>
177+
<version>3.6.1</version>
178178
</plugin>
179179
<plugin>
180180
<groupId>org.codehaus.gmavenplus</groupId>
181181
<artifactId>gmavenplus-plugin</artifactId>
182-
<version>4.0.1</version>
182+
<version>4.3.1</version>
183183
<dependencies>
184184
<dependency>
185185
<groupId>org.apache.groovy</groupId>
@@ -191,11 +191,11 @@
191191
</plugin>
192192
<plugin>
193193
<artifactId>maven-dependency-plugin</artifactId>
194-
<version>3.8.0</version>
194+
<version>3.10.0</version>
195195
</plugin>
196196
<plugin>
197197
<artifactId>maven-antrun-plugin</artifactId>
198-
<version>3.1.0</version>
198+
<version>3.2.0</version>
199199
</plugin>
200200
<plugin>
201201
<groupId>org.apache.axis2</groupId>
@@ -212,11 +212,11 @@
212212
</plugin>
213213
<plugin>
214214
<artifactId>maven-assembly-plugin</artifactId>
215-
<version>3.7.1</version>
215+
<version>3.8.0</version>
216216
</plugin>
217217
<plugin>
218218
<artifactId>maven-javadoc-plugin</artifactId>
219-
<version>3.11.1</version>
219+
<version>3.12.0</version>
220220
</plugin>
221221
<plugin>
222222
<groupId>com.github.veithen.alta</groupId>
@@ -228,7 +228,7 @@
228228
<plugins>
229229
<plugin>
230230
<artifactId>maven-enforcer-plugin</artifactId>
231-
<version>3.5.0</version>
231+
<version>3.6.2</version>
232232
<executions>
233233
<execution>
234234
<phase>validate</phase>
@@ -245,6 +245,9 @@
245245
<allowSnapshotRepositories>true</allowSnapshotRepositories>
246246
<allowSnapshotPluginRepositories>true</allowSnapshotPluginRepositories>
247247
</requireNoRepositories>
248+
<requireJavaVersion>
249+
<version>[17,)</version>
250+
</requireJavaVersion>
248251
</rules>
249252
</configuration>
250253
</execution>
@@ -308,7 +311,7 @@
308311
<plugin>
309312
<groupId>org.jacoco</groupId>
310313
<artifactId>jacoco-maven-plugin</artifactId>
311-
<version>0.8.12</version>
314+
<version>${jacoco.version}</version>
312315
<configuration>
313316
<skip>${skipJacoco}</skip>
314317
</configuration>
@@ -348,34 +351,11 @@
348351
<plugin>
349352
<groupId>org.apache.maven.plugins</groupId>
350353
<artifactId>maven-compiler-plugin</artifactId>
351-
<version>3.13.0</version>
354+
<version>3.15.0</version>
352355
<configuration>
353-
<source>11</source>
354-
<target>11</target>
356+
<release>17</release>
355357
</configuration>
356358
</plugin>
357-
<plugin>
358-
<groupId>org.codehaus.mojo</groupId>
359-
<artifactId>animal-sniffer-maven-plugin</artifactId>
360-
<version>1.24</version>
361-
<executions>
362-
<execution>
363-
<id>check</id>
364-
<phase>verify</phase>
365-
<goals>
366-
<goal>check</goal>
367-
</goals>
368-
<configuration>
369-
<signature>
370-
<groupId>org.codehaus.mojo.signature</groupId>
371-
<artifactId>java18</artifactId>
372-
<version>1.0</version>
373-
</signature>
374-
</configuration>
375-
</execution>
376-
</executions>
377-
</plugin>
378-
379359
<plugin>
380360
<artifactId>maven-site-plugin</artifactId>
381361
<executions>
@@ -441,7 +421,7 @@
441421
<plugins>
442422
<plugin>
443423
<artifactId>maven-project-info-reports-plugin</artifactId>
444-
<version>3.8.0</version>
424+
<version>3.9.0</version>
445425
<reportSets>
446426
<reportSet>
447427
<reports>
@@ -572,6 +552,22 @@
572552
<version>${opensaml.version}</version>
573553
<scope>compile</scope>
574554
</dependency>
555+
<dependency>
556+
<groupId>org.opensaml</groupId>
557+
<artifactId>opensaml-core-impl</artifactId>
558+
<version>${opensaml.version}</version>
559+
</dependency>
560+
<!-- Override stale 4.x transitive deps pulled by WSS4J 3.0.3 -->
561+
<dependency>
562+
<groupId>org.opensaml</groupId>
563+
<artifactId>opensaml-xacml-saml-impl</artifactId>
564+
<version>${opensaml.version}</version>
565+
</dependency>
566+
<dependency>
567+
<groupId>org.opensaml</groupId>
568+
<artifactId>opensaml-xacml-saml-api</artifactId>
569+
<version>${opensaml.version}</version>
570+
</dependency>
575571
<dependency>
576572
<groupId>org.opensaml</groupId>
577573
<artifactId>opensaml-saml-api</artifactId>
@@ -735,7 +731,7 @@
735731
<dependency>
736732
<groupId>org.apache.santuario</groupId>
737733
<artifactId>xmlsec</artifactId>
738-
<version>4.0.3</version>
734+
<version>4.0.4</version>
739735
<exclusions>
740736
<exclusion>
741737
<groupId>com.sun.activation</groupId>
@@ -751,39 +747,17 @@
751747
<dependency>
752748
<groupId>org.aspectj</groupId>
753749
<artifactId>aspectjrt</artifactId>
754-
<version>1.9.22.1</version>
750+
<version>1.9.25.1</version>
755751
</dependency>
756752
<dependency>
757753
<groupId>org.aspectj</groupId>
758754
<artifactId>aspectjweaver</artifactId>
759-
<version>1.9.22.1</version>
755+
<version>1.9.25.1</version>
760756
</dependency>
761757
<dependency>
762758
<groupId>jakarta.xml.bind</groupId>
763759
<artifactId>jakarta.xml.bind-api</artifactId>
764-
<version>4.0.2</version>
765-
</dependency>
766-
767-
<!-- WSS4J dependency management -->
768-
<dependency>
769-
<groupId>org.apache.wss4j</groupId>
770-
<artifactId>wss4j-ws-security-common</artifactId>
771-
<version>${wss4j.version}</version>
772-
</dependency>
773-
<dependency>
774-
<groupId>org.apache.wss4j</groupId>
775-
<artifactId>wss4j-ws-security-dom</artifactId>
776-
<version>${wss4j.version}</version>
777-
</dependency>
778-
<dependency>
779-
<groupId>org.apache.wss4j</groupId>
780-
<artifactId>wss4j-policy</artifactId>
781-
<version>${wss4j.version}</version>
782-
</dependency>
783-
<dependency>
784-
<groupId>org.apache.wss4j</groupId>
785-
<artifactId>wss4j-bindings</artifactId>
786-
<version>${wss4j.version}</version>
760+
<version>4.0.5</version>
787761
</dependency>
788762

789763
</dependencies>
@@ -848,21 +822,21 @@
848822
<axis2.version>2.0.1-SNAPSHOT</axis2.version>
849823
<axiom.version>2.0.0</axiom.version>
850824

851-
<wss4j.version>3.0.3</wss4j.version>
825+
<wss4j.version>4.0.1</wss4j.version>
852826
<opensaml.version>5.2.1</opensaml.version>
853827
<shibboleth.utilities.version>8.4.2</shibboleth.utilities.version>
854-
<dropwizard.metrics.version>4.2.19</dropwizard.metrics.version>
855-
<cryptacular.version>1.2.4</cryptacular.version>
828+
<dropwizard.metrics.version>4.2.38</dropwizard.metrics.version>
829+
<cryptacular.version>1.3.0</cryptacular.version>
856830

857-
<bcprov.jdk18.version>1.79</bcprov.jdk18.version>
831+
<bcprov.jdk18.version>1.83</bcprov.jdk18.version>
858832

859833
<failIfNoTests>false</failIfNoTests>
860834

861-
<jacoco.version>0.8.12</jacoco.version>
835+
<jacoco.version>0.8.14</jacoco.version>
862836
<slf4j.version>2.0.16</slf4j.version>
863837
<log4j.version>2.25.4</log4j.version>
864-
<!-- see the parent artifact 'apache' i.e 33, it defaults to a older version-->
865-
<maven.compiler.target>11</maven.compiler.target>
838+
<!-- see the parent artifact 'apache' i.e 33, it defaults to a older version-->
839+
<maven.compiler.release>17</maven.compiler.release>
866840
</properties>
867841

868842
<pluginRepositories>

0 commit comments

Comments
 (0)