From bbf1d7a870d774e360b0605ae36b729f0262d0cf Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 21 Jul 2021 15:51:50 -0500 Subject: [PATCH 1/6] Adding build/test for jdk-17 ea releases Signed-off-by: Joakim Erdfelt --- Jenkinsfile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 9dc9700e90dd..d85286e0a9d7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,6 +48,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()] + } + } + } + } + } } } From 3f0660e9e1b51077df30b95f3a93c00796e3b8fc Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Jul 2021 05:56:19 -0500 Subject: [PATCH 2/6] Bumping weld to 3.1.8.Final Signed-off-by: Joakim Erdfelt --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 27102d67fcfe..58dbb1496183 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ 5.7.0 3.6.3 1.6.1 - 3.1.5.Final - 3.4.1.Final + 3.1.8.Final + 3.4.2.Final 1.0.6 1.10.9 From a37a3f31cad25f2eb6da8264c062007243017955 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Jul 2021 07:44:42 -0500 Subject: [PATCH 3/6] Add TODO to remove JDK16 builds Signed-off-by: Joakim Erdfelt --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index d85286e0a9d7..7d5820e08803 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,6 +37,7 @@ pipeline { } } + // TODO: Remove once JDK17 (non-ea) has been released stage("Build / Test - JDK16") { agent { node { label 'linux' } } steps { From 730921fcc5f1b2702ba29b555eabd1d365d71d26 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Jul 2021 07:45:13 -0500 Subject: [PATCH 4/6] Disable spotbugs & jacoco plugins on JDK17 Signed-off-by: Joakim Erdfelt --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 58dbb1496183..fa9a83acfbb7 100644 --- a/pom.xml +++ b/pom.xml @@ -1465,6 +1465,17 @@ + + jdk17 + + [1.7,) + + + + true + true + + update-version From 43954e7325a64dea983def19aff8e6ab41760b4c Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Thu, 22 Jul 2021 07:46:00 -0500 Subject: [PATCH 5/6] Fix javadoc issues + attribute not supported + bad

in @param tag Signed-off-by: Joakim Erdfelt --- .../internal/DefaultFileLocatorHelper.java | 2 +- .../jetty/server/CustomRequestLog.java | 50 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java index 25d1b6195a70..7f44815f3194 100644 --- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/utils/internal/DefaultFileLocatorHelper.java +++ b/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. + *

* * @return a URL to the content of the bundle entry that uses the file: * protocol - *

* @throws Exception if unable to get the file url */ @Override diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java b/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java index f2a04e699415..4e340187896c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/CustomRequestLog.java @@ -83,7 +83,7 @@ * * * - * %{format}a + * %{format}a * * Address or Hostname. Valid formats are {server, client, local, remote} * Optional format parameter which will be server by default. @@ -94,7 +94,7 @@ * * * - * %{format}p + * %{format}p * * Port. Valid formats are {server, client, local, remote} * Optional format parameter which will be server by default. @@ -105,7 +105,7 @@ * * * - * %{CLF}I + * %{CLF}I * * 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. @@ -113,7 +113,7 @@ * * * - * %{CLF}O + * %{CLF}O * * 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. @@ -121,7 +121,7 @@ * * * - * %{CLF}S + * %{CLF}S * * 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. @@ -129,7 +129,7 @@ * * * - * %{VARNAME}C + * %{VARNAME}C * * 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. @@ -137,69 +137,69 @@ * * * - * %D + * %D * The time taken to serve the request, in microseconds. * * * - * %{VARNAME}e + * %{VARNAME}e * The contents of the environment variable VARNAME. * * * - * %f + * %f * Filename. * * * - * %H + * %H * The name and version of the request protocol, such as "HTTP/1.1". * * * - * %{VARNAME}i + * %{VARNAME}i * The contents of VARNAME: header line(s) in the request sent to the server. * * * - * %k + * %k * 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). * * * - * %m + * %m * The request method. * * * - * %{VARNAME}o + * %{VARNAME}o * The contents of VARNAME: header line(s) in the response. * * * - * %q + * %q * The query string (prepended with a ? if a query string exists, otherwise an empty string). * * * - * %r + * %r * First line of request. * * * - * %R + * %R * The handler generating the response (if any). * * * - * %s + * %s * Response status. * * * - * %{format|timeZone|locale}t + * %{format|timeZone|locale}t * * The time that the request was received. * Optional parameter in one of the following formats {format}, {format|timeZone} or {format|timeZone|locale}.

@@ -219,19 +219,19 @@ * * * - * %T + * %T * The time taken to serve the request, in seconds. * * * - * %{UNIT}T + * %{UNIT}T * 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. * * * - * %{d}u + * %{d}u * * 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 @@ * * * - * %U + * %U * The URL path requested, not including any query string. * * * - * %X + * %X * * Connection status when response is completed: * 
@@ -256,7 +256,7 @@
  * 
  *
  * 
- * %{VARNAME}^ti
+ * %{VARNAME}^ti
  * The contents of VARNAME: trailer line(s) in the request sent to the server.
  * 
  *

From 5485f8357e86b731a255d1dd00fd7648785d5344 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt 
Date: Thu, 22 Jul 2021 15:30:38 -0500
Subject: [PATCH 6/6] Fixing profile jdk range start

Signed-off-by: Joakim Erdfelt 
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fa9a83acfbb7..3450bfee2616 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1468,7 +1468,7 @@
     
       jdk17
       
-        [1.7,)
+        [17,)