Merge pull request #6534 from eclipse/jetty-10.0.x-update-jdk-build-test

Update Build to work with JDK 17

Jenkinsfile

@@ -37,6 +37,7 @@ pipeline {
           }
         }
 
+        // TODO: Remove once JDK17 (non-ea) has been released
         stage("Build / Test - JDK16") {
           agent { node { label 'linux' } }
           steps {
@@ -48,6 +49,19 @@ pipeline {
             }
           }
         }
+
+        stage("Build / Test - JDK17") {
+          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()]
+              }
+            }
+          }
+        }
+
       }
     }
   }

jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java

@@ -355,10 +355,10 @@ public URL getLocalURL(URL url)
      * Get a URL to the content of the bundle entry that uses the file:
      * protocol. The content of the bundle entry may be downloaded or extracted
      * to the local file system in order to create a file: URL.
+     * </p>
      *
      * @return a URL to the content of the bundle entry that uses the file:
      * protocol
-     * </p>
      * @throws Exception if unable to get the file url
      */
     @Override

jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java

@@ -83,7 +83,7 @@
  * </tr>
  *
  * <tr>
- * <td valign="top">%{format}a</td>
+ * <td>%{format}a</td>
  * <td>
  * Address or Hostname. Valid formats are {server, client, local, remote}
  * Optional format parameter which will be server by default.
@@ -94,7 +94,7 @@
  * </tr>
  *
  * <tr>
- * <td valign="top">%{format}p</td>
+ * <td>%{format}p</td>
  * <td>
  * Port. Valid formats are {server, client, local, remote}
  * Optional format parameter which will be server by default.
@@ -105,101 +105,101 @@
  * </tr>
  *
  * <tr>
- * <td valign="top">%{CLF}I</td>
+ * <td>%{CLF}I</td>
  * <td>
  * Size of request in bytes, excluding HTTP headers.
  * Optional parameter with value of "CLF" to use CLF format, i.e. a '-' rather than a 0 when no bytes are sent.
  * </td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{CLF}O</td>
+ * <td>%{CLF}O</td>
  * <td>
  * Size of response in bytes, excluding HTTP headers.
  * Optional parameter with value of "CLF" to use CLF format, i.e. a '-' rather than a 0 when no bytes are sent.
  * </td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{CLF}S</td>
+ * <td>%{CLF}S</td>
  * <td>
  * Bytes transferred (received and sent). This is the combination of %I and %O.
  * Optional parameter with value of "CLF" to use CLF format, i.e. a '-' rather than a 0 when no bytes are sent.
  * </td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{VARNAME}C</td>
+ * <td>%{VARNAME}C</td>
  * <td>
  * The contents of cookie VARNAME in the request sent to the server. Only version 0 cookies are fully supported.
  * Optional VARNAME parameter, without this parameter %C will log all cookies from the request.
  * </td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%D</td>
+ * <td>%D</td>
  * <td>The time taken to serve the request, in microseconds.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{VARNAME}e</td>
+ * <td>%{VARNAME}e</td>
  * <td>The contents of the environment variable VARNAME.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%f</td>
+ * <td>%f</td>
  * <td>Filename.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%H</td>
+ * <td>%H</td>
  * <td>The name and version of the request protocol, such as "HTTP/1.1".</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{VARNAME}i</td>
+ * <td>%{VARNAME}i</td>
  * <td>The contents of VARNAME: header line(s) in the request sent to the server.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%k</td>
+ * <td>%k</td>
  * <td>Number of keepalive requests handled on this connection.
  * Interesting if KeepAlive is being used, so that, for example, a '1' means the first keepalive request
  * after the initial one, '2' the second, etc...; otherwise this is always 0 (indicating the initial request).</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%m</td>
+ * <td>%m</td>
  * <td>The request method.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{VARNAME}o</td>
+ * <td>%{VARNAME}o</td>
  * <td>The contents of VARNAME: header line(s) in the response.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%q</td>
+ * <td>%q</td>
  * <td>The query string (prepended with a ? if a query string exists, otherwise an empty string).</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%r</td>
+ * <td>%r</td>
  * <td>First line of request.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%R</td>
+ * <td>%R</td>
  * <td>The handler generating the response (if any).</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%s</td>
+ * <td>%s</td>
  * <td>Response status.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{format|timeZone|locale}t</td>
+ * <td>%{format|timeZone|locale}t</td>
  * <td>
  * The time that the request was received.
  * Optional parameter in one of the following formats {format}, {format|timeZone} or {format|timeZone|locale}.<br><br>
@@ -219,19 +219,19 @@
  * </tr>
  *
  * <tr>
- * <td valign="top">%T</td>
+ * <td>%T</td>
  * <td>The time taken to serve the request, in seconds.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{UNIT}T</td>
+ * <td>%{UNIT}T</td>
  * <td>The time taken to serve the request, in a time unit given by UNIT.
  * Valid units are ms for milliseconds, us for microseconds, and s for seconds.
  * Using s gives the same result as %T without any format; using us gives the same result as %D.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%{d}u</td>
+ * <td>%{d}u</td>
  * <td>
  * Remote user if the request was authenticated with servlet authentication. May be bogus if return status (%s) is 401 (unauthorized).
  * Optional parameter d, with this parameter deferred authentication will also be checked,
@@ -240,12 +240,12 @@
  * </tr>
  *
  * <tr>
- * <td valign="top">%U</td>
+ * <td>%U</td>
  * <td>The URL path requested, not including any query string.</td>
  * </tr>
  *
  * <tr>
- * <td valign="top">%X</td>
+ * <td>%X</td>
  * <td>
  * Connection status when response is completed:
  * <pre>
@@ -256,7 +256,7 @@
  * </tr>
  *
  * <tr>
- * <td valign="top">%{VARNAME}^ti</td>
+ * <td>%{VARNAME}^ti</td>
  * <td>The contents of VARNAME: trailer line(s) in the request sent to the server.</td>
  * </tr>
  *

pom.xml

@@ -40,8 +40,8 @@
     <junit.version>5.7.0</junit.version>
     <maven.version>3.6.3</maven.version>
     <maven.resolver.version>1.6.1</maven.resolver.version>
-    <weld.version>3.1.5.Final</weld.version>
-    <jboss.logging.version>3.4.1.Final</jboss.logging.version>
+    <weld.version>3.1.8.Final</weld.version>
+    <jboss.logging.version>3.4.2.Final</jboss.logging.version>
     <jetty.perf-helper.version>1.0.6</jetty.perf-helper.version>
     <ant.version>1.10.9</ant.version>
     <unix.socket.tmp></unix.socket.tmp>
@@ -1465,6 +1465,17 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>jdk17</id>
+      <activation>
+        <jdk>[17,)</jdk>
+      </activation>
+      <properties>
+        <!-- disable plugins known not to work with JDK 17 (yet) -->
+        <spotbugs.skip>true</spotbugs.skip>
+        <jacoco.skip>true</jacoco.skip>
+      </properties>
+    </profile>
     <profile>
       <id>update-version</id>
       <build>