From 753f379432d7513a54b857dc411b74ba04cbaa77 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 22 Nov 2024 17:47:07 -0700
Subject: [PATCH 1/2] Use dependabot config from archetype

---
 .github/dependabot.yml | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 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

From 6d1e3e91256c8e1f1929992f58ca87d7ca2d4529 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
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 e7d6a22..4480276 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,8 @@
   <url>https://github.com/jenkinsci/port-allocator-plugin</url>
 
   <properties>
-    <jenkins.version>2.375.4</jenkins.version>
+    <jenkins.baseline>2.375</jenkins.baseline>
+    <jenkins.version>${jenkins.baseline}.4</jenkins.version>
   </properties>
 
   <developers>
@@ -69,7 +70,7 @@
     <dependencies>
         <dependency>
             <groupId>io.jenkins.tools.bom</groupId>
-            <artifactId>bom-2.375.x</artifactId>
+            <artifactId>bom-${jenkins.baseline}.x</artifactId>
             <version>2198.v39c76fc308ca</version>
             <scope>import</scope>
             <type>pom</type>