From 2994d468f8f4e858fd404ee755abb383ba981830 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Sat, 18 Dec 2021 16:18:06 -0800
Subject: [PATCH 1/6] Drop support for Java 8

---
 README.md                                  |  5 +-
 pom.xml                                    | 57 ++--------------------
 src/it/benchmark/pom.xml                   |  2 +-
 src/it/beta-fail/pom.xml                   |  2 +-
 src/it/beta-just-testing/pom.xml           |  2 +-
 src/it/beta-pass/pom.xml                   |  2 +-
 src/it/incrementals-and-plugin-bom/pom.xml |  2 +-
 src/it/localizer/pom.xml                   |  2 +-
 src/it/sample-plugin/pom.xml               |  2 +-
 9 files changed, 13 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index 16510da948..c3f51a7cc8 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,6 @@ thought to be overridden are no longer based on properties. The main remaining o
   * `hpi-plugin.version`: The HPI Maven Plugin version used by the plugin.
   (Generally you should not set this to a version _lower_ than that specified in the parent POM.)
   * `stapler-plugin.version`: The Stapler Maven plugin version required by the plugin.
-  * `java.level.test`: The Java version to use to build the plugin tests.
   * In order to make their versions the same as the used core version, `node.version` and `npm.version`
   properties are provided.
 * Tests are skipped during the `perform` phase of a release (can be overridden by setting `release.skipTests` to false).
@@ -47,7 +46,7 @@ In order to use the new POM:
 ```xml
   <properties>
     <jenkins.version>2.303.1</jenkins.version>
-    <java.level>8</java.level>
+    <java.level>11</java.level>
   </properties>
 ```
 
