From e9556f87d4f5412661eec74c9a15a6c7db5edc82 Mon Sep 17 00:00:00 2001
From: Kalin Chan <kalin.chan@payara.fish>
Date: Tue, 7 Nov 2023 13:43:55 +0000
Subject: [PATCH 1/2] FISH-7964 FISH-7239 Upgrade Metro, Santuario and Woodstox

---
 api/payara-bom/pom.xml                           | 5 -----
 appserver/appclient/client/acc/pom.xml           | 4 ----
 appserver/packager/external/metro-xmlsec/pom.xml | 5 -----
 pom.xml                                          | 6 +++---
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/api/payara-bom/pom.xml b/api/payara-bom/pom.xml
index 2ebfdbdcf5e..6457ffc2883 100644
--- a/api/payara-bom/pom.xml
+++ b/api/payara-bom/pom.xml
@@ -415,11 +415,6 @@
                 <artifactId>xmlsec</artifactId>
                 <version>${org.apache.santuario.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.glassfish.metro</groupId>
-                <artifactId>webservices-extra-xmlsec</artifactId>
-                <version>${webservices.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-extra-osgi</artifactId>
diff --git a/appserver/appclient/client/acc/pom.xml b/appserver/appclient/client/acc/pom.xml
index 612957a3941..aa3919c4b9f 100755
--- a/appserver/appclient/client/acc/pom.xml
+++ b/appserver/appclient/client/acc/pom.xml
@@ -258,10 +258,6 @@
                     <groupId>org.apache.santuario</groupId>
                     <artifactId>xmlsec</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.glassfish.metro</groupId>
-                    <artifactId>webservices-extra-xmlsec</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
diff --git a/appserver/packager/external/metro-xmlsec/pom.xml b/appserver/packager/external/metro-xmlsec/pom.xml
index cb1977fc0c9..56777ac6a2c 100755
--- a/appserver/packager/external/metro-xmlsec/pom.xml
+++ b/appserver/packager/external/metro-xmlsec/pom.xml
@@ -128,10 +128,5 @@
             <artifactId>xmlsec</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.glassfish.metro</groupId>
-            <artifactId>webservices-extra-xmlsec</artifactId>
-            <optional>true</optional>
-        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index e648d0992be..fa164133664 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,9 +142,9 @@
         <mq.version>6.3.0.payara-p3</mq.version>
         <com.ibm.jbatch.container.version>2.1.1</com.ibm.jbatch.container.version>
         <com.ibm.jbatch.spi.version>2.1.1</com.ibm.jbatch.spi.version>
-        <webservices.version>4.0.1</webservices.version>
-        <org.apache.santuario.version>3.0.2</org.apache.santuario.version>
-        <woodstox.version>6.4.0</woodstox.version>
+        <webservices.version>4.0.3.payara-p1</webservices.version>
+        <org.apache.santuario.version>4.0.0</org.apache.santuario.version>
+        <woodstox.version>6.5.1</woodstox.version>
         <woodstock-jsf.version>5.0.0</woodstock-jsf.version>
         <woodstock-jsf-suntheme.version>5.0.0.payara-p1</woodstock-jsf-suntheme.version>
         <angus.activation.version>1.0.0</angus.activation.version>

From 8786177093148410fa343bdcf44dba896a4665d3 Mon Sep 17 00:00:00 2001
From: Kalin Chan <kalin.chan@payara.fish>
Date: Wed, 8 Nov 2023 13:12:48 +0000
Subject: [PATCH 2/2] FISH-7239 FISH-7222 Update 3rd party license file

---
 .../src/main/resources/glassfish/legal/3RD-PARTY-LICENSE.txt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appserver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE.txt b/appserver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE.txt
index 805bf755341..9b743212627 100644
--- a/appserver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE.txt
+++ b/appserver/packager/legal/src/main/resources/glassfish/legal/3RD-PARTY-LICENSE.txt
@@ -28,7 +28,7 @@ Apache Ant 1.10.9
 Apache BCEL 6.6.1
 Apache Felix OSGI 7.x
 Apache Log4j 1.2.12, 1.2.17
-Apache Santuario 3.0.2
+Apache Santuario 4.0.0
 Classmate 1.5.1
 Commons CLI 1.4
 Commons Codec 1.15
@@ -60,7 +60,7 @@ SnakeYaml 1.33
 SNMP4J 2.5.3
 Tiger Types 1.4
 Weld 5.0.1.Final
-Woodstox Core 6.2.7
+Woodstox Core 6.5.1
 Xalan 2.7.2
 XML APIs 1.3.04
 XPP3 1.1.4c