Merge pull request #226 from jamezp/remove-staging-core-profile

Change the Jakarta EE 11 to no longer use the staged TCK and use the …
wildfly · Jan 9, 2025 · b935eac · b935eac
2 parents 130570b + 08c8da8
commit b935eac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/core-profile-tck-ee11-manual.yml b/.github/workflows/core-profile-tck-ee11-manual.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Build with Maven Java ${{ inputs.java-version }} on WildFly ${{ inputs.wildfly-version }}
         run:  |
           cd core-profile
-          mvn -B -V clean verify -Dversion.org.wildfly=${{ inputs.wildfly-version }} -fae -Pstaging
+          mvn -B -V clean verify -Dversion.org.wildfly=${{ inputs.wildfly-version }} -fae
       - name: TCK Report
         run: |
           cd core-profile

diff --git a/core-profile/pom.xml b/core-profile/pom.xml
@@ -102,8 +102,8 @@
         <version.jakarta.json.binding.tck.short>3.0</version.jakarta.json.binding.tck.short>
         <version.jakarta.json.binding.tck>${version.jakarta.json.binding.tck.short}.0</version.jakarta.json.binding.tck>
 
-        <version.jakarta.platform.core.profile.tck.version.short>11</version.jakarta.platform.core.profile.tck.version.short>
-        <version.jakarta.platform.core.profile.tck.version>${version.jakarta.platform.core.profile.tck.version.short}.0.0</version.jakarta.platform.core.profile.tck.version>
+        <version.jakarta.platform.core.profile.tck.version.short>11.0</version.jakarta.platform.core.profile.tck.version.short>
+        <version.jakarta.platform.core.profile.tck.version>${version.jakarta.platform.core.profile.tck.version.short}.0</version.jakarta.platform.core.profile.tck.version>
 
         <version.jakarta.ws.rs.tck.short>4.0</version.jakarta.ws.rs.tck.short>
         <version.jakarta.ws.rs.tck>${version.jakarta.ws.rs.tck.short}.1</version.jakarta.ws.rs.tck>

diff --git a/core-profile/tck-setup/pom.xml b/core-profile/tck-setup/pom.xml
@@ -47,9 +47,7 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <!-- TODO (jrp) this needs to be reverted once promoted from staging -->
-                            <!-- <url>https://download.eclipse.org/jakartaee/coreprofile/jakartaee${version.jakarta.platform.core.profile.tck.version.short}/staged/eftl/jakarta-core-profile-tck-${version.jakarta.platform.core.profile.tck.version}.zip</url> -->
-                            <url>https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee${version.jakarta.platform.core.profile.tck.version.short}/staged/eftl/jakarta-core-profile-tck-${version.jakarta.platform.core.profile.tck.version}.zip</url>
+                            <url>https://download.eclipse.org/jakartaee/coreprofile/${version.jakarta.platform.core.profile.tck.version.short}/jakarta-core-profile-tck-${version.jakarta.platform.core.profile.tck.version}.zip</url>
                             <outputFileName>jakarta-core-profile-tck-${version.jakarta.platform.core.profile.tck.version}.zip</outputFileName>
                             <sha256>0357bfab7025972edb2bf50277b6b4206b499a2961bc94e783f34782cc4a9bda</sha256>
                         </configuration>