From 01269079c3fa51e8d47424948bfb955309fa975d Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 22 Nov 2024 17:47:07 -0700 Subject: [PATCH 1/2] Use dependabot config from archetype --- .github/dependabot.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 144a580..03b4d66 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,10 +1,12 @@ -# https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates ---- +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuring-dependabot-version-updates + version: 2 updates: - - package-ecosystem: "maven" - directory: "/" - labels: - - "dependencies" - schedule: - interval: "monthly" +- package-ecosystem: maven + directory: / + schedule: + interval: monthly +- package-ecosystem: github-actions + directory: / + schedule: + interval: monthly From 3ec431d80eb120bd3dcaaf3a3dfc274afe1a1a1f Mon Sep 17 00:00:00 2001 From: Mark Waite Date: Fri, 22 Nov 2024 19:08:50 -0700 Subject: [PATCH 2/2] Avoid bom version mismatches with jenkins.baseline The Jenkins plugin archetype uses jenkins.baseline to prevent inconsistencies between the minimum required Jenkins version and the Jenkins plugin bill of materials version. Use the same technique in this plugin. --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index b682d4d..d34b88c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,8 @@ - 2.426.3 + 2.426 + ${jenkins.baseline}.3 1.34 -SNAPSHOT Max @@ -42,7 +43,7 @@ io.jenkins.tools.bom - bom-2.426.x + bom-${jenkins.baseline}.x 3208.vb_21177d4b_cd9 pom import