TCK cleanup

- better choose artifact than thousand profiles - more consistent - tck tests are not executed by default, but added to the reactor when the tck profile is activated. # Conflicts: # appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml # appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml # appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml # appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml # appserver/tests/tck/tck-download/pom.xml
eclipse-ee4j · Apr 12, 2022 · cc9eb2e · cc9eb2e
1 parent 3db1a6b
commit cc9eb2e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 64 deletions.
diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml
@@ -118,7 +118,6 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>tck</module>
                 <module>admin</module>
                 <module>appserv-tests</module>
             </modules>
@@ -135,9 +134,11 @@
             </modules>
         </profile>
         <profile>
-            <id>fast</id>
+            <id>tck</id>
             <modules>
+                <module>admin</module>
                 <module>appserv-tests</module>
+                <module>tck</module>
             </modules>
         </profile>
     </profiles>

diff --git a/appserver/tests/tck/pom.xml b/appserver/tests/tck/pom.xml
@@ -33,9 +33,12 @@
     <name>TCK: Parent</name>
 
     <modules>
+        <module>embedded_ejb_smoke</module>
         <module>tck-download</module>
+        <module>rest</module>
+        <module>faces</module>
+        <module>authentication</module>
         <module>authorization</module>
-        <module>embedded_ejb_smoke</module>
     </modules>
 
     <build>
@@ -51,33 +54,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>tck-all</id>
-            <modules>
-                <module>rest</module>
-                <module>faces</module>
-                <module>authentication</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>tck-rest</id>
-            <modules>
-                <module>rest</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>tck-faces</id>
-            <modules>
-                <module>faces</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>tck-authentication</id>
-            <modules>
-                <module>authentication</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>
diff --git a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml
@@ -31,7 +31,7 @@
     <name>TCK: Install Jakarta Authorization TCK</name>
 
     <properties>
-    	<tck.test.authorization.file>jakarta-authorization-tck-2.1.0.zip</tck.test.authorization.file>
+        <tck.test.authorization.file>jakarta-authorization-tck-2.1.0.zip</tck.test.authorization.file>
         <tck.tests.authorization.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.authorization.file}</tck.tests.authorization.url>
     </properties>
 

diff --git a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
@@ -32,7 +32,7 @@
     <name>TCK: Install Jakarta REST TCK</name>
 
     <properties>
-    	<tck.test.rest.file>jakarta-pages-tck-3.1.0.zip</tck.test.rest.file>
+        <tck.test.rest.file>jakarta-restful-ws-tck-3.1.0.zip</tck.test.rest.file>
         <tck.test.rest.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.rest.file}</tck.test.rest.url>
     </properties>
 

diff --git a/appserver/tests/tck/tck-download/pom.xml b/appserver/tests/tck/tck-download/pom.xml
@@ -32,6 +32,9 @@
     <name>TCK: Download and Install Dependencies not in Maven Repos</name>
 
     <modules>
+        <module>jakarta-rest-tck</module>
+        <module>jakarta-faces-tck</module>
+        <module>jakarta-authentication-tck</module>
         <module>jakarta-authorization-tck</module>
         <module>tsharness</module>
         <module>javatest</module>
@@ -52,34 +55,4 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>tck-all</id>
-            <modules>
-                <module>jakarta-rest-tck</module>
-                <module>jakarta-faces-tck</module>
-                <module>jakarta-pages-tck</module>
-                <module>jakarta-authentication-tck</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>tck-rest</id>
-            <modules>
-                <module>jakarta-rest-tck</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>tck-faces</id>
-            <modules>
-                <module>jakarta-faces-tck</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>tck-authentication</id>
-            <modules>
-                <module>jakarta-authentication-tck</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>