diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 885d5c2..0279984 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -8,52 +8,8 @@ on: - completed jobs: - validate: - runs-on: ubuntu-latest - outputs: - should_release: ${{ steps.verify-ci-status.outputs.result == 'success' && steps.interesting-categories.outputs.interesting == 'true' }} - steps: - - name: Verify CI status - uses: jenkins-infra/verify-ci-status-action@v1.2.2 - id: verify-ci-status - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - output_result: true - - - name: Release Drafter - uses: release-drafter/release-drafter@v5 - if: steps.verify-ci-status.outputs.result == 'success' - with: - name: next - tag: next - version: next - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Check interesting categories - uses: jenkins-infra/interesting-category-action@v1.2.1 - id: interesting-categories - if: steps.verify-ci-status.outputs.result == 'success' - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - release: - runs-on: ubuntu-latest - needs: [validate] - if: needs.validate.outputs.should_release == 'true' - steps: - - name: Check out - uses: actions/checkout@v3.3.0 - with: - fetch-depth: 0 - - name: Set up JDK 8 - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: 8 - - name: Release - uses: jenkins-infra/jenkins-maven-cd-action@v1.3.3 - with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} - MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} + maven-cd: + uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1 + secrets: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} diff --git a/Jenkinsfile b/Jenkinsfile index bfa77d0..8d38b97 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1 +1,4 @@ -buildPlugin(platforms: ['maven']) +buildPlugin(useContainerAgent: true, configurations: [ + [platform: 'linux', jdk: 17], + [platform: 'windows', jdk: 11], +]) diff --git a/pom.xml b/pom.xml index 04e9ed1..947f602 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,17 @@ + 4.0.0 org.jenkins-ci.plugins plugin - 4.40 + 4.55 The MIT License (MIT) - http://opensource.org/licenses/MIT + https://opensource.org/licenses/MIT repo @@ -19,13 +20,13 @@ ${revision}-${changelist} hpi GitHub API Plugin - https://github.com/jenkinsci/github-api-plugin + https://github.com/jenkinsci/${project.artifactId}-plugin 1.314 999999-SNAPSHOT - 2.289.1 - 8 + 2.361.4 + jenkinsci/${project.artifactId}-plugin false @@ -37,17 +38,14 @@ io.jenkins.plugins commons-lang3-api - 3.12.0.0 io.jenkins.plugins okhttp-api - 4.9.2-20211102 io.jenkins.plugins jjwt-api - 0.11.2-5.143e44951c52 true @@ -111,8 +109,8 @@ io.jenkins.tools.bom - bom-2.289.x - 1438.v6a_2c29d73f82 + bom-2.361.x + 1750.v0071fa_4c4a_e3 import pom @@ -135,9 +133,9 @@ - scm:git:https://github.com/jenkinsci/${project.artifactId}-plugin.git - scm:git:git@github.com:jenkinsci/${project.artifactId}-plugin.git - https://github.com/jenkinsci/${project.artifactId}-plugin + scm:git:https://github.com/${gitHubRepo}.git + scm:git:git@github.com:${gitHubRepo}.git + https://github.com/${gitHubRepo} ${scmTag}