From b32bd8ebec0a9ad69499f26267bfbc441eab43e8 Mon Sep 17 00:00:00 2001
From: dev-mlb <19797865+dev-mlb@users.noreply.github.com>
Date: Fri, 1 Nov 2024 13:08:13 -0400
Subject: [PATCH] ci :: java-17

---
 .github/workflows/codeql-analysis.yml     |  8 ++++++++
 .github/workflows/create-patch-branch.yml |  2 +-
 .github/workflows/maven-ci.yml            | 14 +++++++-------
 .github/workflows/maven-publish.yml       |  2 +-
 .github/workflows/maven-release.yml       |  2 +-
 .github/workflows/maven-version.yml       |  2 +-
 DEVELOPING.md                             |  6 +++---
 README.md                                 |  4 ++--
 contrib/docker/Dockerfile                 |  6 +++---
 pom.xml                                   | 18 +++++++++---------
 10 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index fca1f05b66..d1538531dd 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -42,6 +42,14 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Configure Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          cache: 'maven'
+          distribution: 'corretto'
+          overwrite-settings: false
+
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v3
diff --git a/.github/workflows/create-patch-branch.yml b/.github/workflows/create-patch-branch.yml
index f08d0fcdcd..04a3689516 100644
--- a/.github/workflows/create-patch-branch.yml
+++ b/.github/workflows/create-patch-branch.yml
@@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
         default: ""
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "17"
   JAVA_DISTRIBUTION: "corretto"
 
 jobs:
diff --git a/.github/workflows/maven-ci.yml b/.github/workflows/maven-ci.yml
index c7d2c8239f..5848cfd88b 100644
--- a/.github/workflows/maven-ci.yml
+++ b/.github/workflows/maven-ci.yml
@@ -9,7 +9,7 @@ on: # yamllint disable-line rule:truthy
 
 jobs:
   build:
-    name: RHEL8 standard build on Java 11 with compiler target 11
+    name: RHEL8 standard build on Java 17 with compiler target 17
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -32,8 +32,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-compiler: ['11', '17']
-        java-version: ['17']
+        java-compiler: ['17', '21']
+        java-version: ['21']
     continue-on-error: true
 
     steps:
@@ -60,7 +60,7 @@ jobs:
           cache-to: ${{ github.event_name == 'push' && 'type=gha,mode=max' || '' }}
 
   centos7-build:
-    name: Centos7 legacy build on Java 11 with compiler target 11
+    name: Centos7 legacy build on Java 17 with compiler target 17
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -85,7 +85,7 @@ jobs:
           cache-to: ${{ github.event_name == 'push' && 'type=gha,mode=max' || '' }}
 
   macos-build:
-    name: MacOS non-standard build on Java 11 with compiler target 11
+    name: MacOS non-standard build on Java 17 with compiler target 17
     runs-on: macos-14
     steps:
       - name: Checkout repo
@@ -94,7 +94,7 @@ jobs:
       - name: Configure Java
         uses: actions/setup-java@v4
         with:
-          java-version: '11'
+          java-version: '17'
           cache: 'maven'
           distribution: 'corretto'
           overwrite-settings: false
@@ -113,7 +113,7 @@ jobs:
       - name: Configure Java & Maven
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           cache: "maven"
           distribution: "corretto"
 
diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 1e539b4c18..a099e7b43f 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
 #     types: [created]
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "17"
   JAVA_DISTRIBUTION: "corretto"
 
 jobs:
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 41c5ba10ff..ad8a0eeb7b 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -21,7 +21,7 @@ on: # yamllint disable-line rule:truthy
         default: ""
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "17"
   JAVA_DISTRIBUTION: "corretto"
   MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"
 
diff --git a/.github/workflows/maven-version.yml b/.github/workflows/maven-version.yml
index 6d8c92f02a..cd1310276c 100644
--- a/.github/workflows/maven-version.yml
+++ b/.github/workflows/maven-version.yml
@@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy
         default: ""
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "17"
   JAVA_DISTRIBUTION: "corretto"
   MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"
 
diff --git a/DEVELOPING.md b/DEVELOPING.md
index a070170b5d..665e3cadbf 100644
--- a/DEVELOPING.md
+++ b/DEVELOPING.md
@@ -199,10 +199,10 @@ Emissary is best developed and run in a Unix environment.
 
 Preferred operating systems are Linux or macOS.
 
-### Java 11
+### Java 17
 
