From ebb15a2d531c59bbbb4ae96916f8332eaa4baf10 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Tue, 10 Oct 2023 14:55:13 +0200
Subject: [PATCH] update build plugins, test harness, ant to 1.10.14

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 .github/workflows/maven.yml                   |  4 +-
 jaxws-ri/boms/bom-ext/pom.xml                 |  4 +-
 jaxws-ri/boms/bom/pom.xml                     |  8 ++--
 jaxws-ri/extras/jaxws-maven-plugin/pom.xml    | 48 +++++++++++++------
 .../jax_ws_commons/jaxws/MainWsGenMojo.java   |  2 +-
 .../src/test/it/parent/pom.xml                |  4 +-
 .../jaxws/WsImportMojoTest.java               |  2 +-
 jaxws-ri/pom.xml                              | 10 ++--
 jaxws-ri/runtime/policy/pom.xml               | 10 ++--
 jaxws-ri/tests/pom.xml                        |  2 +-
 10 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e3043bb78..e66e840eb 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -80,7 +80,7 @@ jobs:
         run: |
           export ROOT=`pwd`
           unzip -q -d image jaxws-ri.zip
-          wget -q -O tomcat.zip https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.5/bin/apache-tomcat-10.1.5.zip
+          wget -q -O tomcat.zip https://archive.apache.org/dist/tomcat/tomcat-10/v10.1.14/bin/apache-tomcat-10.1.14.zip
           unzip -q tomcat.zip
           cd jaxws-ri
-          mvn -B -V -U -C -am clean verify -Poss-release,staging -Dgpg.skip=true -Doss.disallow.snapshots=false -pl :jaxws-unit -Dtomcat.home=$ROOT/apache-tomcat-10.1.5 -Dws.transport=${{ matrix.test_suite }} -Dws.localImage=$ROOT/image
+          mvn -B -V -U -C -am clean verify -Poss-release,staging -Dgpg.skip=true -Doss.disallow.snapshots=false -pl :jaxws-unit -Dtomcat.home=$ROOT/apache-tomcat-10.1.14 -Dws.transport=${{ matrix.test_suite }} -Dws.localImage=$ROOT/image
diff --git a/jaxws-ri/boms/bom-ext/pom.xml b/jaxws-ri/boms/bom-ext/pom.xml
index 2b2cd5ca9..166bae863 100644
--- a/jaxws-ri/boms/bom-ext/pom.xml
+++ b/jaxws-ri/boms/bom-ext/pom.xml
@@ -31,9 +31,9 @@
     <description>JAX-WS Reference Implementation Bill-of-Materials (BOM) Extensions</description>
 
     <properties>
-        <ant.version>1.10.12</ant.version>
+        <ant.version>1.10.14</ant.version>
         <!-- CQ 21208 -->
-        <asm.version>9.5</asm.version>
+        <asm.version>9.6</asm.version>
         <eclipselink.version>4.0.2</eclipselink.version>
         <junit.version>4.13.2</junit.version>
         <mail-api.version>2.1.2</mail-api.version>
diff --git a/jaxws-ri/boms/bom/pom.xml b/jaxws-ri/boms/bom/pom.xml
index 5add94f4b..8a53e8996 100644
--- a/jaxws-ri/boms/bom/pom.xml
+++ b/jaxws-ri/boms/bom/pom.xml
@@ -235,17 +235,17 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -260,7 +260,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.16.0</version>
+                    <version>2.16.1</version>
                     <configuration>
                         <ruleSet>
                             <rules>
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/pom.xml
index a82d4f1e5..56b192582 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/pom.xml
@@ -73,17 +73,27 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-plugin-api</artifactId>
-                <version>3.9.4</version>
+                <version>3.9.5</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-core</artifactId>
-                <version>3.9.4</version>
+                <version>3.9.5</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.plexus</groupId>
                 <artifactId>plexus-utils</artifactId>
-                <version>3.5.1</version>
+                <version>4.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.plexus</groupId>
+                <artifactId>plexus-xml</artifactId>
+                <version>4.0.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.maven</groupId>
+                <artifactId>maven-xml-impl</artifactId>
+                <version>4.0.0-alpha-7</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.plugin-tools</groupId>
@@ -98,17 +108,17 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-settings</artifactId>
-                <version>3.9.4</version>
+                <version>3.9.5</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.resolver</groupId>
                 <artifactId>maven-resolver-api</artifactId>
-                <version>1.9.15</version>
+                <version>1.9.16</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven.resolver</groupId>
                 <artifactId>maven-resolver-util</artifactId>
-                <version>1.9.15</version>
+                <version>1.9.16</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -132,7 +142,15 @@
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-xml</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-xml-impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
@@ -171,7 +189,7 @@
         <spotbugs.exclude/>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Normal</spotbugs.threshold>
