From cd3986491e80e6a6d15866f6c9052009d39e68f7 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 22 Nov 2024 19:58:26 -0700
Subject: [PATCH] Use jenkins.baseline to match archetype (#44)

* Use dependabot config from archetype

* 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.
---
 .github/dependabot.yml | 24 ++++++++++--------------
 pom.xml                |  5 +++--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6356eb5..03b4d66 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,16 +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: "github-actions"
-    directory: "/"
-    labels:
-      - "skip-changelog"
-    schedule:
-      interval: "monthly"
+- package-ecosystem: maven
+  directory: /
+  schedule:
+    interval: monthly
+- package-ecosystem: github-actions
+  directory: /
+  schedule:
+    interval: monthly
diff --git a/pom.xml b/pom.xml
index c47d781..5e51e75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,8 @@
     <revision>1.08</revision>
     <changelist>-SNAPSHOT</changelist>
     <gitHubRepo>jenkinsci/discard-old-build-plugin</gitHubRepo>
-    <jenkins.version>2.361.4</jenkins.version>
+    <jenkins.baseline>2.361</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.4</jenkins.version>
     <spotbugs.effort>Max</spotbugs.effort>   
     <spotbugs.threshold>Low</spotbugs.threshold>
   </properties>
@@ -84,7 +85,7 @@
     <dependencies>
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
-        <artifactId>bom-2.361.x</artifactId>
+        <artifactId>bom-${jenkins.baseline}.x</artifactId>
         <version>2102.v854b_fec19c92</version>
         <scope>import</scope>
         <type>pom</type>