Skip to content

Commit

Permalink
Signature test, address review comments and update deployment classes
Browse files Browse the repository at this point in the history 
Signed-off-by: Scott Marlow <[email protected]>
  • Loading branch information
@scottmarlow
scottmarlow committed Feb 10, 2025
1 parent cfba881 commit f70f124
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 89 deletions.
2 changes: 1 addition & 1 deletion tcks/profiles/platform/signaturevalidation/generate/README.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Run the following to generate the Jakarta EE 11 SPEC API signature map files:

export SIG_OUTPUT=../../../tcks/profiles/platform/signaturevalidation/src/main/java/com/sun/ts/tests/signaturetest
export SIG_OUTPUT=../../../../../tcks/profiles/platform/signaturevalidation/src/main/java/com/sun/ts/tests/signaturetest

mvn clean install -DSIG_OUTPUT=$SIG_OUTPUT -P jakarta.annotation
mvn clean install -DSIG_OUTPUT=$SIG_OUTPUT -P jakarta.batch
Expand Down
86 changes: 31 additions & 55 deletions tcks/profiles/platform/signaturevalidation/generate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ javax.rmi.sig (Corba classes for EJB)
</parent>

<artifactId>generate</artifactId>

<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
Expand Down Expand Up @@ -183,10 +183,11 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>

<configuration>
<finalName></finalName>
</configuration>
</plugin>
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>
</plugin>
</plugins>
</build>
Expand All @@ -198,10 +199,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.annotation.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.annotation.sig</sigfile>
<release>17</release>
<packages>jakarta.annotation.**</packages>
</configuration>
Expand All @@ -224,10 +224,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.security.jacc.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.security.jacc.sig</sigfile>
<release>17</release>
<packages>jakarta.security.jacc.**</packages>
</configuration>
Expand All @@ -249,10 +248,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.batch.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.batch.sig</sigfile>
<release>17</release>
<packages>jakarta.batch.**</packages>
</configuration>
Expand All @@ -274,10 +272,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.ejb.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.ejb.sig</sigfile>
<release>17</release>
<packages>jakarta.ejb.**</packages>
</configuration>
Expand All @@ -299,10 +296,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.data.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.data.sig</sigfile>
<release>17</release>
<packages>jakarta.data.**</packages>
</configuration>
Expand All @@ -324,10 +320,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.el.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.el.sig</sigfile>
<release>17</release>
<packages>jakarta.el.**</packages>
</configuration>
Expand All @@ -349,10 +344,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.enterprise.concurrent.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.enterprise.concurrent.sig</sigfile>
<release>17</release>
<packages>jakarta.enterprise.concurrent.**</packages>
</configuration>
Expand All @@ -378,10 +372,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.enterprise.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.enterprise.sig</sigfile>
<release>17</release>
<excludes>jakarta.enterprise.concurrent</excludes>
<packages>jakarta.enterprise.**,jakarta.decorator.**,jakarta.inject.**,jakarta.interceptor.**</packages>
Expand All @@ -404,10 +397,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.faces.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.faces.sig</sigfile>
<release>17</release>
<packages>jakarta.faces.**</packages>
</configuration>
Expand All @@ -429,10 +421,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.interceptor.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.interceptor.sig</sigfile>
<release>17</release>
<packages>jakarta.interceptor.**</packages>
</configuration>
Expand All @@ -454,10 +445,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.jms.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.jms.sig</sigfile>
<release>17</release>
<packages>jakarta.jms.**</packages>
</configuration>
Expand All @@ -479,10 +469,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.json.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.json.sig</sigfile>
<release>17</release>
<packages>jakarta.json.**</packages>
<excludes>jakarta.json.bind</excludes>
Expand All @@ -505,10 +494,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.json.bind.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.json.bind.sig</sigfile>
<release>17</release>
<packages>jakarta.json.bind.**</packages>
</configuration>
Expand All @@ -530,10 +518,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.mail.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.mail.sig</sigfile>
<release>17</release>
<packages>jakarta.mail.**</packages>
</configuration>
Expand All @@ -555,10 +542,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.persistence.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.persistence.sig</sigfile>
<release>17</release>
<packages>jakarta.persistence.**</packages>
</configuration>
Expand All @@ -580,10 +566,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.resource.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.resource.sig</sigfile>
<release>17</release>
<packages>jakarta.resource.**</packages>
</configuration>
Expand All @@ -605,10 +590,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.security.enterprise.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.security.enterprise.sig</sigfile>
<release>17</release>
<packages>jakarta.security.enterprise.**</packages>
</configuration>
Expand All @@ -630,10 +614,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.security.auth.message.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.security.auth.message.sig</sigfile>
<release>17</release>
<packages>jakarta.security.auth.message.**</packages>
</configuration>
Expand All @@ -655,10 +638,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.servlet.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.servlet.sig</sigfile>
<release>17</release>
<packages>jakarta.servlet.**</packages>
<excludes>jakarta.servlet.jsp</excludes>
Expand All @@ -681,10 +663,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.servlet.jsp.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.servlet.jsp.sig</sigfile>
<release>17</release>
<packages>jakarta.servlet.jsp.**</packages>
<excludes>jakarta.servlet.jsp.jstl</excludes>
Expand All @@ -707,10 +688,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.servlet.jsp.jstl.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.servlet.jsp.jstl.sig</sigfile>
<release>17</release>
<packages>jakarta.servlet.jsp.jstl.**</packages>
</configuration>
Expand All @@ -732,10 +712,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.transaction.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.transaction.sig</sigfile>
<release>17</release>
<packages>jakarta.transaction.**</packages>
</configuration>
Expand All @@ -757,10 +736,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.validation.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.validation.sig</sigfile>
<release>17</release>
<packages>jakarta.validation.**</packages>
</configuration>
Expand All @@ -782,10 +760,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.websocket.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.websocket.sig</sigfile>
<release>17</release>
<packages>jakarta.websocket.**</packages>
</configuration>
Expand All @@ -807,10 +784,9 @@ javax.rmi.sig (Corba classes for EJB)
<plugin>
<groupId>jakarta.tck</groupId>
<artifactId>sigtest-maven-plugin</artifactId>
<version>${version.sigtest-maven-plugin}</version>

<configuration>
<sigfile>${SIG_OUTPUT}\jakarta.ws.rs.sig</sigfile>
<sigfile>${SIG_OUTPUT}${path.separator}jakarta.ws.rs.sig</sigfile>
<release>17</release>
<packages>jakarta.ws.rs.**</packages>
</configuration>
Expand Down
9 changes: 0 additions & 9 deletions tcks/profiles/platform/signaturevalidation/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@
<artifactId>arquillian-junit5-container</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-core</artifactId>
<version>${arquillian.junit}</version>
</dependency>
<dependency>
<groupId>jakarta.tck.arquillian</groupId>
<artifactId>arquillian-protocol-appclient</artifactId>
Expand All @@ -100,10 +95,6 @@
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-suite-api</artifactId>
Expand Down
Loading

0 comments on commit f70f124

Please sign in to comment.