Jenkinsfile

 #!groovy
 
-def mainJdk = "jdk8"
-def jdks = [mainJdk, "jdk11"]
-def oss = ["linux"]
-def builds = [:]
-for (def os in oss) {
-  for (def jdk in jdks) {
-    builds[os+"_"+jdk] = getFullBuild( jdk, os, mainJdk == jdk )
-  }
-}
-
-parallel builds
-
-def getFullBuild(jdk, os, mainJdk) {
-  return {
-    node(os) {
-      // System Dependent Locations
-      def mvnName = 'maven3.5'
-      def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" // ".repository" //
-      def settingsName = 'oss-settings.xml'
-      def mavenOpts = '-Xms1g -Xmx4g -Djava.awt.headless=true'
-
-      stage("Build / Test - $jdk") {
-        timeout(time: 120, unit: 'MINUTES') {
-          // Checkout
-          checkout scm
-          withMaven(
-                  maven: mvnName,
-                  jdk: "$jdk",
-                  publisherStrategy: 'EXPLICIT',
-                  globalMavenSettingsConfig: settingsName,
-                  mavenOpts: mavenOpts,
-                  mavenLocalRepo: localRepo) {
-            // Testing
-            sh "mvn -V -B install -Dmaven.test.failure.ignore=true -T5 -e -Djetty.testtracker.log=true -Pmongodb -Dunix.socket.tmp=" + env.JENKINS_HOME
-            // Javadoc only
-            sh "mvn -V -B javadoc:javadoc -T6 -e -Dmaven.test.failure.ignore=false"
-          }
-        }
-
-        // Report failures in the jenkins UI
-        junit testResults: '**/target/surefire-reports/TEST-*.xml,**/target/failsafe-reports/TEST-*.xml'
-        consoleParsers = [[parserName: 'JavaDoc'],
-                          [parserName: 'JavaC']]
-
-        if (mainJdk) {
-          // Collect up the jacoco execution results
-          def jacocoExcludes =
+pipeline {
+  agent any
+  // save some io during the build
+  options { durabilityHint('PERFORMANCE_OPTIMIZED') }
+  stages {
+    stage("Parallel Stage") {
+      parallel {
+        stage("Build / Test - JDK8") {
+          agent { node { label 'linux' } }
+          options { timeout(time: 120, unit: 'MINUTES') }
+          steps {
+            mavenBuild("jdk8", "-Pmongodb install", "maven3", false)
+            // Collect up the jacoco execution results (only on main build)
+            jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
+                exclusionPattern: '' +
                     // build tools
-                  "**/org/eclipse/jetty/ant/**" + ",**/org/eclipse/jetty/maven/**" +
-                          ",**/org/eclipse/jetty/jspc/**" +
+                    '**/org/eclipse/jetty/ant/**' +
+                    ',**/org/eclipse/jetty/maven/**' +
+                    ',**/org/eclipse/jetty/jspc/**' +
                     // example code / documentation
-                          ",**/org/eclipse/jetty/embedded/**" + ",**/org/eclipse/jetty/asyncrest/**" +
-                          ",**/org/eclipse/jetty/demo/**" +
+                    ',**/org/eclipse/jetty/embedded/**' +
+                    ',**/org/eclipse/jetty/asyncrest/**' +
+                    ',**/org/eclipse/jetty/demo/**' +
                     // special environments / late integrations
-                          ",**/org/eclipse/jetty/gcloud/**" + ",**/org/eclipse/jetty/infinispan/**" +
-                          ",**/org/eclipse/jetty/osgi/**" + ",**/org/eclipse/jetty/spring/**" +
-                          ",**/org/eclipse/jetty/http/spi/**" +
+                    ',**/org/eclipse/jetty/gcloud/**' +
+                    ',**/org/eclipse/jetty/infinispan/**' +
+                    ',**/org/eclipse/jetty/osgi/**' +
+                    ',**/org/eclipse/jetty/spring/**' +
+                    ',**/org/eclipse/jetty/http/spi/**' +
                     // test classes
-                          ",**/org/eclipse/jetty/tests/**" + ",**/org/eclipse/jetty/test/**"
-          jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
-                 exclusionPattern: jacocoExcludes,
+                    ',**/org/eclipse/jetty/tests/**' +
+                    ',**/org/eclipse/jetty/test/**',
                 execPattern: '**/target/jacoco.exec',
                 classPattern: '**/target/classes',
                 sourcePattern: '**/src/main/java'
-          consoleParsers = [[parserName: 'Maven'],
-                            [parserName: 'JavaDoc'],
-                            [parserName: 'JavaC']]
+            warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
+            maven_invoker reportsFilenamePattern: "**/target/invoker-reports/BUILD*.xml", invokerBuildDir: "**/target/it"
+          }
+        }
 
-          step([$class: 'MavenInvokerRecorder', reportsFilenamePattern: "**/target/invoker-reports/BUILD*.xml",
-                invokerBuildDir: "**/target/its"])
+        stage("Build / Test - JDK11") {
+          agent { node { label 'linux' } }
+          options { timeout(time: 120, unit: 'MINUTES') }
+          steps {
+            mavenBuild("jdk11", "-Pmongodb install", "maven3", false)
+            warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
+            maven_invoker reportsFilenamePattern: "**/target/invoker-reports/BUILD*.xml", invokerBuildDir: "**/target/it"
+          }
         }
 
-        // Report on Maven and Javadoc warnings
-        step([$class        : 'WarningsPublisher',
-              consoleParsers: consoleParsers])
+        stage("Build Javadoc") {
+          agent { node { label 'linux' } }
+          options { timeout(time: 30, unit: 'MINUTES') }
+          steps {
+            mavenBuild("jdk8", "install javadoc:javadoc -DskipTests", "maven3", true)
+            warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
+          }
         }
 
-      stage ("Compact3 - ${jdk}") {
+        stage("Build Compact3") {
+          agent { node { label 'linux' } }
+          options { timeout(time: 120, unit: 'MINUTES') }
+          steps {
+            mavenBuild("jdk8", "-Pcompact3 install -DskipTests", "maven3", true)
+            warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
+          }
+        }
+      }
+    }
+  }
+}
+
+/**
+ * To other developers, if you are using this method above, please use the following syntax.
+ *
+ * mavenBuild("<jdk>", "<profiles> <goals> <plugins> <properties>"
+ *
+ * @param jdk the jdk tool name (in jenkins) to use for this build
+ * @param cmdline the command line in "<profiles> <goals> <properties>"`format.
+ * @return the Jenkinsfile step representing a maven build
+ */
+def mavenBuild(jdk, cmdline, mvnName, junitPublishDisabled) {
+  def localRepo = "${env.JENKINS_HOME}/${env.EXECUTOR_NUMBER}" // ".repository" //
+  def settingsName = 'oss-settings.xml'
+  def mavenOpts = '-Xms1g -Xmx4g -Djava.awt.headless=true'
+
   withMaven(
       maven: mvnName,
       jdk: "$jdk",
       publisherStrategy: 'EXPLICIT',
       globalMavenSettingsConfig: settingsName,
+      options: [junitPublisher(disabled: junitPublishDisabled),mavenLinkerPublisher(disabled: false),pipelineGraphPublisher(disabled: false)],
       mavenOpts: mavenOpts,
       mavenLocalRepo: localRepo) {
-          sh "mvn -f aggregates/jetty-all-compact3 -V -B -Pcompact3 clean install -T6"
-        }
-      }
-    }
+    // Some common Maven command line + provided command line
+    sh "mvn -V -B -T3 -e -Dmaven.test.failure.ignore=true -Djetty.testtracker.log=true $cmdline -Dunix.socket.tmp=" + env.JENKINS_HOME
   }
 }
 

NOTICE.txt

 ==============================================================
  Jetty Web Container
- Copyright 1995-2018 Mort Bay Consulting Pty Ltd.
+ Copyright 1995-2019 Mort Bay Consulting Pty Ltd.
 ==============================================================
 
 The Jetty Web Container is Copyright Mort Bay Consulting Pty Ltd

VERSION.txt

+jetty-9.4.15.v20190215 - 15 February 2019
+ + 113 Add support for NCSA Extended Log File Format
+ + 150 extraClasspath() method on WebAppContext dont support dir path
+ + 2646 Better handle concurrent calls to change session id and invalidate
+   within a context
+ + 2718 NPE using more than one Endpoint.publish
+ + 2817 Change HttpClient and WebSocketClient default to always have SSL
+   support enabled
+ + 3030 Enforce Content-Encoding check only on parameter extraction
+ + 3038 SSL Connection Leak
+ + 3049 Warn on common SslContextFactory problematic configurations
+ + 3133 Logging of `key.readyOps()` can throw unchecked `CancelledKeyException`
+ + 3139 NPE on
+   WebSocketServerContainerInitializer.configureContext(ServletContextHandler)
+ + 3146 ServletContainerInitializer from war WEB-INF/classes not executing
+ + 3154 Add support for javax.net.ssl.HostnameVerifier to HttpClient
+ + 3161 Update to Apache JSP 8.5.35
+ + 3178 BufferingResponseListener does not clear buffer in onHeaders
+ + 3186 Jetty maven plugin - javax.annotation.jar picked up from jetty plugin
+   rather than from applications classpath
+ + 3202 jetty-maven plugin in multi-module project not using files from /target
+   folders of sister projects
+ + 3207 Async ServletOutputStream print methods
+ + 3210 Threadpool module creates unmanged threadpool
+ + 3212 Client and server need to to treat an incoming HTTP/2 RST_STREAM frame
+   differently
+ + 3234 AuthenticationProtocolHandler should not cache the failed results
+ + 3240 ALPN support for Java 13
+ + 3241 Missing main manifest attribute in jetty-runner.jar
+ + 3242 Fix WebSocket components dump()
+ + 3278 NullPointerException if base resource is an empty ResourceCollection
+ + 3279 WebSocket write may hang forever
+ + 3302 Support host:port in X-Forwarded-For header in
+   ForwardedRequestCustomizer
+ + 3305 Avoid additional selectNow() on non-Windows runtimes
+ + 3307 WebAppClassLoader loadClass can throw NullPointerException for missing
+   class
+ + 3311 Ability to serve HTTP and HTTPS from the same port
+ + 3317 Improve uncaught exception handler double logging
+ + 3329 Hazelcast delete expired session fails in deserialize
+ + 3350 Do not expect to be able to connect to https URLs with the HttpClient
+   created from a parameterless constructor
+
 jetty-9.4.14.v20181114 - 14 November 2018
  + 3097 Duplicated programmatic Servlet Listeners causing duplicate calls
  + 3103 HttpClientLoadTest reports a leak in byte buffer

aggregates/jetty-all-compact3/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.14.v20181114</version>
+    <version>9.4.15.v20190215</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

aggregates/jetty-all/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.14.v20181114</version>
+    <version>9.4.15.v20190215</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

apache-jsp/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.14.v20181114</version>
+    <version>9.4.15.v20190215</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-jsp</artifactId>

apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyJasperInitializer.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JettyTldPreScanned.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jsp/src/main/java/org/eclipse/jetty/apache/jsp/JuliLog.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jsp/src/main/java/org/eclipse/jetty/jsp/JettyJspServlet.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJettyJspServlet.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJettyTldPreScanned.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jsp/src/test/java/org/eclipse/jetty/jsp/TestJspFileNameToClass.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jstl/pom.xml

@@ -2,7 +2,7 @@
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
-    <version>9.4.14.v20181114</version>
+    <version>9.4.15.v20190215</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>apache-jstl</artifactId>

apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspConfig.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jstl/src/test/java/org/eclipse/jetty/jstl/JspIncludeTest.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

apache-jstl/src/test/java/org/eclipse/jetty/jstl/JstlTest.java

 //
 //  ========================================================================
-//  Copyright (c) 1995-2018 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0

debian/changelog

+jetty9 (9.4.15-1) unstable; urgency=medium
+
+  * New upstream release
+    - Refreshed the patches
+    - New build dependency on libjboss-logging-java
+    - Ignore the new jetty-websocket-tests module
+  * Standards-Version updated to 4.3.0
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Mon, 25 Feb 2019 01:33:58 +0100
+
 jetty9 (9.4.14-1) unstable; urgency=medium
 
   * New upstream release

debian/control

@@ -13,6 +13,7 @@ Build-Depends: ant-optional,
                libbuild-helper-maven-plugin-java,
                libgeronimo-jta-1.2-spec-java,
                libmail-java,
+               libjboss-logging-java,
                libjcip-annotations-java,
                libjnr-unixsocket-java,
                libmaven-antrun-plugin-java,
@@ -28,7 +29,7 @@ Build-Depends: ant-optional,
                libtomcat9-java,
                maven-debian-helper (>= 2.2.8~),
                maven-repo-helper
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Vcs-Git: https://salsa.debian.org/java-team/jetty9.git
 Vcs-Browser: https://salsa.debian.org/java-team/jetty9
 Homepage: http://www.eclipse.org/jetty/

debian/libjetty9-java.poms

@@ -113,4 +113,5 @@ jetty-nosql/pom.xml                                 --ignore
 jetty-overlay-deployer/pom.xml                      --ignore
 jetty-osgi/pom.xml                                  --ignore
 jetty-runner/pom.xml                                --ignore
+jetty-websocket/jetty-websocket-tests/pom.xml       --ignore
 tests/pom.xml                                       --ignore