From 7bb403fb9aa4a3273e651f559076bed4f4debf72 Mon Sep 17 00:00:00 2001 From: Lisa Julia Nebel Date: Tue, 25 Aug 2026 15:15:40 +0200 Subject: [PATCH] Use new release.yml of cap-java/.github and update commit shas --- .github/workflows/issue.yml | 2 +- .github/workflows/main.yml | 4 +- .github/workflows/pr.yml | 2 +- .github/workflows/prevent-issue-labeling.yml | 2 +- .github/workflows/release.yml | 129 +------------------ 5 files changed, 11 insertions(+), 128 deletions(-) diff --git a/.github/workflows/issue.yml b/.github/workflows/issue.yml index 123c41f..3a1af59 100644 --- a/.github/workflows/issue.yml +++ b/.github/workflows/issue.yml @@ -9,4 +9,4 @@ on: jobs: label-issue: - uses: cap-java/.github/.github/workflows/issue.yml@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main + uses: cap-java/.github/.github/workflows/issue.yml@1040e19f5ca25c2942f2fa56632f430e9a2549be #main diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eea2ae4..ed48cab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Scan With Black Duck - uses: cap-java/.github/actions/scan-with-blackduck@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main + uses: cap-java/.github/actions/scan-with-blackduck@1040e19f5ca25c2942f2fa56632f430e9a2549be #main with: blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} maven-version: ${{ env.MAVEN_VERSION }} @@ -42,7 +42,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Scan With CodeQL - uses: cap-java/.github/actions/scan-with-codeql@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main + uses: cap-java/.github/actions/scan-with-codeql@1040e19f5ca25c2942f2fa56632f430e9a2549be #main with: maven-version: ${{ env.MAVEN_VERSION }} java-version: '21' diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f940cb8..429b635 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -27,7 +27,7 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - name: Scan With Black Duck - uses: cap-java/.github/actions/scan-with-blackduck@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main + uses: cap-java/.github/actions/scan-with-blackduck@1040e19f5ca25c2942f2fa56632f430e9a2549be #main with: blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} maven-version: ${{ env.MAVEN_VERSION }} diff --git a/.github/workflows/prevent-issue-labeling.yml b/.github/workflows/prevent-issue-labeling.yml index b30cc2c..c542dec 100644 --- a/.github/workflows/prevent-issue-labeling.yml +++ b/.github/workflows/prevent-issue-labeling.yml @@ -8,4 +8,4 @@ on: jobs: prevent-issue-labeling: - uses: cap-java/.github/.github/workflows/prevent-issue-labeling.yml@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main + uses: cap-java/.github/.github/workflows/prevent-issue-labeling.yml@1040e19f5ca25c2942f2fa56632f430e9a2549be #main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 89417db..dd15e76 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,130 +1,13 @@ name: Deploy to Maven Central -env: - JAVA_VERSION: '21' - MAVEN_VERSION: '3.9.15' - on: release: types: [ "released" ] jobs: - requires-approval: - runs-on: ubuntu-latest - name: "Waiting for release approval" - environment: release-approval - permissions: - contents: read - steps: - - name: Approval Step - run: echo "Release has been approved!" - - verify-version: - needs: requires-approval - name: Verify Version Matches Tag - runs-on: ubuntu-latest - timeout-minutes: 10 - permissions: - contents: read - steps: - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - with: - ref: ${{ github.event.release.tag_name }} - - - name: Set up Java - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: sapmachine - cache: maven - - - name: Set up Maven - uses: stCarolas/setup-maven@d6af6abeda15e98926a57b5aa970a96bb37f97d1 # v5 - with: - maven-version: ${{ env.MAVEN_VERSION }} - - - name: Verify pom.xml revision matches release tag - run: | - TAG="${{ github.event.release.tag_name }}" - REVISION=$(mvn help:evaluate -Dexpression=revision -q -DforceStdout) - echo "Tag: $TAG" - echo "Revision: $REVISION" - if [ "$TAG" != "$REVISION" ]; then - echo "::error::Release tag '$TAG' does not match pom.xml '$REVISION'. Open a 'Prep release' PR to bump the version before tagging." - exit 1 - fi - shell: bash - - blackduck: - needs: verify-version - name: Blackduck Scan - runs-on: ubuntu-latest - timeout-minutes: 30 - permissions: - contents: read - steps: - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - with: - ref: ${{ github.event.release.tag_name }} - - - name: Scan With Black Duck - uses: cap-java/.github/actions/scan-with-blackduck@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main - with: - blackduck_token: ${{ secrets.BLACK_DUCK_TOKEN }} - github_token: ${{ secrets.GITHUB_TOKEN }} - maven-version: ${{ env.MAVEN_VERSION }} - project-name: com.sap.cds.feature.notifications - included-modules: cds-feature-notifications - version: ${{ github.event.release.tag_name }} - - build: - name: Build - runs-on: ubuntu-latest - timeout-minutes: 30 - needs: verify-version - permissions: - contents: read - steps: - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - with: - ref: ${{ github.event.release.tag_name }} - - - name: Build - uses: cap-java/.github/actions/build@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main - with: - java-version: ${{ env.JAVA_VERSION }} - maven-version: ${{ env.MAVEN_VERSION }} - - deploy: - name: Deploy to Maven Central - runs-on: ubuntu-latest - timeout-minutes: 30 - needs: [blackduck, build] - environment: release - permissions: - contents: read - steps: - - name: Checkout - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v6 - with: - ref: ${{ github.event.release.tag_name }} - - - name: Set up Java - uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: sapmachine - - - name: Deploy - uses: cap-java/.github/actions/deploy-release@296573b55e906f5c77a1855bcfe4285cbbc5cac4 #main - with: - user: ${{ secrets.CENTRAL_REPOSITORY_USER }} - password: ${{ secrets.CENTRAL_REPOSITORY_PASS }} - gpg-pub-key: ${{ secrets.PGP_PUBKEY_ID }} - gpg-private-key: ${{ secrets.PGP_PRIVATE_KEY }} - gpg-passphrase: ${{ secrets.PGP_PASSPHRASE }} - revision: ${{ github.event.release.tag_name }} - maven-version: ${{ env.MAVEN_VERSION }} + release: + uses: cap-java/.github/.github/workflows/release.yml@1040e19f5ca25c2942f2fa56632f430e9a2549be #main + with: + blackduck-project-name: com.sap.cds.feature.notifications + blackduck-included-modules: cds-feature-notifications + secrets: inherit