@@ -62,7 +61,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=11` and `jenkins.version>2.204.1` are expected to be used for most plugins.
 
 
 ## Incrementals
diff --git a/pom.xml b/pom.xml
index d3bf6a0e2f..b72349517f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,6 @@
     <hpi-plugin.version>3.22</hpi-plugin.version>
     <stapler-plugin.version>1.17</stapler-plugin.version>
     <java.level>you-must-override-the-java.level-property</java.level>
-    <!-- Change this property if you need your tests to be compiled with a different Java level than the plugin. -->
-    <!-- Use only if strictly necessary. It may cause problems in your IDE. -->
-    <java.level.test>${java.level}</java.level.test>
 
     <!-- Defines a SpotBugs threshold. Use "Low" to discover low-priority bugs.
          Hint: SpotBugs considers some real NPE risks in Jenkins as low-priority issues, it is recommended to enable it in plugins.
@@ -89,7 +86,6 @@
 
     <mockito.version>4.2.0</mockito.version>
     <access-modifier-checker.version>1.27</access-modifier-checker.version>
-    <animal.sniffer.version>1.20</animal.sniffer.version>
 
     <!-- To opt in to @Restricted(Beta.class) APIs, set to true: -->
     <useBeta>false</useBeta>
@@ -156,17 +152,6 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>3.1.0</version>
       </dependency>
-      <dependency>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-annotations</artifactId>
-        <version>${animal.sniffer.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.mojo.signature</groupId>
-        <artifactId>java18</artifactId>
-        <version>1.0</version>
-        <type>signature</type>
-      </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
@@ -233,12 +218,6 @@
     </dependency>
 
     <!-- for JRE requirement check annotation -->
-    <dependency>
-      <groupId>org.codehaus.mojo</groupId>
-      <artifactId>animal-sniffer-annotations</artifactId>
-      <scope>provided</scope>
-      <optional>true</optional><!-- no need to have this at runtime -->
-    </dependency>
     <dependency>
       <!-- to avoid https://www.slf4j.org/codes.html#release warning -->
       <!-- TODO this would be better as a managed version of [0] -->
@@ -416,11 +395,6 @@
           <artifactId>maven-hpi-plugin</artifactId>
           <version>${hpi-plugin.version}</version>
         </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>${animal.sniffer.version}</version>
-        </plugin>
         <plugin>
           <groupId>org.jvnet.localizer</groupId>
           <artifactId>localizer-maven-plugin</artifactId>
@@ -501,7 +475,7 @@
                 </requirePluginVersions>
                 -->
                 <enforceBytecodeVersion>
-                  <maxJdkVersion>1.${java.level}</maxJdkVersion>
+                  <maxJdkVersion>${java.level}</maxJdkVersion>
                   <ignoredScopes>
                     <ignoredScope>test</ignoredScope>
                   </ignoredScopes>
@@ -689,29 +663,7 @@
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
-          <source>1.${java.level}</source>
-          <target>1.${java.level}</target>
-          <testSource>1.${java.level.test}</testSource>
-          <testTarget>1.${java.level.test}</testTarget>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>animal-sniffer-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <id>check</id>
-            <phase>test</phase>
-          </execution>
-        </executions>
-        <configuration>
-          <signature>
-            <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java1${java.level}</artifactId>
-          </signature>
+          <release>${java.level}</release>
         </configuration>
       </plugin>
       <plugin>
@@ -726,7 +678,7 @@
           <webApp>
             <contextPath>/jenkins</contextPath>
           </webApp>
-          <minimumJavaVersion>1.${java.level}</minimumJavaVersion>
+          <minimumJavaVersion>${java.level}</minimumJavaVersion>
           <systemProperties>
             <hudson.Main.development>${hudson.Main.development}</hudson.Main.development>
           </systemProperties>
@@ -967,7 +919,7 @@
         </file>
       </activation>
       <properties>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
       </properties>
     </profile>
     <profile>
@@ -1532,7 +1484,6 @@
         <spotbugs.skip>true</spotbugs.skip>
         <enforcer.skip>true</enforcer.skip>
         <access-modifier-checker.skip>true</access-modifier-checker.skip>
-        <animal.sniffer.skip>true</animal.sniffer.skip>
         <invoker.skip>true</invoker.skip>
       </properties>
     </profile>
diff --git a/src/it/benchmark/pom.xml b/src/it/benchmark/pom.xml
index 84a3b22fb6..8b86d3e127 100644
--- a/src/it/benchmark/pom.xml
+++ b/src/it/benchmark/pom.xml
@@ -14,7 +14,7 @@
     <packaging>jar</packaging>
     <properties>
         <jenkins.version>2.204</jenkins.version>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
     </properties>
     <repositories>
         <repository>
diff --git a/src/it/beta-fail/pom.xml b/src/it/beta-fail/pom.xml
index 5da00940a0..a71e8707c7 100644
--- a/src/it/beta-fail/pom.xml
+++ b/src/it/beta-fail/pom.xml
@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
     <properties>
         <jenkins.version>2.277.4</jenkins.version>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/beta-just-testing/pom.xml b/src/it/beta-just-testing/pom.xml
index ed792d7c98..9a72de49f4 100644
--- a/src/it/beta-just-testing/pom.xml
+++ b/src/it/beta-just-testing/pom.xml
@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
     <properties>
         <jenkins.version>2.277.4</jenkins.version>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/beta-pass/pom.xml b/src/it/beta-pass/pom.xml
index 69b3854de9..feff26adb9 100644
--- a/src/it/beta-pass/pom.xml
+++ b/src/it/beta-pass/pom.xml
@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
     <properties>
         <jenkins.version>2.277.4</jenkins.version>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/incrementals-and-plugin-bom/pom.xml b/src/it/incrementals-and-plugin-bom/pom.xml
index 70a3694cdf..cd151990e4 100644
--- a/src/it/incrementals-and-plugin-bom/pom.xml
+++ b/src/it/incrementals-and-plugin-bom/pom.xml
@@ -15,7 +15,7 @@
         <revision>1.0</revision>
         <changelist>-SNAPSHOT</changelist>
         <jenkins.version>2.204</jenkins.version>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
     </properties>
 
     <repositories>
diff --git a/src/it/localizer/pom.xml b/src/it/localizer/pom.xml
index fedf5ca4f9..0e2bba9be8 100644
--- a/src/it/localizer/pom.xml
+++ b/src/it/localizer/pom.xml
@@ -14,7 +14,7 @@
     <packaging>hpi</packaging>
     <properties>
         <jenkins.version>2.277.4</jenkins.version>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/sample-plugin/pom.xml b/src/it/sample-plugin/pom.xml
index 2eb60ee04d..07081c5b90 100644
--- a/src/it/sample-plugin/pom.xml
+++ b/src/it/sample-plugin/pom.xml
@@ -14,7 +14,7 @@
     <packaging>hpi</packaging>
     <properties>
         <jenkins.version>2.204</jenkins.version>
-        <java.level>8</java.level>
+        <java.level>11</java.level>
     </properties>
     <repositories>
         <repository>

From cfec6337e830eae312882cc51ea06265ccbe4a53 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 30 Mar 2022 13:34:38 -0700
Subject: [PATCH 2/6] Remove unneeded profile

---
 pom.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4fefb38ece..f4bfb974aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -899,23 +899,6 @@
   </build>
 
   <profiles>
-    <profile>
-      <id>jdk-above-9</id>
-      <activation>
-        <jdk>[1.9,)</jdk>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <release>11</release>
-              <testRelease>11</testRelease>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>jenkins-release</id>
       <properties>

From 570a766c24dcc2bd8777391a51c8577b65c77eb2 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 30 Nov 2022 08:33:34 -0800
Subject: [PATCH 3/6] Update baseline

---
 README.md                                  | 4 ++--
 src/it/benchmark/pom.xml                   | 2 +-
 src/it/beta-fail/pom.xml                   | 2 +-
 src/it/beta-just-testing/pom.xml           | 2 +-
 src/it/beta-pass/pom.xml                   | 2 +-
 src/it/incrementals-and-plugin-bom/pom.xml | 2 +-
 src/it/localizer/pom.xml                   | 2 +-
 src/it/sample-plugin/pom.xml               | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 9e9cf8ac2d..b52e4bbcc7 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ In order to use the new POM:
     Take a look the developer documentation for the baseline version to use
     https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/#currently-recommended-versions
     -->
-    <jenkins.version>2.332.4</jenkins.version>
+    <jenkins.version>2.361.4</jenkins.version>
   </properties>
 ```
 
