From 3a48c53bb4cec27c4a913fd46bd5e48a8b669d47 Mon Sep 17 00:00:00 2001
From: Alex Porcelli <alex@porcelli.me>
Date: Mon, 11 Mar 2024 17:08:11 -0400
Subject: [PATCH 1/5] RHPAM-3709: upgrade maven dependencies to address
 CVE-2021-26291

---
 jbpm-runtime-manager/pom.xml            | 4 ++--
 jbpm-services/jbpm-kie-services/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/jbpm-runtime-manager/pom.xml b/jbpm-runtime-manager/pom.xml
index 50cb0ae137..593b84e949 100644
--- a/jbpm-runtime-manager/pom.xml
+++ b/jbpm-runtime-manager/pom.xml
@@ -18,8 +18,8 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.kie.soup</groupId>
diff --git a/jbpm-services/jbpm-kie-services/pom.xml b/jbpm-services/jbpm-kie-services/pom.xml
index 4b02e8b141..f8534389b2 100644
--- a/jbpm-services/jbpm-kie-services/pom.xml
+++ b/jbpm-services/jbpm-kie-services/pom.xml
@@ -160,8 +160,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.aether</groupId>
-      <artifactId>aether-api</artifactId>
+      <groupId>org.apache.maven.resolver</groupId>
+      <artifactId>maven-resolver-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.freemarker</groupId>

From 2f7be5080f8e6464fdbcb017874569d951ba6265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Tue, 26 Mar 2024 10:04:24 +0100
Subject: [PATCH 2/5] Upgrade versions for jbpm-container-tests

---
 .../jbpm-in-container-test/jbpm-container-test-suite/pom.xml  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
index 456993ae6e..0911368ac7 100644
--- a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
+++ b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
@@ -35,7 +35,9 @@
     <container.log.file>${container.profile.dir}/profile-log.txt</container.log.file>
 
     <!-- Overridden until jboss-integration-platform-parent is upgraded -->
-    <version.org.jboss.shrinkwrap.resolver>3.1.0</version.org.jboss.shrinkwrap.resolver>
+    <version.org.jboss.shrinkwrap.resolver>3.3.0</version.org.jboss.shrinkwrap.resolver>
+    <version.org.apache.maven>3.9.3</version.org.apache.maven>
+    <version.org.apache.maven.resolver>1.9.13</version.org.apache.maven.resolver>
   </properties>
 
   <dependencyManagement>

From 9944c590d3b6a8430c498e07648dfbaddd9c180d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Tue, 26 Mar 2024 11:02:29 +0100
Subject: [PATCH 3/5] Override guava version in container tests.

---
 .../jbpm-in-container-test/jbpm-container-test-suite/pom.xml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
index 0911368ac7..7aeca383ba 100644
--- a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
+++ b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
@@ -38,6 +38,7 @@
     <version.org.jboss.shrinkwrap.resolver>3.3.0</version.org.jboss.shrinkwrap.resolver>
     <version.org.apache.maven>3.9.3</version.org.apache.maven>
     <version.org.apache.maven.resolver>1.9.13</version.org.apache.maven.resolver>
+    <version.com.google.guava>20.0</version.com.google.guava>
   </properties>
 
   <dependencyManagement>

From d9641ce3b01d78c6cec37d8be503bd8a428d2d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Tue, 26 Mar 2024 13:28:39 +0100
Subject: [PATCH 4/5] Update Guava version in jbpm-container-tests.

---
 .../jbpm-in-container-test/jbpm-container-test-suite/pom.xml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
index 7aeca383ba..1841e939ab 100644
--- a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
+++ b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
@@ -38,7 +38,7 @@
     <version.org.jboss.shrinkwrap.resolver>3.3.0</version.org.jboss.shrinkwrap.resolver>
     <version.org.apache.maven>3.9.3</version.org.apache.maven>
     <version.org.apache.maven.resolver>1.9.13</version.org.apache.maven.resolver>
-    <version.com.google.guava>20.0</version.com.google.guava>
+    <version.com.google.guava>33.1.0-jre</version.com.google.guava>
   </properties>
 
   <dependencyManagement>

From a8dc86140a37f8f1cb68129e23e63a34c7686abe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Wed, 27 Mar 2024 12:31:47 +0100
Subject: [PATCH 5/5] Fix teardown in container tests.

---
 .../jbpm-in-container-test/jbpm-container-test-suite/pom.xml  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
index 1841e939ab..256a26af6f 100644
--- a/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
+++ b/jbpm-container-test/jbpm-in-container-test/jbpm-container-test-suite/pom.xml
@@ -39,6 +39,10 @@
     <version.org.apache.maven>3.9.3</version.org.apache.maven>
     <version.org.apache.maven.resolver>1.9.13</version.org.apache.maven.resolver>
     <version.com.google.guava>33.1.0-jre</version.com.google.guava>
+
+    <reuseForks>false</reuseForks>
+    <forkCount>1</forkCount>
+    <useSystemClassLoader>false</useSystemClassLoader>
   </properties>
 
   <dependencyManagement>