From 5ae53588c98031efa2888f0cde057baaec186dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Tue, 6 Aug 2024 00:01:49 +0800
Subject: [PATCH 1/2] Upgrade Arquillian Core to 1.9.1.Final

---
 pom.xml                                 |  3 ++-
 resteasy-spring-test-bom/pom.xml        |  2 +-
 testsuite/layers-metadata-tests/pom.xml | 11 +++++++++++
 testsuite/pom.xml                       |  9 ++++++++-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7736680..2dc9902 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,8 @@
         <version.aopalliance>1.0</version.aopalliance>
         <version.org.aspectj>1.9.22.1</version.org.aspectj>
         <!-- The Arquillian version used here should keep same with the one in RESTEasy -->
-        <version.org.jboss.arquillian>1.8.0.Final</version.org.jboss.arquillian>
+        <version.org.jboss.arquillian.core>1.9.1.Final</version.org.jboss.arquillian.core>
+        <version.org.jboss.shrinkwrap>1.2.6</version.org.jboss.shrinkwrap>
         <version.org.wildfly.arquillian>5.1.0.Beta4</version.org.wildfly.arquillian>
         <version.org.testng>7.6.1</version.org.testng>
         <version.resteasy.testsuite>6.2.9.Final</version.resteasy.testsuite>
diff --git a/resteasy-spring-test-bom/pom.xml b/resteasy-spring-test-bom/pom.xml
index 850a5ff..33d543a 100644
--- a/resteasy-spring-test-bom/pom.xml
+++ b/resteasy-spring-test-bom/pom.xml
@@ -28,7 +28,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
-                <version>${version.org.jboss.arquillian}</version>
+                <version>${version.org.jboss.arquillian.core}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/testsuite/layers-metadata-tests/pom.xml b/testsuite/layers-metadata-tests/pom.xml
index 53dc6a0..496d248 100644
--- a/testsuite/layers-metadata-tests/pom.xml
+++ b/testsuite/layers-metadata-tests/pom.xml
@@ -28,6 +28,17 @@
     <artifactId>galleon-feature-pack-layers-metadata-tests</artifactId>
     <name>RESTEasy Galleon feature-pack layers metadata tests</name>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.jboss.shrinkwrap</groupId>
+                <artifactId>shrinkwrap-bom</artifactId>
+                <version>${version.org.jboss.shrinkwrap}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 163df3e..24503aa 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -84,9 +84,16 @@
             <artifactId>wildfly-testing-tools</artifactId>
             <scope>test</scope>
         </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.jboss.shrinkwrap</groupId>-->
+<!--            <artifactId>shrinkwrap-api</artifactId>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-api</artifactId>
+            <artifactId>shrinkwrap-bom</artifactId>
+            <version>${version.org.jboss.shrinkwrap}</version>
+            <scope>import</scope>
+            <type>pom</type>
         </dependency>
     </dependencies>
     <repositories>

From 3f2153780ad457f61ce378d5131b2cb65c46ab78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=98=BF=E7=94=B7?= <l.weinan@gmail.com>
Date: Tue, 6 Aug 2024 00:07:48 +0800
Subject: [PATCH 2/2] cleanup

---
 testsuite/pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 24503aa..69a9336 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -84,17 +84,6 @@
             <artifactId>wildfly-testing-tools</artifactId>
             <scope>test</scope>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>org.jboss.shrinkwrap</groupId>-->
-<!--            <artifactId>shrinkwrap-api</artifactId>-->
-<!--        </dependency>-->
-        <dependency>
-            <groupId>org.jboss.shrinkwrap</groupId>
-            <artifactId>shrinkwrap-bom</artifactId>
-            <version>${version.org.jboss.shrinkwrap}</version>
-            <scope>import</scope>
-            <type>pom</type>
-        </dependency>
     </dependencies>
     <repositories>
         <!-- Required for provisioning WildFly. Not all dependencies currently exist on Maven Central. This is also