-        <spotbugs.version>4.7.3.5</spotbugs.version>
+        <spotbugs.version>4.7.3.6</spotbugs.version>
         <findsecbugs.version>1.11.0</findsecbugs.version>
         <maven.compiler.release>11</maven.compiler.release>
         <maven.compiler.testRelease>${maven.compiler.release}</maven.compiler.testRelease>
@@ -194,7 +212,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -230,12 +248,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
@@ -261,7 +279,7 @@
                     <artifactId>dependency-check-maven</artifactId>
                     <version>8.4.0</version>
                     <configuration>
-                        <failBuildOnCVSS>7</failBuildOnCVSS>
+                        <failBuildOnCVSS>8</failBuildOnCVSS>
                         <assemblyAnalyzerEnabled>false</assemblyAnalyzerEnabled>
                         <formats>
                             <format>HTML</format>
@@ -288,7 +306,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>4.0.0-M9</version>
+                    <version>4.0.0-M10</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -401,12 +419,12 @@
                                 <dependency>
                                     <groupId>org.apache.groovy</groupId>
                                     <artifactId>groovy</artifactId>
-                                    <version>4.0.1</version>
+                                    <version>4.0.15</version>
                                 </dependency>
                                 <dependency>
                                     <groupId>org.apache.groovy</groupId>
                                     <artifactId>groovy-xml</artifactId>
-                                    <version>4.0.1</version>
+                                    <version>4.0.15</version>
                                 </dependency>
                             </dependencies>
                         </plugin>
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java
index ee418ee21..a4988f3c4 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/main/java/org/jvnet/jax_ws_commons/jaxws/MainWsGenMojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2021 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
  * Copyright 2006 Guillaume Nodet
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml
index 298b60b9c..6f62e26f3 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/it/parent/pom.xml
@@ -43,8 +43,8 @@
         <metro.version>@metro.version@</metro.version>
         <jaxws.plugin.version>@project.version@</jaxws.plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>7</maven.compiler.source>
-        <maven.compiler.target>7</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
     <dependencyManagement>
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java
index 01494db8b..bd89cc686 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java
+++ b/jaxws-ri/extras/jaxws-maven-plugin/src/test/java/org/jvnet/jax_ws_commons/jaxws/WsImportMojoTest.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011, 2020 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * Oracle licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
diff --git a/jaxws-ri/pom.xml b/jaxws-ri/pom.xml
index 9064e97be..75721834a 100644
--- a/jaxws-ri/pom.xml
+++ b/jaxws-ri/pom.xml
@@ -91,7 +91,7 @@
         <spotbugs.exclude/>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Normal</spotbugs.threshold>
-        <spotbugs.version>4.7.3.5</spotbugs.version>
+        <spotbugs.version>4.7.3.6</spotbugs.version>
         <findsecbugs.version>1.11.0</findsecbugs.version>
 
         <maven.compiler.release>11</maven.compiler.release>
@@ -224,12 +224,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.glassfish.hk2</groupId>
                     <artifactId>osgiversion-maven-plugin</artifactId>
-                    <version>3.0.4</version>
+                    <version>3.0.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -297,7 +297,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.1</version>
                     <configuration>
                         <archive>
                             <manifest>
@@ -347,7 +347,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <archive>
                             <manifest>
diff --git a/jaxws-ri/runtime/policy/pom.xml b/jaxws-ri/runtime/policy/pom.xml
index ad883db9b..e77e75b9e 100644
--- a/jaxws-ri/runtime/policy/pom.xml
+++ b/jaxws-ri/runtime/policy/pom.xml
@@ -79,7 +79,7 @@
         <spotbugs.exclude>${project.basedir}/exclude.xml</spotbugs.exclude>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Low</spotbugs.threshold>
-        <spotbugs.version>4.7.3.5</spotbugs.version>
+        <spotbugs.version>4.7.3.6</spotbugs.version>
         <findsecbugs.version>1.11.0</findsecbugs.version>
 
         <maven.compiler.release>11</maven.compiler.release>
@@ -186,7 +186,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -196,12 +196,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.3.0</version>
+                    <version>3.2.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.4.0</version>
+                    <version>3.4.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -216,7 +216,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.16.0</version>
+                    <version>2.16.1</version>
                     <configuration>
                         <ruleSet>
                             <rules>
diff --git a/jaxws-ri/tests/pom.xml b/jaxws-ri/tests/pom.xml
index df47aa23b..56c287c5f 100644
--- a/jaxws-ri/tests/pom.xml
+++ b/jaxws-ri/tests/pom.xml
@@ -29,7 +29,7 @@
     <name>JAX-WS RI Tests</name>
 
     <properties>
-        <test.harness.version>3.0.0-M2</test.harness.version>
+        <test.harness.version>3.0.0-M4</test.harness.version>
         <jaxwsri.dep.classifier>jar</jaxwsri.dep.classifier>
         <!-- DEFAULT = JAXB, TOPLINK = MOXy -->
         <ws.databinding>DEFAULT</ws.databinding>