Merge remote-tracking branch 'origin/master' into jetty-http2

Conflicts:
	tests/test-quickstart/pom.xml

examples/pom.xml

@@ -47,6 +47,5 @@
     -->
     <module>async-rest</module>
     <module>embedded</module>
-    <module>quickstart</module>
   </modules>
 </project>

tests/pom.xml

@@ -47,5 +47,6 @@
     <module>test-continuation</module>
     <module>test-loginservice</module>
     <module>test-integration</module>
+    <module>test-quickstart</module>
   </modules>
 </project>

tests/test-quickstart/pom.xml

@@ -1,15 +1,15 @@
 <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.examples</groupId>
-    <artifactId>examples-parent</artifactId>
+    <groupId>org.eclipse.jetty.tests</groupId>
+    <artifactId>tests-parent</artifactId>
     <version>9.3.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.eclipse.jetty</groupId>
-  <artifactId>example-jetty-quickstart</artifactId>
-  <name>Example :: Jetty Quick Start</name>
-  <description>Jetty Quick Start Example</description>
+  <artifactId>test-quickstart</artifactId>
+  <name>Test :: Jetty Quick Start</name>
+  <description>Jetty Quick Start Test</description>
   <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.examples.quickstart</bundle-symbolic-name>
@@ -19,7 +19,6 @@
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-quickstart</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -45,75 +44,63 @@
       <groupId>javax.transaction</groupId>
       <artifactId>javax.transaction-api</artifactId>
       <version>1.2</version>
-      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
       <artifactId>test-mock-resources</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.mail.glassfish</artifactId>
       <version>1.4.1.v201005082020</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlets</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
       <artifactId>test-jndi-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.tests</groupId>
       <artifactId>test-spec-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>test-jetty-webapp</artifactId>
       <version>${project.version}</version>
       <type>war</type>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>javax-websocket-server-impl</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.websocket</groupId>
       <artifactId>websocket-server</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jsp</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>apache-jstl</artifactId>
       <version>${project.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-test-helper</artifactId>
-      <scope>test</scope>
     </dependency>
     
   </dependencies>

tests/test-quickstart/src/test/resources/test.xml

@@ -30,6 +30,8 @@ detected.
     <Set name="checkWelcomeFiles">true</Set>
   </Get>
 
+  <Set name="parentLoaderPriority">true</Set>
+
   <!-- Non standard error page mapping -->
   <!--
   <Get name="errorHandler">