-Java 1.8 is no longer supported in this codebase, only 
-[Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html). 
+Java 11 is no longer supported in this codebase, only 
+[Java 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html). 
 
 ### Apache Maven 3.6+
 
diff --git a/README.md b/README.md
index 630444b978..3b51af3ded 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,8 @@ services, their cost and quality and keep the P2P network connected.
 ## Minimum Requirements
 
 - Linux or MacOSX operating system
-- [JDK 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html)
-- [Apache Maven 3.5+](http://maven.apache.org)
+- [JDK 17](https://docs.aws.amazon.com/corretto/latest/corretto-17-ug/downloads-list.html)
+- [Apache Maven 3.6+](http://maven.apache.org)
 
 ## Getting Started
 
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index 6878404c09..fa5556e448 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -7,7 +7,7 @@ FROM redhat/ubi8:8.9 AS base_ubi8
 ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8
 ENV PROJECT_BASE=/opt/emissary
 
-ARG java_version=11
+ARG java_version=17
 ARG user=emissary
 ARG group=emissary
 ARG uid=1000
@@ -30,7 +30,7 @@ FROM centos:7 AS base_centos7
 ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8
 ENV PROJECT_BASE=/opt/emissary
 
-ARG java_version=11
+ARG java_version=17
 ARG user=emissary
 ARG group=emissary
 ARG uid=1000
@@ -56,7 +56,7 @@ FROM alpine:3 AS base_alpine3
 ENV JAVA_TOOL_OPTIONS -Dfile.encoding=UTF8
 ENV PROJECT_BASE=/opt/emissary
 
-ARG java_version=11
+ARG java_version=17
 ARG user=emissary
 ARG group=emissary
 ARG uid=1000
diff --git a/pom.xml b/pom.xml
index ed52926274..97488224a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,10 +83,10 @@
     <dep.webjars.popper.version>2.9.3</dep.webjars.popper.version>
     <eclipseFormatterStyle>${project.basedir}/contrib/formatter.xml</eclipseFormatterStyle>
     <git.useNative>false</git.useNative>
-    <maven.compiler.release>11</maven.compiler.release>
+    <maven.compiler.release>17</maven.compiler.release>
     <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <maven.min-version>3.5.0</maven.min-version>
     <plugin.build-helper-maven.version>3.3.0</plugin.build-helper-maven.version>
     <plugin.cyclonedx-maven.version>2.7.9</plugin.cyclonedx-maven.version>
@@ -94,7 +94,7 @@
     <plugin.exec-maven.version>3.1.0</plugin.exec-maven.version>
     <plugin.formatter-maven.version>2.23.0</plugin.formatter-maven.version>
     <plugin.git-commit-id-maven.version>4.9.9</plugin.git-commit-id-maven.version>
-    <plugin.impsort-maven.version>1.8.0</plugin.impsort-maven.version>
+    <plugin.impsort-maven.version>1.12.0</plugin.impsort-maven.version>
     <plugin.jacoco-maven.version>0.8.8</plugin.jacoco-maven.version>
     <plugin.maven-assembly.version>3.4.2</plugin.maven-assembly.version>
     <plugin.maven-checkstyle.version>3.2.1</plugin.maven-checkstyle.version>
@@ -795,7 +795,7 @@
                     <version>[${maven.min-version},)</version>
                   </requireMavenVersion>
                   <requireJavaVersion>
-                    <version>[11,)</version>
+                    <version>[17,)</version>
                   </requireJavaVersion>
                   <dependencyConvergence />
                 </rules>
@@ -1460,7 +1460,7 @@
       <!-- on by default, but disable with '-P !errorProne' or '-DskipErrorProne' -->
       <id>errorProne</id>
       <activation>
-        <jdk>[11,)</jdk>
+        <jdk>[17,)</jdk>
         <property>
           <name>!skipErrorProne</name>
         </property>
@@ -1534,7 +1534,7 @@
       </activation>
       <properties>
         <!-- enable compiler compliance when building in Eclipse -->
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
       </properties>
       <build>
         <!--  different build directory for eclipse, so running maven and clicking in IDE don't conflict -->
@@ -1674,10 +1674,10 @@
     <profile>
       <id>jdk-release-flag</id>
       <activation>
-        <jdk>[11,)</jdk>
+        <jdk>[17,)</jdk>
       </activation>
       <properties>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>17</maven.compiler.release>
       </properties>
     </profile>
     <profile>