From a6c65ccf81465eb95a6749b15ed98e8d8acceccd Mon Sep 17 00:00:00 2001 From: "James R. Perkins" Date: Fri, 3 May 2024 09:47:38 -0700 Subject: [PATCH] Remove the Jakarta Staging profile. Signed-off-by: James R. Perkins --- .github/workflows/cloud-tests.yml | 2 +- .github/workflows/manual-build.yml | 2 +- .github/workflows/manual-wildfly-build.yml | 2 +- .github/workflows/maven.yml | 8 +++--- .github/workflows/resteasy-tck.yml | 4 +-- .github/workflows/wildfly-build.yml | 4 +-- pom.xml | 30 ---------------------- 7 files changed, 11 insertions(+), 41 deletions(-) diff --git a/.github/workflows/cloud-tests.yml b/.github/workflows/cloud-tests.yml index e5cc27bdc0..fab3322b8d 100644 --- 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 index 7f7da03ec7..9ed9b8fc4e 100644 --- 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 index 75f64c1381..1958e7d4c4 100644 --- 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 index 7769032fa8..3ed76d785f 100644 --- 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 index 232dcf2e44..18023c79da 100644 --- a/.github/workflows/resteasy-tck.yml +++ b/.github/workflows/resteasy-tck.yml @@ -90,7 +90,7 @@ 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" @@ -98,7 +98,7 @@ jobs: 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 index 0c9de6e168..e478696103 100644 --- 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 index 8e38b98738..c7794f496f 100644 --- a/pom.xml +++ b/pom.xml @@ -312,36 +312,6 @@ false - - - jakarta-staging - - - - central - Maven Central - default - https://repo1.maven.org/maven2 - - true - - - false - - - - jakarta-sonatype-nexus-staging - Jakarta Sonatype Nexus Staging - https://jakarta.oss.sonatype.org/content/repositories/staging/ - - true - - - false - - - -