From 496c77d0cd01b06f09bcb5645fe736996a511018 Mon Sep 17 00:00:00 2001
From: Kyle Aure <KyleJAure@gmail.com>
Date: Thu, 22 Sep 2022 10:51:02 -0500
Subject: [PATCH] merge conflicts

---
 .../ConcurrentTCKWebServer/configDropins/defaults/test.xml      | 2 +-
 .../publish/tckRunner/tck/standalone.pom.xml                    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml
index afd711fed9a3..d0f7f2164dda 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml
@@ -4,6 +4,6 @@
 	    <!-- Required by test infrastructure -->
 	    <feature>timedexit-1.0</feature>
         <!-- Convenience feature -->
-	    <feature>arquillian-support-jakarta-2.0</feature>
+	    <feature>arquillian-support-jakarta-2.1</feature>
 	</featureManager>
 </server>
\ No newline at end of file
diff --git a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml
index f769f0147abe..3f5da39fd751 100644
--- a/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml
+++ b/dev/io.openliberty.jakarta.concurrency.3.0_fat_tck/publish/tckRunner/tck/standalone.pom.xml
@@ -21,7 +21,6 @@
     	<!-- These properties can be overwritten by users if they want to test against a snapshot version-->
         <jakarta.concurrent.tck.groupid>jakarta.enterprise.concurrent</jakarta.concurrent.tck.groupid>
         <jakarta.concurrent.tck.version>3.0.2</jakarta.concurrent.tck.version>
-        
         <jakarta.concurrent.version>3.0.2</jakarta.concurrent.version>
         
         <arquillian.version>1.7.0.Alpha12</arquillian.version>