From b99984d12d71bcd8c852e439dbcb90ef18104b8a Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Fri, 11 Feb 2022 14:56:38 -0600
Subject: [PATCH] Fixing Jetty 10 release - must use Java 17 (#7556)

* Fixing missing `jdk.incubator.foreign` error during /javadoc/ (aggregate module) build.
* eclipse-release profile now ensures that JDK 17 is used
* Exclude quiche modules from javadoc
* Enable jacoco on JDK 17 (seems to work now)
* Flip JDK importance around (JDK17 first, JDK11 next)
* errorprone not available on JDK17 (yet)
* correcting errors during Jenkinsfile recordIssues
* Remove pmd (not being used anymore)
* Bump javadoc from 3.3.1 to 3.3.2
---
 Jenkinsfile     | 12 ++++++------
 javadoc/pom.xml |  7 ++++---
 pom.xml         |  7 +++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a3ae5133ae3..a8c14a84e1b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -7,12 +7,12 @@ pipeline {
   stages {
     stage("Parallel Stage") {
       parallel {
-        stage("Build / Test - JDK11") {
+        stage("Build / Test - JDK17") {
           agent { node { label 'linux' } }
           steps {
             container('jetty-build') {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk11", "clean install -Perrorprone", "maven3")
+                mavenBuild( "jdk17", "clean install", "maven3")
                 // Collect up the jacoco execution results (only on main build)
                 jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
                        exclusionPattern: '' +
@@ -31,19 +31,19 @@ pipeline {
                        execPattern: '**/target/jacoco.exec',
                        classPattern: '**/target/classes',
                        sourcePattern: '**/src/main/java'
-                recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser(), errorProne()]
+                recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle()]
               }
             }
           }
         }
 
-        stage("Build / Test - JDK17") {
+        stage("Build / Test - JDK11") {
           agent { node { label 'linux' } }
           steps {
             container( 'jetty-build' ) {
               timeout( time: 120, unit: 'MINUTES' ) {
-                mavenBuild( "jdk17", "clean install -Dspotbugs.skip=true -Djacoco.skip=true", "maven3")
-                recordIssues id: "jdk17", name: "Static Analysis jdk17", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), spotBugs(), pmdParser()]
+                mavenBuild( "jdk11", "clean install -Dspotbugs.skip=true -Djacoco.skip=true -Perrorprone", "maven3")
+                recordIssues id: "jdk11", name: "Static Analysis jdk11", aggregatingResults: true, enabledForFailure: true, tools: [mavenConsole(), java(), checkStyle(), errorProne()]
               }
             }
           }
diff --git a/javadoc/pom.xml b/javadoc/pom.xml
index 8d9ea4a9891..f1ee1b1d02a 100644
--- a/javadoc/pom.xml
+++ b/javadoc/pom.xml
@@ -14,7 +14,6 @@
   <properties>
     <sources-directory>${project.build.directory}/jetty-sources</sources-directory>
     <sonar.skip>true</sonar.skip>
-    <pmd.skip>true</pmd.skip>
     <spotbugs.skip>true</spotbugs.skip>
     <checkstyle.skip>true</checkstyle.skip>
   </properties>
@@ -109,6 +108,10 @@
                 infinispan-remote,
                 jetty-test-helper,
                 alpn-api,
+                quic-quiche,
+                quic-quiche-common,
+                quic-quiche-foreign-incubator,
+                quic-quiche-jna,
                 javax.servlet,
                 javax.websocket,
                 jetty-servlet-api,
@@ -148,8 +151,6 @@
                 org.eclipse.jetty.http3.qpack.internal.*;
                 org.eclipse.jetty.http3.server.internal;
                 org.eclipse.jetty.quic.common.internal;
-                org.eclipse.jetty.quic.quiche;
-                org.eclipse.jetty.quic.quiche.*;
                 org.eclipse.jetty.quic.server.internal;
               </excludePackageNames>
             </configuration>
diff --git a/pom.xml b/pom.xml
index 7cc01c313a7..ac43330a614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
     <maven.install.plugin.version>3.0.0-M1</maven.install.plugin.version>
     <maven.invoker.plugin.version>3.2.2</maven.invoker.plugin.version>
     <maven.jar.plugin.version>3.2.2</maven.jar.plugin.version>
-    <maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
+    <maven.javadoc.plugin.version>3.3.2</maven.javadoc.plugin.version>
     <maven.jxr.plugin.version>3.1.1</maven.jxr.plugin.version>
     <maven.plugin-tools.version>3.6.4</maven.plugin-tools.version>
     <maven-plugin.plugin.version>3.6.4</maven-plugin.plugin.version>
@@ -2237,8 +2237,8 @@
                 <configuration>
                   <rules>
                     <requireJavaVersion>
-                      <version>[11,)</version>
-                      <message>[ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 11 or newer</message>
+                      <version>[17,)</version>
+                      <message>[ERROR] OLD JDK [${java.version}] in use. Jetty Release ${project.version} MUST use JDK 17 or newer</message>
                     </requireJavaVersion>
                   </rules>
                 </configuration>
@@ -2353,7 +2353,6 @@
       <properties>
         <!-- disable plugins known not to work with JDK 17 (yet) -->
         <spotbugs.skip>true</spotbugs.skip>
-        <jacoco.skip>true</jacoco.skip>
       </properties>
     </profile>
     <profile>