From b7baa30bc9fc75353a13f8bbddaf8a11b6bbf4b2 Mon Sep 17 00:00:00 2001
From: kosakak <kosaka.koki@fujitsu.com>
Date: Fri, 30 Jun 2023 16:33:00 +0900
Subject: [PATCH] Upgrade jettison for security fix

---
 launcher-impl/glassfish/pom.xml | 11 +++++++++++
 pom.xml                         |  7 +++++++
 2 files changed, 18 insertions(+)

diff --git a/launcher-impl/glassfish/pom.xml b/launcher-impl/glassfish/pom.xml
index 459013e..c4fefd3 100644
--- a/launcher-impl/glassfish/pom.xml
+++ b/launcher-impl/glassfish/pom.xml
@@ -21,6 +21,17 @@
     <packaging>jar</packaging>
 
     <dependencies>
+        <!-- Use newer jettison for security fix -->
+        <dependency>
+            <groupId>org.codehaus.jettison</groupId>
+            <artifactId>jettison</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.glassfish.main.extras</groupId>
             <artifactId>glassfish-embedded-web</artifactId>
diff --git a/pom.xml b/pom.xml
index 14fb74f..7480875 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,7 @@
         <concurrent-ri.version>3.0.0</concurrent-ri.version>
         <jakarta.validation.version>3.0.2</jakarta.validation.version>
         <micrometer.version>1.9.3</micrometer.version>
+        <jettison.version>1.5.4</jettison.version>
     </properties>
 
     <dependencyManagement>
@@ -404,6 +405,12 @@
                 <artifactId>jakarta.validation-api</artifactId>
                 <version>${jakarta.validation.version}</version>
             </dependency>
+            <!-- jettison -->
+            <dependency>
+                <groupId>org.codehaus.jettison</groupId>
+                <artifactId>jettison</artifactId>
+                <version>${jettison.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>