[DRAFT] jetty :: upgrade to 12

.github/workflows/create-patch-branch.yml

@@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
         default: ""
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "21"
   JAVA_DISTRIBUTION: "corretto"
 
 permissions:

.github/workflows/maven-ci.yml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   build:
-    name: RHEL8 standard build on Java 11 with compiler target 11
+    name: RHEL8 standard build on Java 21 with compiler target 21
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -39,8 +39,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java-compiler: ['11', '17']
-        java-version: ['21']
+        java-compiler: ['21']
+        java-version: ['21', '25']
     continue-on-error: true
 
     steps:
@@ -71,7 +71,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 21
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -100,7 +100,7 @@ jobs:
           cache-to: ${{ github.event_name == 'push' && 'type=gha,mode=max' || '' }}
 
   macos-build:
-    name: MacOS non-standard build on Java 21 with compiler target 11
+    name: MacOS non-standard build on Java 21
     runs-on: macos-14
     steps:
       - name: Checkout repo
@@ -131,7 +131,7 @@ jobs:
       - name: Configure Java & Maven
         uses: actions/setup-java@ad2b38190b15e4d6bdf0c97fb4fca8412226d287 # v5.3.0
         with:
-          java-version: 11
+          java-version: 21
           distribution: "corretto"
 
       - name: Build with Maven

.github/workflows/maven-publish.yml

@@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
 #     types: [created]
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "21"
   JAVA_DISTRIBUTION: "corretto"
 
 jobs:

.github/workflows/maven-release.yml

@@ -21,7 +21,7 @@ on: # yamllint disable-line rule:truthy
         default: ""
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "21"
   JAVA_DISTRIBUTION: "corretto"
   MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"
 

.github/workflows/maven-version.yml

@@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy
         default: ""
 
 env:
-  JAVA_VERSION: "11"
+  JAVA_VERSION: "21"
   JAVA_DISTRIBUTION: "corretto"
   MAVEN_OPTS: "-Dhttps.protocols=TLSv1.2 -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Djava.awt.headless=true"
 

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 21
 
-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 21](https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/downloads-list.html). 
 
 ### Apache Maven 3.6+
 

README.md

