Merged branch 'jetty-10.0.x-250-http_connect_for_http2' into 'jetty-1…

…0.0.x-3537-bootstrap_websocket_http2'.

Jenkinsfile

@@ -11,7 +11,7 @@ pipeline {
           agent { node { label 'linux' } }
           options { timeout(time: 120, unit: 'MINUTES') }
           steps {
-            mavenBuild("jdk11", "-Pautobahn -Pmongodb install", "maven3", false)
+            mavenBuild("jdk11", "-Pmongodb install", "maven3", true) // -Pautobahn 
             // Collect up the jacoco execution results (only on main build)
             jacoco inclusionPattern: '**/org/eclipse/jetty/**/*.class',
                 exclusionPattern: '' +
@@ -35,43 +35,45 @@ pipeline {
                 execPattern: '**/target/jacoco.exec',
                 classPattern: '**/target/classes',
                 sourcePattern: '**/src/main/java'
+            junit testResults: '**/target/surefire-reports/*.xml,**/target/autobahntestsuite-reports/*.xml'
             warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
             maven_invoker reportsFilenamePattern: "**/target/invoker-reports/BUILD*.xml", invokerBuildDir: "**/target/it"
           }
         }
 
-        stage("Build / Test - JDK11") {
+        stage("Build / Test - JDK12") {
           agent { node { label 'linux' } }
           options { timeout(time: 120, unit: 'MINUTES') }
           steps {
-            mavenBuild("jdk11", "-Pmongodb install", "maven3", false)
+            mavenBuild("jdk12", "-Pmongodb install", "maven3", true)
             warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
             maven_invoker reportsFilenamePattern: "**/target/invoker-reports/BUILD*.xml", invokerBuildDir: "**/target/it"
           }
         }
 
-        stage("Build / Test - JDK12") {
+        stage("Build Javadoc") {
           agent { node { label 'linux' } }
-          options { timeout(time: 120, unit: 'MINUTES') }
+          options { timeout(time: 30, unit: 'MINUTES') }
           steps {
-            mavenBuild("jdk12", "-Pmongodb install", "maven3", false)
-            warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'Java']]
-            maven_invoker reportsFilenamePattern: "**/target/invoker-reports/BUILD*.xml", invokerBuildDir: "**/target/it"
+            mavenBuild("jdk11", "install javadoc:javadoc -DskipTests", "maven3", true)
+            warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
           }
         }
 
-        stage("Build Javadoc") {
+        stage("Checkstyle ") {
           agent { node { label 'linux' } }
           options { timeout(time: 30, unit: 'MINUTES') }
           steps {
-            mavenBuild("jdk11", "install javadoc:javadoc -DskipTests", "maven3", true)
-            warnings consoleParsers: [[parserName: 'Maven'], [parserName: 'JavaDoc'], [parserName: 'Java']]
+            mavenBuild("jdk11", "install checkstyle:check -DskipTests", "maven3", true)
+            recordIssues(
+                    enabledForFailure: true, aggregatingResults: true,
+                    tools: [java(), checkStyle(pattern: '**/target/checkstyle-result.xml', reportEncoding: 'UTF-8')]
+            )
           }
         }
       }
     }
   }
-  /*
   post {
     failure {
       slackNotif()
@@ -83,24 +85,29 @@ pipeline {
       slackNotif()
     }
   }
-  */
 }
 
