From 85ebc14aa37e584c99bdb5c6af77acd426b7ed19 Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Tue, 22 Jul 2025 14:39:08 -0400
Subject: [PATCH 1/2] Use Java 17 for build

---
 master-branch-pipeline.yml  | 2 +-
 pom.xml                     | 6 +++---
 pull-request-pipeline.yml   | 2 +-
 release-branch-pipeline.yml | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/master-branch-pipeline.yml b/master-branch-pipeline.yml
index 8718fa9..8df50d7 100644
--- a/master-branch-pipeline.yml
+++ b/master-branch-pipeline.yml
@@ -60,7 +60,7 @@ steps:
       mavenOptions: '-Xmx3072m'
       options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -P CHECKSTYLE'
       javaHomeOption: 'JDKVersion'
-      jdkVersionOption: '1.11'
+      jdkVersionOption: '1.17'
       jdkArchitectureOption: 'x64'
       publishJUnitResults: true
       testResultsFiles: '**/surefire-reports/TEST-*.xml'
diff --git a/pom.xml b/pom.xml
index 07f7a6a..23bfae9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,10 +100,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
+                <version>3.14.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
 
diff --git a/pull-request-pipeline.yml b/pull-request-pipeline.yml
index 99fcc8b..ceff034 100644
--- a/pull-request-pipeline.yml
+++ b/pull-request-pipeline.yml
@@ -12,7 +12,7 @@ steps:
     mavenPomFile: 'pom.xml'
     mavenOptions: '-Xmx3072m'
     javaHomeOption: 'JDKVersion'
-    jdkVersionOption: '1.8'
+    jdkVersionOption: '1.17'
     jdkArchitectureOption: 'x64'
     publishJUnitResults: true
     testResultsFiles: '**/surefire-reports/TEST-*.xml'
diff --git a/release-branch-pipeline.yml b/release-branch-pipeline.yml
index 08f6831..d25d392 100644
--- a/release-branch-pipeline.yml
+++ b/release-branch-pipeline.yml
@@ -81,7 +81,7 @@ steps:
       mavenOptions: '-Xmx3072m'
       options: '--settings $(System.DefaultWorkingDirectory)/settings.xml -P CHECKSTYLE'
       javaHomeOption: 'JDKVersion'
-      jdkVersionOption: '1.11'
+      jdkVersionOption: '1.17'
       jdkArchitectureOption: 'x64'
       publishJUnitResults: true
       testResultsFiles: '**/surefire-reports/TEST-*.xml'

From 77c1151d904e67b48e94cf228301107c835a647d Mon Sep 17 00:00:00 2001
From: dotasek <david.otasek@smilecdr.com>
Date: Tue, 22 Jul 2025 14:52:23 -0400
Subject: [PATCH 2/2] Use properties for Java version + fix jar plugin version

---
 pom.xml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 23bfae9..315631d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,12 @@
 
     <properties>
         <junit_jupiter_version>5.9.2</junit_jupiter_version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.testSource>17</maven.compiler.testSource>
+        <maven.compiler.testTarget>17</maven.compiler.testTarget>
+        <maven.compiler.testRelease>17</maven.compiler.testRelease>
     </properties>
 
     <repositories>
@@ -101,10 +107,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.14.0</version>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
             </plugin>
 
             <plugin>
@@ -152,6 +154,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
                 <executions>
                     <execution>
                         <id>empty-javadoc-jar</id>