Merge pull request #4157 from jamezp/remove-jakarta-staging

Remove the Jakarta Staging profile.
resteasy · May 3, 2024 · 6520c34 · 6520c34
2 parents abbcab5 + a6c65cc
commit 6520c34
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 41 deletions.
diff --git a/.github/workflows/cloud-tests.yml b/.github/workflows/cloud-tests.yml
@@ -65,7 +65,7 @@ jobs:
           kubectl port-forward --namespace kube-system service/registry 5000:80 &
       - name: Cloud Tests - JDK ${{ matrix.java }}
         run:  |
-          mvn clean install -Pcloud-tests -pl resteasy-feature-pack/common,resteasy-feature-pack/galleon-feature-pack,testsuite/cloud-tests -amd -am '-Ddebug.logs' '-Pjakarta-staging'
+          mvn clean install -Pcloud-tests -pl resteasy-feature-pack/common,resteasy-feature-pack/galleon-feature-pack,testsuite/cloud-tests -amd -am '-Ddebug.logs'
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

diff --git a/.github/workflows/manual-build.yml b/.github/workflows/manual-build.yml
@@ -29,7 +29,7 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Build on ${{ inputs.os }} with Java ${{ inputs.javaVersion }}
-        run: mvn clean install '-Pjakarta-staging'
+        run: mvn clean install
       - name: Upload surefire reports
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/.github/workflows/manual-wildfly-build.yml b/.github/workflows/manual-wildfly-build.yml
@@ -55,7 +55,7 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Build on ${{ inputs.os }} with Java ${{ inputs.javaVersion }}
-        run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Pjakarta-staging'
+        run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
       - name: Upload surefire reports
         uses: actions/upload-artifact@v4
         if: failure()

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -61,7 +61,7 @@ jobs:
           cache: 'maven'
       - name: Build with Maven Java ${{ matrix.java }} - ${{ matrix.os }}
         run:  |
-          mvn clean install -U -B -fae '-Dgithub.actions' '-Pjakarta-staging'
+          mvn clean install -U -B -fae '-Dgithub.actions'
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
@@ -94,7 +94,7 @@ jobs:
           cache: 'maven'
       - name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }}
         run:  |
-          mvn clean install -U -B -fae ${{ matrix.profile }} '-Dgithub.actions' '-Pjakarta-staging'
+          mvn clean install -U -B -fae ${{ matrix.profile }} '-Dgithub.actions'
       - uses: actions/upload-artifact@v4
         if: failure()
         with:
@@ -119,5 +119,5 @@ jobs:
           cache: 'maven'
       - name: Build Java Docs with Java 17
         run: |
-          mvn clean install -B -DskipTests '-Pjakarta-staging'
-          mvn clean site -B -DskipTests '-Pjakarta-staging'
+          mvn clean install -B -DskipTests
+          mvn clean site -B -DskipTests
diff --git a/.github/workflows/resteasy-tck.yml b/.github/workflows/resteasy-tck.yml
@@ -90,15 +90,15 @@ jobs:
         id: resteasy-build
         run:  |
           cd resteasy
-          mvn clean install -U -B -fae -DskipTests -Pjakarta-staging
+          mvn clean install -U -B -fae -DskipTests
           RESTEASY_VERSION="$(mvn -B help:evaluate -Dexpression=project.version -DforceStdout -q)"
           echo "RESTEASY_VERSION=$RESTEASY_VERSION"
           echo "RESTEASY_VERSION=$RESTEASY_VERSION" >> "$GITHUB_OUTPUT"
       - name: Run the Jakarta REST TCK - JDK ${{ matrix.java }}
         run:  |
           echo "RESTEASY_VERSION=${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}"
           cd resteasy-tck-runner
-          mvn clean install -U -B -fae -Dtck.debug.log=true -Dversion.org.jboss.resteasy="${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}" -Djakarta.staging
+          mvn clean install -U -B -fae -Dtck.debug.log=true -Dversion.org.jboss.resteasy="${{ steps.resteasy-build.outputs.RESTEASY_VERSION }}"
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

diff --git a/.github/workflows/wildfly-build.yml b/.github/workflows/wildfly-build.yml
@@ -65,7 +65,7 @@ jobs:
           distribution: 'temurin'
           cache: 'maven'
       - name: Build with Maven Java ${{ matrix.java }}
-        run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Pjakarta-staging'
+        run: mvn clean install '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
       - name: Upload surefire reports
         uses: actions/upload-artifact@v4
         if: failure()
@@ -109,7 +109,7 @@ jobs:
           cache: 'maven'
       - name: Test with ${{ matrix.profile }} - JDK ${{ matrix.java }}
         run:  |
-          mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}' '-Pjakarta-staging'
+          mvn clean install -U -B -fae ${{ matrix.profile }} '-Dserver.version=${{needs.wildfly-build.outputs.wildfly-version}}'
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

diff --git a/pom.xml b/pom.xml
@@ -312,36 +312,6 @@
                 <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
             </properties>
         </profile>
-        <!-- Enable only with caution and delete download artifacts when completed -->
-        <profile>
-            <id>jakarta-staging</id>
-            <repositories>
-                <!-- Check Maven Central first -->
-                <repository>
-                    <id>central</id>
-                    <name>Maven Central</name>
-                    <layout>default</layout>
-                    <url>https://repo1.maven.org/maven2</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-                <repository>
-                    <id>jakarta-sonatype-nexus-staging</id>
-                    <name>Jakarta Sonatype Nexus Staging</name>
-                    <url>https://jakarta.oss.sonatype.org/content/repositories/staging/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                    <snapshots>
-                        <enabled>false</enabled>
-                    </snapshots>
-                </repository>
-            </repositories>
-        </profile>
     </profiles>
 
     <contributors>