From 0ba389c5120131a73dcdfd0c502058b0f9de54ce Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Thu, 9 Dec 2021 15:13:05 -0500 Subject: [PATCH 1/2] Enable CD --- .github/dependabot.yml | 12 ++++++++---- .github/release-drafter.yml | 3 --- .mvn/maven.config | 1 + pom.xml | 5 ++--- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index daec31893..5b48383df 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,6 +1,10 @@ version: 2 updates: - - package-ecosystem: "maven" - directory: "/" - schedule: - interval: "daily" +- package-ecosystem: maven + directory: / + schedule: + interval: daily +- package-ecosystem: github-actions + directory: / + schedule: + interval: daily diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 397e3d90f..0d0b1c994 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,4 +1 @@ _extends: .github -tag-template: credentials-$NEXT_PATCH_VERSION -name-template: $NEXT_PATCH_VERSION -version-template: $MAJOR.$MINOR.$PATCH diff --git a/.mvn/maven.config b/.mvn/maven.config index 2a0299c48..f7daf60d0 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/pom.xml b/pom.xml index e3841e13e..3ffb7802e 100644 --- a/pom.xml +++ b/pom.xml @@ -34,7 +34,7 @@ credentials - ${revision}${changelist} + ${changelist} hpi Credentials Plugin @@ -65,8 +65,7 @@ - 2.6.3 - -SNAPSHOT + 999999-SNAPSHOT 2.308 8 4.9.2 From c1d063af1263c77b429cd03a67fa9896b2f69061 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Wed, 15 Dec 2021 16:31:04 -0500 Subject: [PATCH 2/2] More standard `` --- pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 81bcedabe..68f5a2d84 100644 --- a/pom.xml +++ b/pom.xml @@ -58,14 +58,15 @@ - scm:git:git://github.com/jenkinsci/credentials-plugin.git - scm:git:git@github.com:jenkinsci/credentials-plugin.git - https://github.com/jenkinsci/credentials-plugin + scm:git:https://github.com/${gitHubRepo} + scm:git:https://github.com/${gitHubRepo} + https://github.com/${gitHubRepo} ${scmTag} 999999-SNAPSHOT + jenkinsci/${project.artifactId}-plugin 2.308 8 4.9.2