diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 5ee99205..683f638e 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -23,7 +23,7 @@ runs: distribution: sapmachine cache: maven - - name: Setup Maven ${{ inputs.maven-version }} + - name: Set up Maven ${{ inputs.maven-version }} uses: stCarolas/setup-maven@v5 with: maven-version: ${{ inputs.maven-version }} diff --git a/.github/actions/deploy-release/action.yml b/.github/actions/deploy-release/action.yml index b8b3f60e..5a67dae4 100644 --- a/.github/actions/deploy-release/action.yml +++ b/.github/actions/deploy-release/action.yml @@ -62,7 +62,7 @@ runs: -Dmaven.test.skip=true -Dgpg.passphrase="$GPG_PASSPHRASE" -Dgpg.keyname="$GPG_PUB_KEY" - clean deploy + clean deploy -P deploy-release shell: bash env: MAVEN_CENTRAL_USER: ${{ inputs.user }} diff --git a/.github/actions/newrelease/action.yml b/.github/actions/newrelease/action.yml index fac66e21..72b0b9c1 100644 --- a/.github/actions/newrelease/action.yml +++ b/.github/actions/newrelease/action.yml @@ -19,7 +19,7 @@ runs: distribution: sapmachine cache: maven - - name: Setup Maven ${{ inputs.maven-version }} + - name: Set up Maven ${{ inputs.maven-version }} uses: stCarolas/setup-maven@v5 with: maven-version: ${{ inputs.maven-version }} diff --git a/.github/actions/scan-with-blackduck/action.yaml b/.github/actions/scan-with-blackduck/action.yaml index 76be691e..15abed76 100644 --- a/.github/actions/scan-with-blackduck/action.yaml +++ b/.github/actions/scan-with-blackduck/action.yaml @@ -26,7 +26,7 @@ runs: distribution: sapmachine cache: maven - - name: Setup Maven ${{ inputs.maven-version }} + - name: Set up Maven ${{ inputs.maven-version }} uses: stCarolas/setup-maven@v5 with: maven-version: ${{ inputs.maven-version }} diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 398e5e0d..64f1af66 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -10,7 +10,7 @@ on: jobs: build: - name: Build + name: Build and Sonar Scan runs-on: ubuntu-latest strategy: matrix: diff --git a/pom.xml b/pom.xml index 48584e5b..a128db34 100644 --- a/pom.xml +++ b/pom.xml @@ -236,32 +236,6 @@ - - - maven-gpg-plugin - - - sign-artifacts - deploy - - sign - - - - - - - org.sonatype.central - central-publishing-maven-plugin - - central - - cds-feature-attachments-integration-tests-parent - cds-feature-attachments-integration-tests-db - cds-feature-attachments-integration-tests-srv - - - @@ -337,6 +311,41 @@ + + + deploy-release + + + + maven-gpg-plugin + + + sign-artifacts + deploy + + sign + + + + + + + org.sonatype.central + central-publishing-maven-plugin + + central + + cds-feature-attachments-integration-tests-parent + cds-feature-attachments-integration-tests-db + cds-feature-attachments-integration-tests-srv + + + + + + + + artifactory @@ -356,4 +365,4 @@ scm:git:git@github.com:cap-java/cds-feature-attachments.git - + \ No newline at end of file