diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8abd6166..34e8ede5 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,7 +5,7 @@ updates: schedule: interval: weekly open-pull-requests-limit: 10 - ignore: - - dependency-name: org.jenkins-ci.main:jenkins-core - versions: - - ">= 0" +- package-ecosystem: github-actions + directory: / + schedule: + interval: weekly diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 749d317d..0d0b1c99 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1 @@ _extends: .github -name-template: v$NEXT_MINOR_VERSION 🌈 -tag-template: configuration-as-code-$NEXT_MINOR_VERSION diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml new file mode 100644 index 00000000..56c76d35 --- /dev/null +++ b/.github/workflows/cd.yaml @@ -0,0 +1,59 @@ +# Note: additional setup is required, see https://www.jenkins.io/redirect/continuous-delivery-of-plugins + +name: cd +on: + workflow_dispatch: + check_run: + types: + - 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@v2.4.0 + with: + fetch-depth: 0 + - name: Set up JDK 8 + uses: actions/setup-java@v2.5.0 + with: + distribution: temurin + 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 }} diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 43d62816..4be11527 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -1,7 +1,7 @@ - + io.jenkins.tools.incrementals git-changelist-maven-extension - 1.2 + 1.3 diff --git a/.mvn/maven.config b/.mvn/maven.config index 2a0299c4..f7daf60d 100644 --- a/.mvn/maven.config +++ b/.mvn/maven.config @@ -1,2 +1,3 @@ -Pconsume-incrementals -Pmight-produce-incrementals +-Dchangelist.format=%d.v%s diff --git a/integrations/pom.xml b/integrations/pom.xml index 3d212c6e..0b40f181 100644 --- a/integrations/pom.xml +++ b/integrations/pom.xml @@ -1,9 +1,9 @@ - + parent io.jenkins.configuration-as-code - ${revision}${changelist} + ${changelist} 4.0.0 @@ -13,7 +13,8 @@ true - 2.12.4 + 2.13.1 + true 4.1.72.Final 2.319.1 2.4.0 @@ -73,6 +74,11 @@ + + org.apache.ivy + ivy + 2.5.0 + org.jenkins-ci.plugins @@ -409,7 +415,7 @@ org.antlr antlr4-runtime - 4.9.2 + 4.9.3 org.jenkins-ci.plugins @@ -418,7 +424,12 @@ jaxen jaxen - 1.2.0 + + + xml-apis + xml-apis + + @@ -437,7 +448,7 @@ org.jenkins-ci.plugins slack - 2.48 + 602.v0da_f7458945d test @@ -458,6 +469,18 @@ custom-tools-plugin 0.8 + + + net.minidev + json-smart + 2.4.7 + + + org.ow2.asm + asm + + + org.jenkins-ci.plugins gitlab-plugin @@ -491,14 +514,14 @@ org.jsoup jsoup - 1.14.2 + 1.14.3 test com.vladsch.flexmark flexmark-all - 0.50.42 + 0.62.2 test @@ -552,16 +575,36 @@ gson 2.8.8 + + org.projectlombok + lombok + 1.18.20 + + + com.atlassian.plugins + atlassian-plugins-core + 4.0.0-m029 + + + io.atlassian.fugue + fugue + 4.7.2 + com.squareup.okhttp3 logging-interceptor - 3.14.9 + 4.9.2 com.squareup.okhttp3 okhttp 4.9.2 + + org.jenkins-ci + symbol-annotation + 1.21 + com.github.docker-java @@ -661,7 +704,7 @@ com.google.errorprone error_prone_annotations - 2.9.0 + 2.10.0 com.google.protobuf @@ -686,7 +729,7 @@ jaxen jaxen - 1.1.6 + 1.2.0 org.apache.commons @@ -772,7 +815,7 @@ org.json json - 20210307 + 20211205 joda-time diff --git a/integrations/src/test/resources/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListExpected.yml b/integrations/src/test/resources/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListExpected.yml index 750bde40..16cbaae9 100644 --- a/integrations/src/test/resources/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListExpected.yml +++ b/integrations/src/test/resources/io/jenkins/plugins/casc/ToolDefaultPropertiesExportIgnoreListExpected.yml @@ -9,9 +9,3 @@ jdk: mavenGlobalConfig: globalSettingsProvider: "standard" settingsProvider: "standard" -msTestInstallation: - installations: - - defaultArgs: "/category:SmokeTests" - home: "C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\IDE\\MSTest.exe" - name: "MSTest test" - omitNoIsolation: true diff --git a/plugin/pom.xml b/plugin/pom.xml index eaf08def..29367827 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -1,16 +1,15 @@ - + 4.0.0 io.jenkins.configuration-as-code parent - ${revision}${changelist} - .. + ${changelist} io.jenkins configuration-as-code - ${revision}${changelist} + ${changelist} hpi Configuration as Code Plugin @@ -49,7 +48,7 @@ io.jenkins.tools.bom - bom-2.249.x + bom-2.289.x ${plugin-bom.version} import pom @@ -65,7 +64,7 @@ org.json json - 20210307 + 20211205 com.google.code.findbugs diff --git a/pom.xml b/pom.xml index ac86f127..16afff63 100644 --- a/pom.xml +++ b/pom.xml @@ -1,15 +1,15 @@ - + 4.0.0 org.jenkins-ci.plugins plugin - 4.29 + 4.33 io.jenkins.configuration-as-code parent - ${revision}${changelist} + ${changelist} pom @@ -19,13 +19,13 @@ - 1.55.2 - -SNAPSHOT - 2.249.1 + 999999-SNAPSHOT + jenkinsci/configuration-as-code-plugin + 2.289.3 8 configuration-as-code-@{project.version} true - 950.v396cb834de1e + 1117.v62a_f6a_01de98 Configuration as Code Parent @@ -35,14 +35,14 @@ MIT License - http://opensource.org/licenses/MIT + https://opensource.org/licenses/MIT - scm:git:git://github.com/jenkinsci/configuration-as-code-plugin.git - scm:git:git@github.com:jenkinsci/configuration-as-code-plugin.git - https://github.com/jenkinsci/configuration-as-code-plugin + scm:git:https://github.com/${gitHubRepo}.git + scm:git:git@github.com:${gitHubRepo}.git + https://github.com/${gitHubRepo} ${scmTag} diff --git a/test-harness/pom.xml b/test-harness/pom.xml index d2bf6771..9107d29e 100644 --- a/test-harness/pom.xml +++ b/test-harness/pom.xml @@ -1,10 +1,9 @@ - + 4.0.0 parent io.jenkins.configuration-as-code - ${revision}${changelist} - .. + ${changelist} test-harness @@ -19,7 +18,7 @@ io.jenkins.tools.bom - bom-2.249.x + bom-2.289.x ${plugin-bom.version} import pom @@ -59,7 +58,7 @@ com.vladsch.flexmark flexmark-all - 0.50.42 + 0.62.2 com.github.stefanbirkner diff --git a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java index 34d3510d..48f64333 100644 --- a/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java +++ b/test-harness/src/main/java/io/jenkins/plugins/casc/misc/JenkinsConfiguredWithReadmeRule.java @@ -3,8 +3,8 @@ package io.jenkins.plugins.casc.misc; import com.vladsch.flexmark.ast.FencedCodeBlock; import com.vladsch.flexmark.ast.util.TextCollectingVisitor; import com.vladsch.flexmark.parser.Parser; -import com.vladsch.flexmark.profiles.pegdown.Extensions; -import com.vladsch.flexmark.profiles.pegdown.PegdownOptionsAdapter; +import com.vladsch.flexmark.profile.pegdown.Extensions; +import com.vladsch.flexmark.profile.pegdown.PegdownOptionsAdapter; import com.vladsch.flexmark.util.ast.Node; import com.vladsch.flexmark.util.data.DataHolder; import com.vladsch.flexmark.util.data.MutableDataSet; diff --git a/test-harness/src/test/resources/io/jenkins/plugins/casc/core/MavenConfiguratorTest.yml b/test-harness/src/test/resources/io/jenkins/plugins/casc/core/MavenConfiguratorTest.yml index 0b49484b..ccdc69c6 100644 --- a/test-harness/src/test/resources/io/jenkins/plugins/casc/core/MavenConfiguratorTest.yml +++ b/test-harness/src/test/resources/io/jenkins/plugins/casc/core/MavenConfiguratorTest.yml @@ -1,5 +1,5 @@ tool: - maven: + mavenGlobalConfig: settingsProvider: filePath: path: /usr/share/maven-settings.xml