Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

documentation/jetty-asciidoctor-extensions/pom.xml

@@ -11,6 +11,10 @@
   <name>Jetty :: Documentation :: AsciiDoctor Extensions</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <bundle-symbolic-name>${project.groupId}.asciidoctor.extensions</bundle-symbolic-name>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.asciidoctor</groupId>

documentation/jetty-documentation/pom.xml

@@ -14,6 +14,10 @@
     <asciidoctor.skip>${skipTests}</asciidoctor.skip>
   </properties>
 
+  <properties>
+    <bundle-symbolic-name>${project.groupId}</bundle-symbolic-name>
+  </properties>
+
   <build>
     <resources>
       <!-- include something so that a asciidoctor.skip won't break assembly -->

jetty-core/jetty-fcgi/jetty-fcgi-server/src/test/java/org/eclipse/jetty/fcgi/server/HttpClientTest.java

@@ -362,7 +362,7 @@ public class HttpClientTest extends AbstractHttpClientServerTest
             @Override
             public void process(org.eclipse.jetty.server.Request request, org.eclipse.jetty.server.Response response, Callback callback)
             {
-                callback.succeeded();
+                Content.Source.consumeAll(request, callback);
             }
         });
 

jetty-p2/pom.xml

@@ -12,7 +12,7 @@
   <description>Generates a (maven based) P2 Updatesite</description>
   <packaging>pom</packaging>
   <properties>
-    <tycho-version>3.0.0</tycho-version>
+    <tycho-version>2.7.5</tycho-version>
   </properties>
   <build>
     <plugins>