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.
diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml
index 0798f40..94d4ad5 100755
--- 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
index 9d5c53f..82ae1e8 100644
--- a/appserver/tests/tck/pom.xml
+++ b/appserver/tests/tck/pom.xml
@@ -32,9 +32,12 @@
<name>TCK: Parent</name>
<modules>
- <module>tck-download</module>
- <module>authorization</module>
<module>embedded_ejb_smoke</module>
+ <module>tck-download</module>
+ <module>rest</module>
+ <module>faces</module>
+ <module>authentication</module>
+ <module>authorization</module>
</modules>
<build>
@@ -50,33 +53,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-authentication-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
index c87aa71..c2d4574 100644
--- a/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-authentication-tck/pom.xml
@@ -33,7 +33,7 @@
<properties>
<tck.test.authentication.file>jakarta-authentication-tck-2.0.1.zip</tck.test.authentication.file>
- <tck.test.authentication.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.authentication.file}</tck.test.authentication.url>
+ <tck.test.authentication.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/${tck.test.authentication.file}</tck.test.authentication.url>
</properties>
<build>
diff --git a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml
index 500490c..f4d6ce0 100644
--- a/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-authorization-tck/pom.xml
@@ -33,7 +33,7 @@
<properties>
<tck.test.authorization.file>jakarta-authorization-tck-2.0.1.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>
+ <tck.tests.authorization.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/${tck.test.authorization.file}</tck.tests.authorization.url>
</properties>
<build>
diff --git a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
index 9305598..6f7bb2a 100644
--- a/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
@@ -33,7 +33,7 @@
<properties>
<tck.test.faces.file>jakarta-faces-tck-3.0.1.zip</tck.test.faces.file>
- <tck.test.faces.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee10/staged/eftl/${tck.test.faces.file}</tck.test.faces.url>
+ <tck.test.faces.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/${tck.test.faces.file}</tck.test.faces.url>
</properties>
<build>
diff --git a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
index 0fd52fd..516de34 100644
--- a/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
+++ b/appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
@@ -32,8 +32,8 @@
<name>TCK: Install Jakarta REST TCK</name>
<properties>
- <tck.test.rest.file>jakarta-pages-tck-3.0.2.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>
+ <tck.test.rest.file>jakarta-restful-ws-tck-3.0.2.zip</tck.test.rest.file>
+ <tck.test.rest.url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/${tck.test.rest.file}</tck.test.rest.url>
</properties>
<build>
diff --git a/appserver/tests/tck/tck-download/pom.xml b/appserver/tests/tck/tck-download/pom.xml
index c7189fd..e3f78ef 100644
--- a/appserver/tests/tck/tck-download/pom.xml
+++ b/appserver/tests/tck/tck-download/pom.xml
@@ -33,6 +33,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>
@@ -53,33 +56,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <profile>
- <id>tck-all</id>
- <modules>
- <module>jakarta-rest-tck</module>
- <module>jakarta-faces-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>
