Skip to content

Commit

Permalink
TCK cleanup
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
dmatej committed Apr 6, 2022
1 parent ff4c62b commit d50705a
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 66 deletions.
5 changes: 3 additions & 2 deletions appserver/tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>tck</module>
<module>admin</module>
<module>appserv-tests</module>
</modules>
Expand All @@ -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>
Expand Down
34 changes: 4 additions & 30 deletions appserver/tests/tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,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>
Expand All @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion appserver/tests/tck/tck-download/jakarta-faces-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions appserver/tests/tck/tck-download/jakarta-rest-tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
32 changes: 3 additions & 29 deletions appserver/tests/tck/tck-download/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>

0 comments on commit d50705a

Please sign in to comment.