@@ -41,7 +41,7 @@ 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)
+- [JDK 21](https://docs.aws.amazon.com/corretto/latest/corretto-21-ug/downloads-list.html)
 - [Apache Maven 3.6.3+](http://maven.apache.org)
 
 ## Getting Started

contrib/docker/Dockerfile

@@ -7,7 +7,7 @@ FROM redhat/ubi8 AS base_ubi8
 ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 ENV PROJECT_BASE=/opt/emissary
 
-ARG java_version=11
+ARG java_version=21
 ARG user=emissary
 ARG group=emissary
 ARG uid=1000
@@ -28,7 +28,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=21
 ARG user=emissary
 ARG group=emissary
 ARG uid=1000
@@ -54,7 +54,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=21
 ARG user=emissary
 ARG group=emissary
 ARG uid=1000
@@ -96,7 +96,7 @@ RUN git init --quiet \
     && git add . \
     && git commit --quiet -am.
 
-ARG java_compiler=11
+ARG java_compiler=21
 ARG maven_phases='clean verify'
 ARG maven_profiles='-Pdist'
 RUN --mount=type=cache,uid=${uid},gid=${gid},target=/home/${user}/.m2 \

contrib/formatter.xml

@@ -48,7 +48,7 @@
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-<setting id="org.eclipse.jdt.core.compiler.source" value="11"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="21"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
@@ -173,7 +173,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-<setting id="org.eclipse.jdt.core.compiler.compliance" value="11"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="21"/>
 <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
@@ -251,7 +251,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="do not insert"/>
-<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="11"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="21"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
 <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>

pom.xml

@@ -60,8 +60,7 @@
     <dep.commons-lang.version>3.20.0</dep.commons-lang.version>
     <dep.commons-pool.version>2.13.1</dep.commons-pool.version>
     <dep.dropwizard.metrics.version>4.2.39</dep.dropwizard.metrics.version>
-    <!-- Error Prone 2.32+ requires JDK17-->
-    <dep.errorprone.version>2.23.0</dep.errorprone.version>
+    <dep.errorprone.version>2.36.0</dep.errorprone.version>
     <dep.grpc.version>1.65.0</dep.grpc.version>
     <dep.gson.version>2.14.0</dep.gson.version>
     <dep.guava.version>32.1.3-jre</dep.guava.version>
@@ -77,9 +76,8 @@
     <dep.javax.annotation-api.version>1.3.2</dep.javax.annotation-api.version>
     <dep.jaxb.runtime.version>4.0.9</dep.jaxb.runtime.version>
     <dep.jdom.version>2.0.6.1</dep.jdom.version>
-    <dep.jersey.version>3.1.3</dep.jersey.version>
-    <dep.jetty-jakarta-servlet-api.version>5.0.2</dep.jetty-jakarta-servlet-api.version>
-    <dep.jetty.version>11.0.26</dep.jetty.version>
+    <dep.jersey.version>3.1.9</dep.jersey.version>
+    <dep.jetty.version>12.0.14</dep.jetty.version>
     <dep.junit-jupiter.version>5.14.4</dep.junit-jupiter.version>
     <dep.junit-platform.version>1.12.2</dep.junit-platform.version>
     <dep.logback.version>1.5.34</dep.logback.version>
@@ -98,10 +96,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>21</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>21</maven.compiler.source>
+    <maven.compiler.target>21</maven.compiler.target>
     <maven.javadoc.doclint>all,-missing</maven.javadoc.doclint>
     <maven.javadoc.failOnError>true</maven.javadoc.failOnError>
     <maven.javadoc.failOnWarnings>false</maven.javadoc.failOnWarnings>
@@ -113,7 +111,7 @@
     <plugin.exec-maven.version>3.6.3</plugin.exec-maven.version>
     <plugin.formatter-maven.version>2.23.0</plugin.formatter-maven.version>
     <plugin.git-commit-id-maven.version>9.2.0</plugin.git-commit-id-maven.version>
-    <plugin.impsort-maven.version>1.9.0</plugin.impsort-maven.version>
+    <plugin.impsort-maven.version>1.12.0</plugin.impsort-maven.version>
     <plugin.jacoco-maven.version>0.8.15</plugin.jacoco-maven.version>
     <plugin.maven-assembly.version>3.8.0</plugin.maven-assembly.version>
     <plugin.maven-checkstyle.version>3.6.0</plugin.maven-checkstyle.version>
@@ -195,6 +193,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.eclipse.jetty.ee10</groupId>
+        <artifactId>jetty-ee10-bom</artifactId>
+        <version>${dep.jetty.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.glassfish.jersey</groupId>
         <artifactId>jersey-bom</artifactId>
@@ -362,11 +367,6 @@
         <artifactId>janino</artifactId>
         <version>${dep.janino.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.eclipse.jetty.toolchain</groupId>
-        <artifactId>jetty-jakarta-servlet-api</artifactId>
-        <version>${dep.jetty-jakarta-servlet-api.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.glassfish.jaxb</groupId>
         <artifactId>jaxb-runtime</artifactId>
@@ -378,7 +378,7 @@
         <version>${dep.jersey.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.glassfish.jersey.test-framework</groupId>
+        <groupId>org.glassfish.jersey.test-framework.providers</groupId>
         <artifactId>jersey-test-framework-provider-jetty</artifactId>
         <version>${dep.jersey.version}</version>
       </dependency>
@@ -532,6 +532,16 @@
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.1.0</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>
@@ -594,15 +604,21 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
+      <artifactId>jetty-util</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.ee10</groupId>
+      <artifactId>jetty-ee10-servlet</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>jakarta.servlet</groupId>
+          <artifactId>jakarta.servlet-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty.toolchain</groupId>
-      <artifactId>jetty-jakarta-servlet-api</artifactId>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
     </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.containers</groupId>
@@ -976,7 +992,7 @@
                     <version>[${maven.min-version},)</version>
                   </requireMavenVersion>
                   <requireJavaVersion>
-                    <version>[11,)</version>
+                    <version>[21,)</version>
                   </requireJavaVersion>
                   <dependencyConvergence/>
                 </rules>
@@ -1056,6 +1072,7 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${plugin.maven-javadoc.version}</version>
           <configuration>
+            <release>${maven.compiler.release}</release>
             <doclint>${maven.javadoc.doclint}</doclint>
             <failOnError>${maven.javadoc.failOnError}</failOnError>
             <failOnWarnings>${maven.javadoc.failOnWarnings}</failOnWarnings>
@@ -1756,7 +1773,7 @@
       <!-- on by default, but disable with '-P !errorprone' or '-DskipErrorProne' -->
       <id>errorprone</id>
       <activation>
-        <jdk>[11,)</jdk>
+        <jdk>[21,)</jdk>
         <property>
           <name>!skipErrorProne</name>
         </property>
@@ -1789,6 +1806,7 @@
                 <arg>-Werror</arg>
                 <!--arg>-Xlint:all</arg-->
                 <arg>-XDcompilePolicy=simple</arg>
+                <arg>--should-stop=ifError=FLOW</arg>
                 <arg>-Xplugin:ErrorProne \
                   -XepAllDisabledChecksAsWarnings \
                   -XepAllSuggestionsAsWarnings \
@@ -1808,6 +1826,7 @@
                   -Xep:Var:OFF \
                   -Xep:Varifier:OFF \
                   -Xep:YodaCondition:OFF</arg>
+                <arg>-XDaddTypeAnnotationsToSymbol=true</arg>
               </compilerArgs>
               <annotationProcessorPaths>
                 <path>
@@ -1831,7 +1850,7 @@
       </activation>
       <properties>
         <!-- enable compiler compliance when building in Eclipse -->
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
       </properties>
       <build>
         <!--  different build directory for eclipse, so running maven and clicking in IDE don't conflict -->
@@ -1971,10 +1990,10 @@
     <profile>
       <id>jdk-release-flag</id>
       <activation>
-        <jdk>[11,)</jdk>
+        <jdk>[21,)</jdk>
       </activation>
       <properties>
-        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
       </properties>
     </profile>
     <profile>

src/main/java/emissary/Emissary.java

@@ -103,7 +103,7 @@ protected void execute(String[] args) {
                 HelpCommand.dumpCommands(cli);
                 exit(1);
             }
-            String commandName = commandNames.get(0);
+            String commandName = commandNames.getFirst();
             EmissaryCommand cmd = commands.get(commandName);
             dumpBanner(cmd);
             if (Arrays.asList(args).contains(ServerCommand.COMMAND_NAME)) {

src/main/java/emissary/admin/PlaceStarter.java

@@ -243,7 +243,7 @@ public static String getClassString(final String theLocation, boolean isStrictMo
             }
             logger.warn("Multiple entries for {}, found {}", thePlaceName, classStringList);
         }
-        return classStringList.get(0);
+        return classStringList.getFirst();
     }
 
     /** This class is not meant to be instantiated. */