From 834783075d65a1c8691671806b2664067e850dad Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Mon, 27 Dec 2021 21:24:05 -0800
Subject: [PATCH] Bump Jenkins version to 2.249; clean up plugin parent POM

---
 README.md                                  |  2 +-
 pom.xml                                    | 27 +---------------------
 src/it/benchmark/pom.xml                   |  2 +-
 src/it/incrementals-and-plugin-bom/pom.xml |  2 +-
 src/it/sample-plugin/pom.xml               |  2 +-
 src/it/undefined-java-level/pom.xml        |  2 +-
 6 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/README.md b/README.md
index 16510da948..5eefd58b05 100644
--- a/README.md
+++ b/README.md
@@ -62,7 +62,7 @@ If you had a `jar:test-jar` execution, delete it and add to `properties`:
 The plugin POM is designed for plugin builds with JDK 8 or above,
 but target `java.level` for a plugin may differ from a JDK version used for the build.
 Starting from Plugin POM `3.44`, support of Java 7 targets in Plugin POM is deprecated and has been removed in `4.0`,
-`java.level=8` and `jenkins.version>2.204.1` are expected to be used for most plugins.
+`java.level=8` and `jenkins.version>2.249.1` are expected to be used for most plugins.
 
 
 ## Incrementals
diff --git a/pom.xml b/pom.xml
index f6ac761b84..7911aee5bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
     <arguments />
     <argLine>-Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1</argLine>
 
-    <jenkins.version>2.204</jenkins.version>
+    <jenkins.version>2.249</jenkins.version>
     <jenkins-bom.version>${jenkins.version}</jenkins-bom.version>
 
     <jenkins-test-harness.version>1674.v3b8b1441e939</jenkins-test-harness.version>
@@ -231,18 +231,6 @@
     </dependency>
 
     <!-- static analysis -->
-    <dependency>
-      <groupId>com.github.spotbugs</groupId>
-      <artifactId>spotbugs-annotations</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>jsr305</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>net.jcip</groupId>
       <artifactId>jcip-annotations</artifactId>
@@ -265,19 +253,6 @@
       <artifactId>commons-logging</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.kohsuke</groupId>
-      <artifactId>access-modifier-annotation</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional>
-      <exclusions>
-        <exclusion>
-          <!-- provided by Jenkins core -->
-          <groupId>org.jenkins-ci</groupId>
-          <artifactId>annotation-indexer</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
 
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
diff --git a/src/it/benchmark/pom.xml b/src/it/benchmark/pom.xml
index 84a3b22fb6..6b3c9a4e86 100644
--- a/src/it/benchmark/pom.xml
+++ b/src/it/benchmark/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <properties>
-        <jenkins.version>2.204</jenkins.version>
+        <jenkins.version>2.249</jenkins.version>
         <java.level>8</java.level>
     </properties>
     <repositories>
diff --git a/src/it/incrementals-and-plugin-bom/pom.xml b/src/it/incrementals-and-plugin-bom/pom.xml
index 70a3694cdf..bb2a61e025 100644
--- a/src/it/incrementals-and-plugin-bom/pom.xml
+++ b/src/it/incrementals-and-plugin-bom/pom.xml
@@ -14,7 +14,7 @@
     <properties>
         <revision>1.0</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.204</jenkins.version>
+        <jenkins.version>2.249</jenkins.version>
         <java.level>8</java.level>
     </properties>
 
diff --git a/src/it/sample-plugin/pom.xml b/src/it/sample-plugin/pom.xml
index 2eb60ee04d..4f0ebfff95 100644
--- a/src/it/sample-plugin/pom.xml
+++ b/src/it/sample-plugin/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <properties>
-        <jenkins.version>2.204</jenkins.version>
+        <jenkins.version>2.249</jenkins.version>
         <java.level>8</java.level>
     </properties>
     <repositories>
diff --git a/src/it/undefined-java-level/pom.xml b/src/it/undefined-java-level/pom.xml
index 067bc56328..e4d8f20ff5 100644
--- a/src/it/undefined-java-level/pom.xml
+++ b/src/it/undefined-java-level/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <properties>
-        <jenkins.version>2.204</jenkins.version>
+        <jenkins.version>2.249</jenkins.version>
     </properties>
     <repositories>
         <repository>