From 0c47cd62f6751ac7154134ffecccb7087f8f40db Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Dec 2020 06:22:39 +0000
Subject: [PATCH 1/4] Bump access-modifier-checker from 1.16 to 1.21

Bumps [access-modifier-checker](https://github.com/jenkinsci/pom) from 1.16 to 1.21.
- [Release notes](https://github.com/jenkinsci/pom/releases)
- [Changelog](https://github.com/jenkinsci/pom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/pom/compare/jenkins-1.16...jenkins-1.21)

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dc217d0aa4..94fdf8434b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
     <access-modifier.version>1.16</access-modifier.version>
     <!-- May be used to select timestamped snapshots: -->
     <access-modifier-annotation.version>${access-modifier.version}</access-modifier-annotation.version>
-    <access-modifier-checker.version>${access-modifier.version}</access-modifier-checker.version>
+    <access-modifier-checker.version>1.21</access-modifier-checker.version>
     <animal.sniffer.version>1.19</animal.sniffer.version>
     <powermock.version>2.0.9</powermock.version>
 

From a4f3857c72165475a61f9aa7730bcdacbc38048d Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:22:25 +0000
Subject: [PATCH 2/4] Fix property

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 94fdf8434b..bc1c76f29b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,10 +85,10 @@
     <!-- To skip the wizard by default in hpi:run. It should not impact other goals. -->
     <hudson.Main.development>true</hudson.Main.development>
 
-    <access-modifier.version>1.16</access-modifier.version>
+    <access-modifier.version>1.21</access-modifier.version>
     <!-- May be used to select timestamped snapshots: -->
     <access-modifier-annotation.version>${access-modifier.version}</access-modifier-annotation.version>
-    <access-modifier-checker.version>1.21</access-modifier-checker.version>
+    <access-modifier-checker.version>${access-modifier.version}</access-modifier-checker.version>
     <animal.sniffer.version>1.19</animal.sniffer.version>
     <powermock.version>2.0.9</powermock.version>
 

From 9d340da07099781cad483100158c3bda57cce951 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:24:51 +0000
Subject: [PATCH 3/4] Don't use extra properties that aren't needed

---
 pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index bc1c76f29b..1dddee1284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,9 +86,6 @@
     <hudson.Main.development>true</hudson.Main.development>
 
     <access-modifier.version>1.21</access-modifier.version>
-    <!-- May be used to select timestamped snapshots: -->
-    <access-modifier-annotation.version>${access-modifier.version}</access-modifier-annotation.version>
-    <access-modifier-checker.version>${access-modifier.version}</access-modifier-checker.version>
     <animal.sniffer.version>1.19</animal.sniffer.version>
     <powermock.version>2.0.9</powermock.version>
 
@@ -413,7 +410,7 @@
         <plugin>
           <groupId>org.kohsuke</groupId>
           <artifactId>access-modifier-checker</artifactId>
-          <version>${access-modifier-checker.version}</version>
+          <version>${access-modifier.version}</version>
         </plugin>
         <plugin>
           <groupId>com.cloudbees</groupId>

From da5ed08e3a82f226908e26d827a8c14d7ade4a90 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <21194782+timja@users.noreply.github.com>
Date: Mon, 21 Dec 2020 08:25:52 +0000
Subject: [PATCH 4/4] Apply suggestions from code review

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1dddee1284..cdecff6dfd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,7 +85,7 @@
     <!-- To skip the wizard by default in hpi:run. It should not impact other goals. -->
     <hudson.Main.development>true</hudson.Main.development>
 
-    <access-modifier.version>1.21</access-modifier.version>
+    <access-modifier-checker.version>1.21</access-modifier-checker.version>
     <animal.sniffer.version>1.19</animal.sniffer.version>
     <powermock.version>2.0.9</powermock.version>
 
@@ -410,7 +410,7 @@
         <plugin>
           <groupId>org.kohsuke</groupId>
           <artifactId>access-modifier-checker</artifactId>
-          <version>${access-modifier.version}</version>
+          <version>${access-modifier-checker.version}</version>
         </plugin>
         <plugin>
           <groupId>com.cloudbees</groupId>