merge conflicts

OpenLiberty · Sep 22, 2022 · 496c77d · 496c77d
1 parent 2d1b87a
commit 496c77d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...rrency.3.0_fat_tck/publish/servers/ConcurrentTCKWebServer/configDropins/defaults/test.xml b/...rrency.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>
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
@@ -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>