From 8abd64e58e824cb043f229aafbd0e726ca767a70 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Thu, 30 Apr 2026 10:54:57 +0000
Subject: [PATCH] chore: upgrade from Java 17 to Java 21

- Update maven-compiler-plugin source/target/release from 17 to 21 in root pom.xml
- Update maven-compiler-plugin source/target from 17 to 21 in common/pom.xml
- Update maven-compiler-plugin source/target from 17 to 21 in admin/broadleaf-admin-module/pom.xml
- Update gmavenplus-plugin targetBytecode from 17 to 21 in root pom.xml
- Update Jenkinsfile to use maven-jdk21 build agent

Co-Authored-By: Joao Esteves <joao.esteves@cognition.ai>
---
 Jenkinsfile                          | 2 +-
 admin/broadleaf-admin-module/pom.xml | 4 ++--
 common/pom.xml                       | 4 ++--
 pom.xml                              | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2ec91852e2e..100797094ec 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,2 @@
 properties(commonModuleJobProps())
-buildBroadleafModule(params, false, 'maven-jdk17')
+buildBroadleafModule(params, false, 'maven-jdk21')
diff --git a/admin/broadleaf-admin-module/pom.xml b/admin/broadleaf-admin-module/pom.xml
index d7435e558a5..09f3c8d66a3 100644
--- a/admin/broadleaf-admin-module/pom.xml
+++ b/admin/broadleaf-admin-module/pom.xml
@@ -57,8 +57,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                     <parameters>true</parameters>
                 </configuration>
             </plugin>
diff --git a/common/pom.xml b/common/pom.xml
index 0bbfedf94c0..b83348817ce 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -52,8 +52,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>21</source>
+                    <target>21</target>
                     <parameters>true</parameters>
                 </configuration>
             </plugin>
diff --git a/pom.xml b/pom.xml
index 6836d3b2693..41670d48a07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,9 +85,9 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.14.0</version>
                     <configuration>
-                        <source>17</source>
-                        <target>17</target>
-                        <release>17</release>
+                        <source>21</source>
+                        <target>21</target>
+                        <release>21</release>
                         <parameters>true</parameters>
                     </configuration>
                 </plugin>
@@ -139,7 +139,7 @@
                     <artifactId>gmavenplus-plugin</artifactId>
                     <version>4.2.0</version>
                     <configuration>
-                        <targetBytecode>17</targetBytecode>
+                        <targetBytecode>21</targetBytecode>
                     </configuration>
                     <executions>
                         <execution>