From 9250cce9cc56a8c507ad79d5323d8673274d2562 Mon Sep 17 00:00:00 2001
From: Muthukumar Shanmugavel <muts@softwareag.com>
Date: Thu, 18 May 2023 18:32:48 +0530
Subject: [PATCH 1/3] TAB-8363 - For vulnerability issue upgrade jetty-server
 from 10.0.13 to 10.0.15

For vulnerability issue upgrade jetty-server from 10.0.13 to 10.0.15
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a0b86058..5c0734c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
 
     <properties>
         <!-- keep jetty.version in sync with security-parent/management-apps -->
-        <jetty.version>10.0.13</jetty.version>
+        <jetty.version>10.0.15</jetty.version>
         <jackson.version>2.14.1</jackson.version>
         <jackson-databind.version>2.14.1</jackson-databind.version>
         <jersey.version>2.38</jersey.version>

From 2cdbecf2c3ed6c352f9ba09f1acd6e1cdbdbd8b6 Mon Sep 17 00:00:00 2001
From: Gary Keim <gkeim@softwareag.com>
Date: Tue, 30 May 2023 17:19:31 -0400
Subject: [PATCH 2/3] Upgrade most dependencies -- no major CVE's at this time

---
 pom.xml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index a0b86058..266f6cd2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,18 +13,16 @@
     <version>4.4.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-
     <properties>
         <!-- keep jetty.version in sync with security-parent/management-apps -->
-        <jetty.version>10.0.13</jetty.version>
-        <jackson.version>2.14.1</jackson.version>
-        <jackson-databind.version>2.14.1</jackson-databind.version>
-        <jersey.version>2.38</jersey.version>
+        <jetty.version>10.0.15</jetty.version>
+        <jackson.version>2.15.1</jackson.version>
+        <jersey.version>2.39.1</jersey.version>
 
-        <guava.version>31.1-jre</guava.version>
-        <groovy.version>4.0.8</groovy.version>
+        <guava.version>32.0.0-jre</guava.version>
+        <groovy.version>4.0.12</groovy.version>
         <shiro.version>1.11.0</shiro.version>
-        <csrfguard.version>4.2.0</csrfguard.version>
+        <csrfguard.version>4.2.1</csrfguard.version>
 
         <slf4j.version>1.7.36</slf4j.version>
         <logback.version>1.2.11</logback.version>
@@ -32,7 +30,7 @@
         <commons-beanutils.version>1.9.4</commons-beanutils.version>
         <hamcrest.version>2.2</hamcrest.version>
         <mockito.version>4.11.0</mockito.version>
-        <commons-codec.version>1.13</commons-codec.version>
+        <commons-codec.version>1.15</commons-codec.version>
         <commons-collections.version>3.2.2</commons-collections.version>
         <commons-lang.version>2.6</commons-lang.version>
         <commons-lang3.version>3.12.0</commons-lang3.version>
@@ -40,16 +38,16 @@
         <commons-io.version>2.11.0</commons-io.version>
         <commons-logging.version>1.2</commons-logging.version>
         <commons-httpclient.version>3.1</commons-httpclient.version>
-        <jaxb-runtime.version>2.3.6</jaxb-runtime.version>
+        <jaxb-runtime.version>2.3.8</jaxb-runtime.version>
         <jakarta.activation.version>1.2.2</jakarta.activation.version>
         <h2.version>2.1.210</h2.version>
         <sizeof-agent.version>1.0.1</sizeof-agent.version>
         <hibernate-core.version>3.6.10.Final</hibernate-core.version>
         <derby.version>10.14.2.0</derby.version>
         <apacheds.version>2.0.0.AM25</apacheds.version>
-        <byteman.version>4.0.20</byteman.version>
+        <byteman.version>4.0.21</byteman.version>
         <rest-assured.version>5.3.0</rest-assured.version>
-        <bytebuddy.version>1.12.22</bytebuddy.version>
+        <bytebuddy.version>1.12.23</bytebuddy.version>
     </properties>
 
     <dependencyManagement>
@@ -225,6 +223,11 @@
                 <artifactId>groovy-xml</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.groovy</groupId>
+                <artifactId>groovy-ant</artifactId>
+                <version>${groovy.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.thoughtworks.xstream</groupId>
                 <artifactId>xstream</artifactId>
@@ -286,7 +289,6 @@
                 <version>${jersey.version}</version>
             </dependency>
 
-
             <dependency>
                 <groupId>org.javassist</groupId>
                 <artifactId>javassist</artifactId>
@@ -295,7 +297,12 @@
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-databind</artifactId>
-                <version>${jackson-databind.version}</version>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.jaxrs</groupId>
@@ -322,7 +329,6 @@
                 <version>${jackson.version}</version>
             </dependency>
 
-
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>

From 38368bbe48990b6fccc9e76bad88a39bf2bb6f52 Mon Sep 17 00:00:00 2001
From: Chris Dennis <chris.w.dennis@gmail.com>
Date: Thu, 1 Jun 2023 08:37:32 -0400
Subject: [PATCH 3/3] Add Jakarta JTA/Servlet APIs and Narayana Jakarta JTA
 Transaction Manager

---
 pom.xml | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pom.xml b/pom.xml
index 266f6cd2..3895b6a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -207,6 +207,18 @@
                 <version>1.1</version>
             </dependency>
 
+            <!-- Jakarta -->
+            <dependency>
+                <groupId>jakarta.transaction</groupId>
+                <artifactId>jakarta.transaction-api</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>6.0.0</version>
+            </dependency>
+
             <!-- tests -->
             <dependency>
                 <groupId>org.apache.groovy</groupId>
@@ -900,6 +912,19 @@
                 <version>2.1.3</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.narayana.jta</groupId>
+                <artifactId>narayana-jta-jakarta</artifactId>
+                <version>5.13.1.Final</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.logging</groupId>
+                <artifactId>jboss-logging</artifactId>
+                <version>3.1.4.GA</version>
+                <scope>test</scope>
+            </dependency>
+
             <dependency>
                 <groupId>org.dom4j</groupId>
                 <artifactId>dom4j</artifactId>
@@ -932,4 +957,11 @@
             </plugin>
         </plugins>
     </build>
+
+    <repositories>
+        <repository>
+            <id>terracotta-releases</id>
+            <url>https://repo.terracotta.org/maven2</url>
+        </repository>
+    </repositories>
 </project>