-/*
+
 def slackNotif() {
     script {
-      if (env.BRANCH_NAME=='jetty-10.0.x' ||
-          env.BRANCH_NAME=='jetty-9.4.x') {
+      try
+      {
+        if ( env.BRANCH_NAME == 'jetty-10.0.x' || env.BRANCH_NAME == 'jetty-9.4.x' )
+        {
           //BUILD_USER = currentBuild.rawBuild.getCause(Cause.UserIdCause).getUserId()
           // by ${BUILD_USER}
           COLOR_MAP = ['SUCCESS': 'good', 'FAILURE': 'danger', 'UNSTABLE': 'danger', 'ABORTED': 'danger']
           slackSend channel: '#jenkins',
-                  color: COLOR_MAP[currentBuild.currentResult],
-                  message: "*${currentBuild.currentResult}:* Job ${env.JOB_NAME} build ${env.BUILD_NUMBER} - ${env.BUILD_URL}"
+                    color: COLOR_MAP[currentBuild.currentResult],
+                    message: "*${currentBuild.currentResult}:* Job ${env.JOB_NAME} build ${env.BUILD_NUMBER} - ${env.BUILD_URL}"
+        }
+      } catch (Exception e) {
+        e.printStackTrace()
+        echo "skip failure slack notification: " + e.getMessage()
       }
     }
 }
-*/
+
 
 /**
  * To other developers, if you are using this method above, please use the following syntax.

Jmh_Jenkinsfile

@@ -38,12 +38,12 @@ node("linux") {
 // jmh run
 node( 'jmh-build-node' ) {
   stage("jmh-run") {
-    timeout( time: 180, unit: 'MINUTES' ) {
+    timeout( time: 210, unit: 'MINUTES' ) {
       withEnv( ["JAVA_HOME=${tool "$jdk"}"] ) {
         unstash name: 'perf-tests'
         sh "rm -rf jmh_results"
         sh "mkdir jmh_results"
-        sh "${env.JAVA_HOME}/bin/java -jar $jmhJarPath -rff jmh_results/jmh_result.json -rf json  -foe true"
+        sh "${env.JAVA_HOME}/bin/java -jar $jmhJarPath -rff jmh_results/jmh_result.json -rf json  -foe true -i 3 -t 3 -wi 3"
         jmhReport 'jmh_results/jmh_result.json'
       }
     }

VERSION.txt

@@ -1,10 +1,52 @@
 jetty-10.0.0-SNAPSHOT
 
+jetty-9.4.19.v20190610 - 10 June 2019
+ + 2909 Remove B64Code
+ + 3332 jetty-maven-plugin - transitive dependencies not loaded from
+   "target/classes"
+ + 3498 WebSocket Session.suspend() now suspends incoming frames instead
+   of reads
+ + 3534 Use System nanoTime, not currentTimeMillis for IdleTimeout
+ + 3550 Server becomes unresponsive after sitting idle from a load spike
+ + 3562 InetAccessHandler should be able to apply to a certain port or
+   connector
+ + 3568 Make UserStore able to be started/stopped with its LoginService
+ + 3583 jetty-maven plugin in multi-module-project does not use files from
+   /target/test-classes folder of dependent projects
+ + 3605 IdleTimeout with Jetty HTTP/2 and InputStreamResponseListener
+ + 3608 Reply with 400 Bad request to malformed WebSocket handshake
+ + 3616 Backport WebSocket SessionTracker from Jetty 10
+ + 3620 Use of `throwUnavailableOnStartupException=true` does not stop Server
+   in jetty-home
+ + 3627 Only renew session id when spnego authentication is fully complete
+ + 3628 NPE in QueuedThreadPool.getReservedThreads()
+ + 3630 X-Forwarded-For missing last hextet for ipv6
+ + 3633 endpointIdentificationAlgorithm enabled by default
+   jetty-ssl-context.xml
+ + 3653 access control exception if programmatic security manager is used
+ + 3655 Spaces missing on Cookies generated via RFC6265
+ + 3663 Remove deprecation of HttpClient replacement methods in WebSocketClient
+ + 3680 Bom manages non-existent infinispan-remote and infinispan-embedded
+   dependencies due to config classifier
+ + 3683 Multipart file not deleted when client aborts upload
+ + 3690 Upgrade to asm 7.1
+ + 3713 Emit warning when invoking deprecated method in Jetty XML
+ + 3715 Improve Log.condensePackage performance
+ + 3722 HttpSessionListener.sessionDestroyed should be able to access webapp
+   classes
+ + 3726 Remove OSGi export uses of servlet-api from jetty-util
+ + 3729 Make creation of java:comp/env threadsafe
+ + 3743 Update XmlConfiguration usage in Jetty to always use Constructors that
+   provide Location information
+ + 3748 @Resource field not injected in Jetty Demo
+ + 3750 NPE in WebSocketClient.toString()
+ + 3751 Modern Configure DTD / FPI is used inconsistently
+
 jetty-9.4.18.v20190429 - 29 April 2019
  + 3476 IllegalStateException in WebSocket ConnectionState
  + 3550 Server becomes unresponsive after sitting idle from a load spike
  + 3563 Update to apache jasper 8.5.40
- + 3573 Update jetty-bom for new infinispan artifacts.
+ + 3573 Update jetty-bom for new infinispan artifacts
  + 3582 HeapByteBuffer cleared unexpected
  + 3597 Session persistence broken from 9.4.13+
  + 3609 Fix infinispan start module dependencies

aggregates/jetty-websocket-all/pom.xml

@@ -63,8 +63,7 @@
             </goals>
             <configuration>
               <archive>
-                <manifest>
-                </manifest>
+                <manifest></manifest>
                 <manifestEntries>
                   <mode>development</mode>
                   <url>http://eclipse.org/jetty</url>

apache-jsp/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
     <groupId>org.eclipse.jetty</groupId>
     <artifactId>jetty-project</artifactId>
@@ -24,11 +23,9 @@
           <instructions>
             <Bundle-Description>Jetty-specific ServletContainerInitializer for Jasper</Bundle-Description>
             <Export-Package>
-              org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}",
-              org.eclipse.jetty.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
+              org.eclipse.jetty.apache.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}", org.eclipse.jetty.jsp.*;version="${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}"
             </Export-Package>
-            <Require-Capability>osgi.extender;
-              filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
+            <Require-Capability>osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)";resolution:=optional
             </Require-Capability>
             <Provide-Capability>
               osgi.serviceloader;osgi.serviceloader=javax.servlet.ServletContainerInitializer,osgi.serviceloader;osgi.serviceloader=org.apache.juli.logging.Log

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

@@ -23,7 +23,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
 import javax.servlet.ServletContext;
 
 import org.apache.jasper.servlet.JasperInitializer;
@@ -37,7 +36,8 @@
  */
 public class JettyJasperInitializer extends JasperInitializer
 {
-   private static final Log LOG = LogFactory.getLog(JasperInitializer.class);
+    private static final Log LOG = LogFactory.getLog(JasperInitializer.class);
+
     /**
      * NullTldScanner
      *
@@ -47,10 +47,7 @@ public class JettyJasperInitializer extends JasperInitializer
     private final class NullTldScanner extends TldScanner
     {
         /**
-         * @param context
-         * @param namespaceAware
-         * @param validation
-         * @param blockExternal
+         *
          */
         private NullTldScanner(ServletContext context, boolean namespaceAware, boolean validation, boolean blockExternal)
         {
@@ -81,7 +78,7 @@ public List<String> getListeners()
         @Override
         public void scanJars()
         {
-           return; //do nothing
+            return; //do nothing
         }
     }
 
@@ -91,22 +88,25 @@ public void scanJars()
      */
     @Override
     public TldScanner newTldScanner(ServletContext context, boolean namespaceAware, boolean validate, boolean blockExternal)
-    {  
+    {
         String tmp = context.getInitParameter("org.eclipse.jetty.jsp.precompiled");
-        if (tmp!=null && !tmp.equals("") && Boolean.valueOf(tmp))
+        if (tmp != null && !tmp.equals("") && Boolean.valueOf(tmp))
         {
-            if (LOG.isDebugEnabled()) LOG.debug("Jsp precompilation detected");
+            if (LOG.isDebugEnabled())
+                LOG.debug("Jsp precompilation detected");
             return new NullTldScanner(context, namespaceAware, validate, blockExternal);
         }
-        
+
         Collection<URL> tldUrls = (Collection<URL>)context.getAttribute("org.eclipse.jetty.tlds");
         if (tldUrls != null)
         {
-            if (LOG.isDebugEnabled()) LOG.debug("Tld pre-scan detected");
-            return new JettyTldPreScanned(context,namespaceAware,validate,blockExternal,tldUrls);
+            if (LOG.isDebugEnabled())
+                LOG.debug("Tld pre-scan detected");
+            return new JettyTldPreScanned(context, namespaceAware, validate, blockExternal, tldUrls);
         }
-
-        if (LOG.isDebugEnabled()) LOG.debug("Defaulting to jasper tld scanning");
+
+        if (LOG.isDebugEnabled())
+            LOG.debug("Defaulting to jasper tld scanning");
         return super.newTldScanner(context, namespaceAware, validate, blockExternal);
     }
 }

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

@@ -16,12 +16,10 @@
 //  ========================================================================
 //
 
-
 package org.eclipse.jetty.apache.jsp;
 
 import java.net.URL;
 import java.util.Collection;
-
 import javax.servlet.ServletContext;
 
 import org.apache.jasper.servlet.TldPreScanned;
@@ -33,25 +31,24 @@
  * Change to TldPreScanned to not require that the tlds have been
  * pre-scanned from a jar file, but rather may be files in the
  * file system.
- * 
+ *
  * This is important for running in the jetty maven plugin
  * environment in multi-module builds, where modules that contain tlds
  * may be in the reactor at the same time as a webapp being run with the
  * plugin. That means that the tlds will be used from their location in
  * the file system, rather than from their assembled jar.
- *
  */
 public class JettyTldPreScanned extends TldPreScanned
 {
     private final Collection<URL> _jettyPreScannedURLs;
-    
+
     public JettyTldPreScanned(ServletContext context, boolean namespaceAware, boolean validation, boolean blockExternal, Collection<URL> preScannedTlds)
     {
         super(context, namespaceAware, validation, blockExternal, preScannedTlds);
         _jettyPreScannedURLs = preScannedTlds;
     }
 
-    /** 
+    /**
      * @see org.apache.jasper.servlet.TldPreScanned#scanJars()
      */
     @Override
@@ -65,8 +62,8 @@ public void scanJars()
                 int a = str.indexOf("jar:");
                 int b = str.indexOf("META-INF");
                 if (b < 0)
-                    throw new IllegalStateException("Bad tld url: "+str);
-                
+                    throw new IllegalStateException("Bad tld url: " + str);
+
                 String path = str.substring(b);
                 if (a >= 0)
                 {
@@ -95,5 +92,4 @@ public void scanJars()
             }
         }
     }
-
 }