diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..f05b179 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates +--- +version: 2 +updates: + - package-ecosystem: maven + directory: / + schedule: + interval: monthly + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly diff --git a/.github/dependabot.yml.disabled b/.github/dependabot.yml.disabled deleted file mode 100644 index 725bead..0000000 --- a/.github/dependabot.yml.disabled +++ /dev/null @@ -1,21 +0,0 @@ -version: 2 -updates: - - package-ecosystem: maven - directory: '/' - schedule: - interval: 'weekly' - day: wednesday - open-pull-requests-limit: 10 - commit-message: - prefix: chore - include: scope - - - package-ecosystem: github-actions - directory: '/' - schedule: - interval: weekly - day: wednesday - open-pull-requests-limit: 10 - commit-message: - prefix: ci - include: scope diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 1ed5dba..0000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,18 +0,0 @@ -# Inherit base settings from https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.yml -_extends: .github -name-template: REST List Parameter v$RESOLVED_VERSION -tag-template: rest-list-parameter-$RESOLVED_VERSION -version-template: $MAJOR.$MINOR.$PATCH - -# Basic SemVer version resolver -version-resolver: - major: - labels: - - 'major' - minor: - labels: - - 'minor' - patch: - labels: - - 'patch' - default: patch \ No newline at end of file diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 0000000..9b134d5 --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,54 @@ +# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins +# +# Please find additional hints for individual trigger use case +# configuration options inline this script below. +# +--- +name: cd +on: + workflow_dispatch: + inputs: + validate_only: + required: false + type: boolean + description: | + Run validation with release drafter only + → Skip the release job + # Note: Change this default to true, + # if the checkbox should be checked by default. + default: false + # If you don't want any automatic trigger in general, then + # the following check_run trigger lines should all be commented. + # Note: Consider the use case #2 config for 'validate_only' below + # as an alternative option! + check_run: + types: + - completed + +permissions: + checks: read + contents: write + +jobs: + maven-cd: + uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@v1 + with: + # Comment / uncomment the validate_only config appropriate to your preference: + # + # Use case #1 (automatic release): + # - Let any successful Jenkins build trigger another release, + # if there are merged pull requests of interest + # - Perform a validation only run with drafting a release note, + # if manually triggered AND inputs.validate_only has been checked. + # + validate_only: ${{ inputs.validate_only == true }} + # + # Alternative use case #2 (no automatic release): + # - Same as use case #1 - but: + # - Let any check_run trigger a validate_only run. + # => enforce the release job to be skipped. + # + #validate_only: ${{ inputs.validate_only == true || github.event_name == 'check_run' }} + secrets: + MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }} + MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }} diff --git a/.github/workflows/update-release-draft.yml b/.github/workflows/update-release-draft.yml deleted file mode 100644 index 51dbd3b..0000000 --- a/.github/workflows/update-release-draft.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Release Drafter - -on: - push: - branches: [ main ] - -jobs: - update_release_draft: - name: Update release draft - runs-on: ubuntu-latest - if: ${{ ! contains(github.event.head_commit.message, '[maven-release-plugin] prepare release') }} - steps: - - name: Update Release Draft - uses: release-drafter/release-drafter@v5.23.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/upload-release-artifact.yml b/.github/workflows/upload-release-artifact.yml deleted file mode 100644 index a8937f3..0000000 --- a/.github/workflows/upload-release-artifact.yml +++ /dev/null @@ -1,44 +0,0 @@ -name: Upload release artifact - -on: - push: - tags: - - '*' - -jobs: - build-upload-artifact: - name: Build and upload artifact - runs-on: ubuntu-latest - steps: - - name: Update Release Draft - uses: release-drafter/release-drafter@v5.23.0 - id: release-drafter - with: - publish: true - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Set up JDK 11 - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: 11 - - - name: Build with Maven - run: mvn -B package --file pom.xml -Dmaven.test.skip=true - - - name: Prepare GH Release Assets - run: | - VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - cp target/rest-list-parameter.hpi rest-list-parameter-${VERSION}.hpi - sha256sum rest-list-parameter-${VERSION}.hpi > rest-list-parameter-${VERSION}.sha256sum - echo "VERSION=${VERSION}" >> $GITHUB_ENV - - - name: Upload Release Assets - uses: shogo82148/actions-upload-release-asset@v1 - with: - upload_url: ${{ steps.release-drafter.outputs.upload_url }} - asset_path: ./rest-list-parameter-${{ env.VERSION }}* \ No newline at end of file diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 33b0b11..6ac52f0 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ io.jenkins.tools.incrementals git-changelist-maven-extension - 1.6 + 1.8 \ No newline at end of file diff --git a/.mvn/maven.config b/.mvn/maven.config index ac318ab..61cf4e5 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,3 @@ -Pconsume-incrementals --Pmight-produce-incrementals \ No newline at end of file +-Pmight-produce-incrementals +-Dchangelist.format=%d.v%s \ No newline at end of file diff --git a/pom.xml b/pom.xml index efbfa5e..a197de1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,12 @@ org.jenkins-ci.plugins plugin - 4.66 + 4.88 - 1.7.1 - -SNAPSHOT + 999999-SNAPSHOT 2.387.1 2.387.x @@ -29,8 +28,8 @@ io.jenkins.plugins rest-list-parameter 2020 - https://github.com/jenkinsci/${project.artifactId}-plugin/blob/${project.artifactId}-${revision}/README.adoc - ${revision}${changelist} + + ${changelist} hpi