From f28b1f8c194f847abf056ea389a2be199bfbdffe Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Sat, 21 Sep 2024 14:43:01 -0500
Subject: [PATCH] Fixes #4001 - Migrate Core Profile TCK runners to use new
 managed Piranha container (#4002)

---
 external/coreprofile-tck/cdi/runner/core/pom.xml |  2 +-
 .../coreprofile-tck/cdi/runner/model/pom.xml     |  2 +-
 .../coreprofile-tck/coreprofile/runner/pom.xml   |  3 ++-
 external/coreprofile-tck/rest/runner/pom.xml     | 16 +++++++---------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/external/coreprofile-tck/cdi/runner/core/pom.xml b/external/coreprofile-tck/cdi/runner/core/pom.xml
index 84dc09d05..623194831 100644
--- a/external/coreprofile-tck/cdi/runner/core/pom.xml
+++ b/external/coreprofile-tck/cdi/runner/core/pom.xml
@@ -194,7 +194,7 @@
         -->
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
-            <artifactId>piranha-arquillian-jarcontainer</artifactId>
+            <artifactId>piranha-arquillian-managed</artifactId>
             <version>${piranha.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/external/coreprofile-tck/cdi/runner/model/pom.xml b/external/coreprofile-tck/cdi/runner/model/pom.xml
index 7fade6b33..0dcfbea6d 100644
--- a/external/coreprofile-tck/cdi/runner/model/pom.xml
+++ b/external/coreprofile-tck/cdi/runner/model/pom.xml
@@ -78,7 +78,7 @@
         -->
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
-            <artifactId>piranha-arquillian-jarcontainer</artifactId>
+            <artifactId>piranha-arquillian-managed</artifactId>
             <version>${piranha.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/external/coreprofile-tck/coreprofile/runner/pom.xml b/external/coreprofile-tck/coreprofile/runner/pom.xml
index 7014f73f0..292261744 100644
--- a/external/coreprofile-tck/coreprofile/runner/pom.xml
+++ b/external/coreprofile-tck/coreprofile/runner/pom.xml
@@ -36,6 +36,7 @@
             <artifactId>installer</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
+            <scope>provided</scope>
         </dependency>
 
         <!-- The actual TCK jar containing the tests -->
@@ -84,7 +85,7 @@
             to it. -->
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
-            <artifactId>piranha-arquillian-jarcontainer</artifactId>
+            <artifactId>piranha-arquillian-managed</artifactId>
             <version>${piranha.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/external/coreprofile-tck/rest/runner/pom.xml b/external/coreprofile-tck/rest/runner/pom.xml
index 32cd0e4b4..ca9e7148c 100644
--- a/external/coreprofile-tck/rest/runner/pom.xml
+++ b/external/coreprofile-tck/rest/runner/pom.xml
@@ -14,21 +14,22 @@
     <properties>
         <piranha.version>${project.version}</piranha.version>
     </properties>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
-                <version>${arquillian.version}</version>
-                <scope>test</scope>
+                <version>1.8.0.Final</version>
                 <type>pom</type>
+                <scope>test</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
-            <artifactId>piranha-arquillian-jarcontainer</artifactId>
+            <artifactId>piranha-arquillian-managed</artifactId>
             <version>${piranha.version}</version>
             <scope>test</scope>
         </dependency>
@@ -38,14 +39,10 @@
             <version>3.1.5</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.arquillian.protocol</groupId>
-            <artifactId>arquillian-protocol-servlet-jakarta</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.junit5</groupId>
             <artifactId>arquillian-junit5-container</artifactId>
+            <version>1.8.0.Final</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -67,7 +64,7 @@
         <dependency>
             <groupId>org.omnifaces.arquillian</groupId>
             <artifactId>glassfish-client-ee10</artifactId>
-            <version>1.4</version>
+            <version>1.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -100,6 +97,7 @@
                     <systemPropertyVariables>
                         <arquillian.launch>piranha</arquillian.launch>
                         <cts.harness.debug>true</cts.harness.debug>
+                        <junit.log.traceflag>true</junit.log.traceflag>
                         <optional.tech.packages.to.ignore>jakarta.xml.bind</optional.tech.packages.to.ignore>
                         <porting.ts.url.class.1>ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL</porting.ts.url.class.1>
                         <servlet_adaptor>org.glassfish.jersey.servlet.ServletContainer</servlet_adaptor>