From 28c43c23be776fc6d5e97081c7e434a95d4ee1fa Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 12 Jan 2025 18:28:38 -0500
Subject: [PATCH 1/6] [pom] Override mockito so that underlying libraries like
 byte buddy flush to same versions

Fixes ability to build on higher jdks
---
 license-maven-plugin/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/license-maven-plugin/pom.xml b/license-maven-plugin/pom.xml
index 78851370f..89dd72cf5 100644
--- a/license-maven-plugin/pom.xml
+++ b/license-maven-plugin/pom.xml
@@ -176,6 +176,18 @@
     </site>
   </distributionManagement>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-bom</artifactId>
+        <version>5.15.2</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>

From 2c8f75e10116a7cbd45638bd9c68d2ccf1ee2955 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 12 Jan 2025 20:15:41 -0500
Subject: [PATCH 2/6] [gha] Drop java 22, add java 23, 24-ea, and 25-ea

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index bd776b255..d11fcc55e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 17, 21, 22]
+        java: [11, 17, 21, 23, 24-ea, 25-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4

From 34069c8622b110b43e1217476dafe05f067b9214 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Jan 2025 13:58:36 -0500
Subject: [PATCH 3/6] [pom] Update javadoc link to java 11

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c9171d02c..f6422c607 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
             <source>${java.version}</source>
             <quiet>true</quiet>
             <links>
-                <link>https://docs.oracle.com/javase/8/docs/api/</link>
+                <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
             </links>
           </configuration>
         </plugin>

From c2558b7741e1d162cd50be8792e41cd4a811f30d Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Jan 2025 14:44:29 -0500
Subject: [PATCH 4/6] [gha] Groovy doesn't support java 25 yet - remove from
 matrix

---
 .github/workflows/ci.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index d11fcc55e..1bc38ca44 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        java: [11, 17, 21, 23, 24-ea, 25-ea]
+        java: [11, 17, 21, 23, 24-ea]
         distribution: ['temurin']
       fail-fast: false
       max-parallel: 4

From 143d7f9276043ef9cd2ee202babe2ef86e2a9e8a Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 2 Sep 2024 15:02:40 -0400
Subject: [PATCH 5/6] [pom] Allow tests to use higher jdks in enforcer

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

diff --git a/pom.xml b/pom.xml
index f6422c607..90a32846c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,7 @@
             <rules>
               <enforceBytecodeVersion>
                 <maxJdkVersion>${java.version}</maxJdkVersion>
+                <ignoredScopes>test</ignoredScopes>
               </enforceBytecodeVersion>
               <requireMavenVersion>
                 <version>(3.6.3,)</version>

From 7d2ba29eb294ef25291b331f97aab307b142177c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 20 Jan 2025 14:46:17 -0500
Subject: [PATCH 6/6] [pom] Ingnore enforcer on provided scope as well

like test, this has no change on consumer end, therefore don't worry about byte code enforcement
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 90a32846c..856f48d8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,7 +253,7 @@
             <rules>
               <enforceBytecodeVersion>
                 <maxJdkVersion>${java.version}</maxJdkVersion>
-                <ignoredScopes>test</ignoredScopes>
+                <ignoredScopes>provided,test</ignoredScopes>
               </enforceBytecodeVersion>
               <requireMavenVersion>
                 <version>(3.6.3,)</version>