From 7ae7e7b1aa4014a88bc9368ec81a5095c0d48d6f Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Fri, 16 Dec 2022 13:08:39 -0800 Subject: [PATCH 1/3] Refresh plugin for December 2022 --- .github/workflows/cd.yaml | 54 ++++----------------------------------- .mvn/extensions.xml | 2 +- Jenkinsfile | 5 +++- pom.xml | 24 ++++++++--------- 4 files changed, 21 insertions(+), 64 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index aa2e06a9..0279984d 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.0 - 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.0.0 - 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.0.1 - 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.2.0 - 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/.mvn/extensions.xml b/.mvn/extensions.xml index a65d82e1..9ac2968b 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -2,6 +2,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.3 + 1.4 diff --git a/Jenkinsfile b/Jenkinsfile index bfa77d04..8d38b971 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 91c9b0f9..130d8987 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,17 @@ + 4.0.0 org.jenkins-ci.plugins plugin - 4.40 + 4.53 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.303 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} From 039da837ba5dfc6f8ce814ec56d51a3b53daa0bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 11:08:34 +0000 Subject: [PATCH 2/3] Bump commons-lang3-api from 3.12.0.0 to 3.12.0-36.vd97de6465d5b_ Bumps [commons-lang3-api](https://github.com/jenkinsci/commons-lang3-api-plugin) from 3.12.0.0 to 3.12.0-36.vd97de6465d5b_. - [Release notes](https://github.com/jenkinsci/commons-lang3-api-plugin/releases) - [Commits](https://github.com/jenkinsci/commons-lang3-api-plugin/commits) --- updated-dependencies: - dependency-name: io.jenkins.plugins:commons-lang3-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 91c9b0f9..5e732891 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ io.jenkins.plugins commons-lang3-api - 3.12.0.0 + 3.12.0-36.vd97de6465d5b_ io.jenkins.plugins From 8fb289004ac45c87b506ab4073690a61141de259 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 7 Mar 2023 13:09:12 +0000 Subject: [PATCH 3/3] Bump plugin from 4.40 to 4.55 Bumps [plugin](https://github.com/jenkinsci/plugin-pom) from 4.40 to 4.55. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.40...plugin-4.55) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 130d8987..dc0bea58 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.53 + 4.55