From 211671fbd91d24d48ba5573a5f1becd44d261d5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tibor=20Zim=C3=A1nyi?= <tiborzimanyi@ibm.com>
Date: Wed, 3 Apr 2024 09:05:49 +0200
Subject: [PATCH] [7.67.x-blue] RHPAM-3709: upgrade maven dependencies to
 address CVE-2021-26291 (#2407)

* RHPAM-3709: upgrade maven dependencies to address CVE-2021-26291

* Upgrade versions for jbpm-container-tests

* Override guava version in container tests.

* Update Guava version in jbpm-container-tests.

* Fix teardown in container tests.

---------

Co-authored-by: Alex Porcelli <alex@porcelli.me>
---
 .../jbpm-container-test-suite/pom.xml                    | 9 ++++++++-
 jbpm-runtime-manager/pom.xml                             | 4 ++--
 jbpm-services/jbpm-kie-services/pom.xml                  | 4 ++--
 3 files changed, 12 insertions(+), 5 deletions(-)

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..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
@@ -35,7 +35,14 @@
     <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>
+    <version.com.google.guava>33.1.0-jre</version.com.google.guava>
+
+    <reuseForks>false</reuseForks>
+    <forkCount>1</forkCount>
+    <useSystemClassLoader>false</useSystemClassLoader>
   </properties>
 
   <dependencyManagement>
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>