@@ -60,7 +60,7 @@ If you had a `jar:test-jar` execution, delete it and add to `properties`:
 
 ## Java support
 
-The plugin POM is designed for plugin builds with JDK 8 or above.  
+The plugin POM is designed for plugin builds with JDK 11 or above.
 Starting from Plugin POM `4.40`, support of Java 17 was added.
 
 ## Incrementals
diff --git a/src/it/benchmark/pom.xml b/src/it/benchmark/pom.xml
index d57c4ed650..29e42e148d 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.249</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
     </properties>
     <repositories>
         <repository>
diff --git a/src/it/beta-fail/pom.xml b/src/it/beta-fail/pom.xml
index a717e3df0f..ca0e2cbdb4 100644
--- a/src/it/beta-fail/pom.xml
+++ b/src/it/beta-fail/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <jenkins.version>2.277.4</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/beta-just-testing/pom.xml b/src/it/beta-just-testing/pom.xml
index d227e8e0db..c00be0c598 100644
--- a/src/it/beta-just-testing/pom.xml
+++ b/src/it/beta-just-testing/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <jenkins.version>2.277.4</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/beta-pass/pom.xml b/src/it/beta-pass/pom.xml
index ca71cc86ec..ca608bea28 100644
--- a/src/it/beta-pass/pom.xml
+++ b/src/it/beta-pass/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <jenkins.version>2.277.4</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/incrementals-and-plugin-bom/pom.xml b/src/it/incrementals-and-plugin-bom/pom.xml
index d0059d0bb3..9cf8e5a97b 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.249</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
     </properties>
 
     <repositories>
diff --git a/src/it/localizer/pom.xml b/src/it/localizer/pom.xml
index b4c4a89dbc..3fef41c086 100644
--- a/src/it/localizer/pom.xml
+++ b/src/it/localizer/pom.xml
@@ -13,7 +13,7 @@
     <version>1.0-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <properties>
-        <jenkins.version>2.277.4</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
         <maven-hpi-plugin.disabledTestInjection>true</maven-hpi-plugin.disabledTestInjection>
     </properties>
     <repositories>
diff --git a/src/it/sample-plugin/pom.xml b/src/it/sample-plugin/pom.xml
index fe1f63f273..4f55b0b0a3 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.249</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
     </properties>
     <repositories>
         <repository>

From 6efda40b21157ef4f25d7509b6e4a0ad5c970da1 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 30 Nov 2022 08:35:53 -0800
Subject: [PATCH 4/6] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b52e4bbcc7..6e7ad220af 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 This new parent POM is decoupled from the core Jenkins project, both from the Maven and repository perspectives.
 
-Since version 4.0 the plugin pom supports Jenkins 2.200 and higher and a select few older LTS lines ([full list](https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-bom/))
+Since version 4.52 the plugin pom supports Jenkins 2.361 and higher.
  
 The main changes are:
 * Reduced number of overridable properties. All references (e.g. dependencies and plugin versions) not

From 089f4fba23234bb25211d6fd8b06f5dfa0e984c5 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 30 Nov 2022 08:36:21 -0800
Subject: [PATCH 5/6] Improve capitalization and phrasing

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6e7ad220af..e3293a3631 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 This new parent POM is decoupled from the core Jenkins project, both from the Maven and repository perspectives.
 
-Since version 4.52 the plugin pom supports Jenkins 2.361 and higher.
+Since version 4.52 the plugin parent POM supports Jenkins 2.361 and higher.
  
 The main changes are:
 * Reduced number of overridable properties. All references (e.g. dependencies and plugin versions) not

From 7469a131abe4a2ddbe10d354e7137a2d82efbe54 Mon Sep 17 00:00:00 2001
From: Basil Crow <me@basilcrow.com>
Date: Wed, 30 Nov 2022 09:06:08 -0800
Subject: [PATCH 6/6] Update BOM version

---
 src/it/incrementals-and-plugin-bom/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/it/incrementals-and-plugin-bom/pom.xml b/src/it/incrementals-and-plugin-bom/pom.xml
index 9cf8e5a97b..692048a441 100644
--- a/src/it/incrementals-and-plugin-bom/pom.xml
+++ b/src/it/incrementals-and-plugin-bom/pom.xml
@@ -33,8 +33,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.176.x</artifactId>
-                <version>4</version>
+                <artifactId>bom-2.361.x</artifactId>
+                <version>1580.v47b_429a_c853a</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>