From 6048c961d3ccaab30f3010607e9c1d397b0af765 Mon Sep 17 00:00:00 2001
From: Lukas Jungmann <lukas.jungmann@oracle.com>
Date: Wed, 7 Jun 2023 13:03:34 +0200
Subject: [PATCH] Integrate jaxb-ri 4.0.3, angus activation 2.0.1, angus mail
 2.0.2, jakarta activation-api 2.1.2, jakarta mail-api 2.1.2, woodstox 6.5.1

Signed-off-by: Lukas Jungmann <lukas.jungmann@oracle.com>
---
 jaxws-ri/boms/bom-ext/pom.xml              |  8 ++---
 jaxws-ri/boms/bom/pom.xml                  | 35 +++++++++++++++++++---
 jaxws-ri/extras/jaxws-maven-plugin/pom.xml |  4 +--
 jaxws-ri/pom.xml                           |  2 +-
 jaxws-ri/runtime/policy/pom.xml            | 27 +++++++++++++++--
 5 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/jaxws-ri/boms/bom-ext/pom.xml b/jaxws-ri/boms/bom-ext/pom.xml
index f36499199..c104aacda 100644
--- a/jaxws-ri/boms/bom-ext/pom.xml
+++ b/jaxws-ri/boms/bom-ext/pom.xml
@@ -33,11 +33,11 @@
     <properties>
         <ant.version>1.10.12</ant.version>
         <!-- CQ 21208 -->
-        <asm.version>9.4</asm.version>
+        <asm.version>9.5</asm.version>
         <eclipselink.version>4.0.0</eclipselink.version>
         <junit.version>4.13.2</junit.version>
-        <mail-api.version>2.1.1</mail-api.version>
-        <angus-mail.version>2.0.1</angus-mail.version>
+        <mail-api.version>2.1.2</mail-api.version>
+        <angus-mail.version>2.0.2</angus-mail.version>
         <servlet-api.version>6.0.0</servlet-api.version>
     </properties>
             
@@ -104,8 +104,6 @@
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <type>jar</type>
-                <classifier>sources</classifier>
                 <version>${asm.version}</version>
             </dependency>
 
diff --git a/jaxws-ri/boms/bom/pom.xml b/jaxws-ri/boms/bom/pom.xml
index 9287f78a3..366a2ee01 100644
--- a/jaxws-ri/boms/bom/pom.xml
+++ b/jaxws-ri/boms/bom/pom.xml
@@ -36,17 +36,17 @@
         <istack.plugin.version>4.1.2</istack.plugin.version>
         <gmbal-api.version>4.0.3</gmbal-api.version>
         <ha-api.version>3.1.13</ha-api.version>
-        <jaxb.version>4.0.2</jaxb.version>
+        <jaxb.version>4.0.3</jaxb.version>
         <xml.ws-api.version>4.0.0</xml.ws-api.version>
         <management-api.version>3.2.3</management-api.version>
         <mimepull.version>1.10.0</mimepull.version>
         <saaj-api.version>3.0.0</saaj-api.version>
         <saaj-impl.version>3.0.2</saaj-impl.version>
         <streambuffer.version>2.1.0</streambuffer.version>
-        <woodstox-core.version>6.5.0</woodstox-core.version>
+        <woodstox-core.version>6.5.1</woodstox-core.version>
         <stax2-api.version>4.2.1</stax2-api.version>
-        <activation-api.version>2.1.1</activation-api.version>
-        <angus-activation.version>2.0.0</angus-activation.version>
+        <activation-api.version>2.1.2</activation-api.version>
+        <angus-activation.version>2.0.1</angus-activation.version>
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
     </properties>
 
@@ -229,4 +229,31 @@
         </dependencies>
     </dependencyManagement>
 
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>versions-maven-plugin</artifactId>
+                    <version>2.15.0</version>
+                    <configuration>
+                        <ruleSet>
+                            <rules>
+                                <rule>
+                                    <!-- 4.2.0+ comes with no SecurityManager support -->
+                                    <groupId>com.sun.istack</groupId>
+                                    <ignoreVersions>
+                                        <ignoreVersion>
+                                            <type>regex</type>
+                                            <version>4.[2-9]+.*</version>
+                                        </ignoreVersion>
+                                    </ignoreVersions>
+                                </rule>
+                            </rules>
+                        </ruleSet>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 </project>
diff --git a/jaxws-ri/extras/jaxws-maven-plugin/pom.xml b/jaxws-ri/extras/jaxws-maven-plugin/pom.xml
index 94598b0ea..e9bd05bcf 100644
--- a/jaxws-ri/extras/jaxws-maven-plugin/pom.xml
+++ b/jaxws-ri/extras/jaxws-maven-plugin/pom.xml
@@ -93,7 +93,7 @@
             <dependency>
                 <groupId>org.testng</groupId>
                 <artifactId>testng</artifactId>
-                <version>7.7.1</version>
+                <version>7.8.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.maven</groupId>
@@ -171,7 +171,7 @@
         <spotbugs.exclude/>
         <spotbugs.skip>false</spotbugs.skip>
         <spotbugs.threshold>Normal</spotbugs.threshold>
-        <spotbugs.version>4.7.3.0</spotbugs.version>
+        <spotbugs.version>4.7.3.4</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>
diff --git a/jaxws-ri/pom.xml b/jaxws-ri/pom.xml
index 240b8af5c..f9c4700c4 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.0</spotbugs.version>
+        <spotbugs.version>4.7.3.4</spotbugs.version>
         <findsecbugs.version>1.11.0</findsecbugs.version>
 
         <maven.compiler.release>11</maven.compiler.release>
diff --git a/jaxws-ri/runtime/policy/pom.xml b/jaxws-ri/runtime/policy/pom.xml
index 73b8f6a8e..f6a534d36 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.0</spotbugs.version>
+        <spotbugs.version>4.7.3.4</spotbugs.version>
         <findsecbugs.version>1.11.0</findsecbugs.version>
 
         <maven.compiler.release>11</maven.compiler.release>
@@ -99,9 +99,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <legal.doc.source>${project.basedir}/../../..</legal.doc.source>
 
-        <jaxb.version>4.0.2</jaxb.version>
+        <jaxb.version>4.0.3</jaxb.version>
         <junit.version>4.13.2</junit.version>
-        <istack.plugin.version>4.1.1</istack.plugin.version>
+        <istack.plugin.version>4.1.2</istack.plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -208,6 +208,27 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <version>3.0.0-M8</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>versions-maven-plugin</artifactId>
+                    <version>2.15.0</version>
+                    <configuration>
+                        <ruleSet>
+                            <rules>
+                                <rule>
+                                    <!-- 4.2.0+ comes with no SecurityManager support -->
+                                    <groupId>com.sun.istack</groupId>
+                                    <ignoreVersions>
+                                        <ignoreVersion>
+                                            <type>regex</type>
+                                            <version>4.[2-9]+.*</version>
+                                        </ignoreVersion>
+                                    </ignoreVersions>
+                                </rule>
+                            </rules>
+                        </ruleSet>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>