From e6832fa05928ef9cc08092610b59eb14600236ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 03:47:59 +0000
Subject: [PATCH 1/4] Bump org.jenkins-ci.plugins:plugin from 4.70 to 4.74

Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 4.70 to 4.74.
- [Release notes](https://github.com/jenkinsci/plugin-pom/releases)
- [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jenkinsci/plugin-pom/compare/plugin-4.70...plugin-4.74)

---
updated-dependencies:
- dependency-name: org.jenkins-ci.plugins:plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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 222f2d2..dff8403 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.70</version>
+        <version>4.74</version>
         <relativePath />
     </parent>
 

From a443f938c2efb9781216f22847dd1c219387237c Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 13 Oct 2023 21:33:25 -0600
Subject: [PATCH 2/4] Remove unnecessary java.level property

The Java level is defined in the parent pom and is controlled by the
value of jenkins.version.
---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index dff8403..566fc34 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
     <version>0.23-SNAPSHOT</version>
 
     <properties>
-        <java.level>11</java.level>
         <java.net.id>bap</java.net.id>
         <jenkins.version>2.361.4</jenkins.version>
     </properties>

From 8de4e92ad010cd9ff0c016d0d6ff451bf47c3387 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 13 Oct 2023 21:34:14 -0600
Subject: [PATCH 3/4] Remove unnecessary exclusions

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

diff --git a/pom.xml b/pom.xml
index 566fc34..1abb7e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,28 +59,10 @@
     </developers>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.13.2</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
@@ -103,19 +85,6 @@
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- upgrade to satisfy enforcer.
-            see https://wiki.jenkins.io/display/JENKINS/How+to+fix+RequireUpperBoundDeps#HowtofixRequireUpperBoundDeps-Howtofixrequireupperbounddependencieserror -->
-            <dependency>
-                <groupId>org.jenkins-ci</groupId>
-                <artifactId>symbol-annotation</artifactId>
-                <version>1.19</version>
-                <scope>test</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <scm>
         <connection>scm:git:https://github.com/jenkinsci/publish-over-plugin.git</connection>
         <developerConnection>scm:git:git@github.com:jenkinsci/publish-over-plugin.git</developerConnection>

From c25daa4e3eb6b8370fa94d8207e0cf10a2b732d0 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Fri, 13 Oct 2023 21:34:56 -0600
Subject: [PATCH 4/4] Test with Java 21

Java 21 was released Sep 19, 2023. We want to announce full support
for Java 21 in early October and would like the most used plugins to be
compiled and tested with Java 21.

The acceptance test harness and plugin bill of materials tests are already
passing with Java 21. This is a further step to improve plugin readiness
for use with Java 21 and for development with Java 21.

The change intentionally tests only two Java configurations, Java 17
and Java 21 because we believe that the risk of a regression that only
affects Java 11 is low. We generate Java 11 byte code with the Java 17
and the Java 21 builds, so we're already testing Java 11 byte code.
---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a3a44a6..ce44513 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 buildPlugin(
   useContainerAgent: true,
   configurations: [
-    [platform: 'linux', jdk: 17],
-    [platform: 'windows', jdk: 11],
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
   ]
-)
\ No newline at end of file
+)