Make the signature test qualifier a property. Ensure the platform TCK…

… build creates the signature test files. Signed-off-by: James R. Perkins <[email protected]>
wildfly · Oct 9, 2024 · 982fae9 · 982fae9
1 parent 7caaad3
commit 982fae9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/core-profile-tck-ee11-snapshot.yml b/.github/workflows/core-profile-tck-ee11-snapshot.yml
@@ -68,7 +68,7 @@ jobs:
       run: |
         cd jakartaee-tck-tools/arquillian
         mvn -version
-        mvn clean install -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17
+        mvn clean install -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 -Dsignature
     - name: 'Checkout Jakarta Platform TCK'
       uses: actions/checkout@v4
       with:
@@ -82,7 +82,7 @@ jobs:
     - name: Build with Maven Java ${{ matrix.java }} on WildFly
       run:  |
         cd wildfly-tck-runners/core-profile
-        mvn -B clean verify -Dversion.org.wildfly=${{ needs.wildfly-build.outputs.wildfly-version }} -fae -Pstaging -Dskip.tck.setup -D-Dversion.jakarta.platform.core.profile.tck.version=${{ env.PLATFORM_TCK_VERSION }}
+        mvn -B clean verify -Dversion.org.wildfly=${{ needs.wildfly-build.outputs.wildfly-version }} -fae -Pstaging -Dskip.tck.setup -Dcore.profile.sigtest.classifier=sigtest -Dversion.jakarta.platform.core.profile.tck.version=${{ env.PLATFORM_TCK_VERSION }}
     - uses: actions/upload-artifact@v4
       if: failure()
       with:

diff --git a/core-profile/cdi-tck/pom.xml b/core-profile/cdi-tck/pom.xml
@@ -24,6 +24,7 @@
 
     <properties>
         <testng.version>7.9.0</testng.version>
+        <core.profile.sigtest.classifier>sigtest-jdk11</core.profile.sigtest.classifier>
     </properties>
 
     <dependencies>
@@ -144,7 +145,7 @@
             <artifactId>common-annotations</artifactId>
             <version>${version.jakarta.platform.core.profile.tck.version}</version>
             <type>sig</type>
-            <classifier>sigtest-jdk11</classifier>
+            <classifier>${core.profile.sigtest.classifier}</classifier>
             <scope>test</scope>
         </dependency>
 
@@ -236,7 +237,7 @@
                             <includeGroupIds>jakarta.ee.tck.coreprofile</includeGroupIds>
                             <includeArtifactIds>common-annotations</includeArtifactIds>
                             <type>sig</type>
-                            <classifier>sigtest-jdk11</classifier>
+                            <classifier>${core.profile.sigtest.classifier}</classifier>
                             <stripVersion>true</stripVersion>
                             <overWriteReleases>true</overWriteReleases>
                             <outputDirectory>${project.build.directory}/sigtest</outputDirectory>
@@ -404,7 +405,7 @@
                             <goal>check</goal>
                         </goals>
                         <configuration>
-                            <sigfile>${project.build.directory}/sigtest/common-annotations-sigtest-jdk11.sig</sigfile>
+                            <sigfile>${project.build.directory}/sigtest/common-annotations-${core.profile.sigtest.classifier}.sig</sigfile>
                             <packages>jakarta.annotation</packages>
                             <classes>${project.build.directory}/sig-classes/</classes>
                             <report>${project.build.directory}/ca-sig-report.txt</report>