Merge branch 'jetty-9.4.x' into jetty-9.4.x-1027-Multipart

VERSION.txt

@@ -342,34 +342,6 @@ jetty-9.3.21.v20170918 - 18 September 2017
  + 475546 ClosedChannelException when connection to HTTPS over HTTP proxy with
    CONNECT
 
-jetty-9.4.6.v20170531 - 31 May 2017
- + 523 TLS close behaviour breaking session resumption
- + 1108 Please improve logging in SslContextFactory when there are no approved
-   cipher suites
- + 1505 Adding jetty.base.uri and jetty.home.uri
- + 1514 websocket dump badly formatted
- + 1516 Delay starting of WebSocketClient until an attempt to connect is made
- + 1520 PropertyUserStore should extract packed config file
- + 1526 MongoSessionDataStore old session scavenging is broken due to the
-   missing $ sign in "and" operation
- + 1527 Jetty BOM should not depend on jetty-parent
- + 1528 Internal HttpClient usages should have common configurable technique
- + 1536 Jetty BOM should include more artifacts
- + 1538 NPE in Response.putHeaders
- + 1539 JarFileResource mishandles paths with spaces
- + 1544 Disabling JSR-356 doesn't indicate context it was disabled for
- + 1546 Improve handling of quotes in cookies
- + 1553 X509.isCertSign() can throw ArrayIndexOutOfBoundsException on
-   non-standard implementations
- + 1556 A timing channel in Password.java
- + 1558 When creating WebAppContext without session-config and with NO_SESSIONS
-   throws NPE
- + 1567 XmlConfiguration will start the same object multiple times
- + 1568 ServletUpgradeRequest mangles query strings containing percent-escapes
-   by re-escaping them
- + 1569 Allow setting of maxBinaryMessageSize to 0 in WebSocketPolicy
- + 1579 NPE in Quoted Quality CSV
-
 jetty-9.4.5.v20170502 - 02 May 2017
  + 304 Review dead code - StringUtil.sidBytesToString
  + 1235 DNS lookup in newSSLEngine(InetSocketAddress address)

jetty-bom/pom.xml

@@ -454,7 +454,7 @@
       <email>joakim.erdfelt@gmail.com</email>
       <organization>Webtide, LLC</organization>
       <organizationUrl>https://webtide.com</organizationUrl>
-      <timezone>-7</timezone>
+      <timezone>-6</timezone>
     </developer>
     <developer>
       <id>sbordet</id>

jetty-jspc-maven-plugin/pom.xml

@@ -50,31 +50,17 @@
       <artifactId>jetty-util</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-      <version>2.0.3</version>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>2.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>2.0.3</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
-      <version>3.1</version>
       <exclusions>
         <exclusion>
           <groupId>junit</groupId>
@@ -103,6 +89,24 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-proxy</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.http2</groupId>
+      <artifactId>http2-client</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <reporting>
     <plugins>
@@ -139,6 +143,7 @@
               <execution>
                 <id>integration-test</id>
                 <goals>
+                  <goal>install</goal>
                   <goal>integration-test</goal>
                   <goal>verify</goal>
                 </goals>

jetty-maven-plugin/pom.xml

@@ -10,8 +10,6 @@
   <name>Jetty :: Jetty Maven Plugin</name>
   <description>Jetty maven plugins</description>
   <properties>
-    <mavenVersion>3.5.0</mavenVersion>
-    <pluginToolsVersion>3.5</pluginToolsVersion>
     <bundle-symbolic-name>${project.groupId}.maven.plugin</bundle-symbolic-name>
     <it.debug>false</it.debug>
     <jetty.stopKey>FREEBEER</jetty.stopKey>
@@ -51,33 +49,22 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
-      <version>${mavenVersion}</version>
     </dependency>
      <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>${mavenVersion}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-tools-api</artifactId>
-      <version>${pluginToolsVersion}</version>
-      <exclusions>
-        <exclusion>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-        </exclusion>
-      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>${pluginToolsVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -179,6 +166,13 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-home</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+      <type>zip</type>
+    </dependency>
   </dependencies>
   <reporting>
     <plugins>

jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/invoker.properties

@@ -0,0 +1,2 @@
+invoker.goals = verify -V -e
+#test-compile failsafe:integration-test

jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml

@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.eclipse.jetty.its.jetty-deploy-war-mojo-it</groupId>
+  <artifactId>jetty-simple-project</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+
+  <name>Jetty :: Simple deploy war mojo test</name>
+
+  <properties>
+    <jetty.version>@project.version@</jetty.version>
+    <jetty.port.file>${project.build.directory}/jetty-run-war-port.txt</jetty.port.file>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-client</artifactId>
+      <version>@project.version@</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <target>1.8</target>
+          <source>1.8</source>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>@surefireVersion@</version>
+        <configuration>
+          <skip>true</skip>
+          <systemPropertyVariables>
+            <jetty.port.file>${jetty.port.file}</jetty.port.file>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>@surefireVersion@</version>
+        <configuration>
+          <systemPropertyVariables>
+            <jetty.port.file>${jetty.port.file}</jetty.port.file>
+          </systemPropertyVariables>
+          <includes>
+            <include>**/*TestHelloServlet*</include>
+          </includes>
+        </configuration>
+        <executions>
+          <execution>
+            <id>integration-test</id>
+            <goals>
+              <goal>integration-test</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>verify</id>
+            <goals>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>@project.version@</version>
+        <executions>
+          <execution>
+            <id>start-jetty</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>deploy-war</goal>
+            </goals>
+            <configuration>
+              <war>${project.build.directory}/bean-validation-webapp-2.25.1.war</war>
+              <nonBlocking>true</nonBlocking>
+              <systemProperties>
+                <systemProperty>
+                  <name>jetty.port.file</name>
+                  <value>${jetty.port.file}</value>
+                </systemProperty>
+              </systemProperties>
+              <jettyXml>${basedir}/src/config/jetty.xml</jettyXml>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>3.0.2</version>
+        <executions>
+          <execution>
+            <id>load-war</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>org.glassfish.jersey.examples</groupId>
+                  <artifactId>bean-validation-webapp</artifactId>
+                  <version>2.25.1</version>
+                  <type>war</type>
+                  <overWrite>true</overWrite>
+                  <includes>**</includes>
+                  <outputDirectory>${project.build.directory}</outputDirectory>
+                </artifactItem>
+              </artifactItems>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>

jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/config/jetty.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_3.dtd">
+
+<Configure id="Server" class="org.eclipse.jetty.server.Server">
+  <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
+    <Set name="secureScheme">https</Set>
+    <Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set>
+    <Set name="outputBufferSize">32768</Set>
+    <Set name="requestHeaderSize">8192</Set>
+    <Set name="responseHeaderSize">8192</Set>
+    <Set name="headerCacheSize">512</Set>
+  </New>
+
+  <Call name="addConnector">
+    <Arg>
+      <New class="org.eclipse.jetty.server.ServerConnector">
+        <Arg name="server"><Ref refid="Server" /></Arg>
+        <Arg name="factories">
+          <Array type="org.eclipse.jetty.server.ConnectionFactory">
+            <Item>
+              <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+                <Arg name="config"><Ref refid="httpConfig" /></Arg>
+              </New>
+            </Item>
+          </Array>
+        </Arg>
+        <Call name="addLifeCycleListener">
+          <Arg>
+            <New class="org.eclipse.jetty.maven.plugin.ServerConnectorListener">
+              <Set name="fileName"><Property name="jetty.port.file" default="port.txt"/></Set>
+            </New>
+          </Arg>
+        </Call>
+        <Set name="host"><Property name="jetty.host" /></Set>
+        <Set name="port"><Property name="jetty.port" default="0" />0</Set>
+        <Set name="idleTimeout">30000</Set>
+      </New>
+    </Arg>
+  </Call>
+</Configure>

jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/test/java/org/eclipse/jetty/its/jetty_run_war_mojo_it/TestGetContent.java

@@ -0,0 +1,93 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 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
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+
+package org.eclipse.jetty.its.jetty_run_war_mojo_it;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.LineNumberReader;
+
+import org.eclipse.jetty.client.HttpClient;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestGetContent
+{
+    @Test
+    public void get_content()
+        throws Exception
+    {
+        int port = getPort();
+        Assert.assertTrue(port > 0);
+        HttpClient httpClient = new HttpClient();
+        try
+        {
+            httpClient.start();
+
+            String response = httpClient.GET( "http://localhost:" + port ).getContentAsString();
+
+            Assert.assertTrue(response.trim().contains("Bean Validation Webapp example") );
+
+            response = httpClient.GET( "http://localhost:" + port ).getContentAsString();
+
+            Assert.assertTrue(response.trim().contains("Bean Validation Webapp example") );
+        }
+        finally
+        {
+            httpClient.stop();
+        }
+    }
+
+    public int getPort()
+    throws Exception
+    {
+        int attempts = 20;
+        int port = -1;
+        String s = System.getProperty("jetty.port.file");
+        Assert.assertNotNull(s);
+        File f = new File(s);
+        while (true)
+        {
+            if (f.exists())
+            {
+                try (FileReader r = new FileReader(f);
+                     LineNumberReader lnr = new LineNumberReader(r);
+                    )
+                {
+                    s = lnr.readLine();
+                    Assert.assertNotNull(s);
+                    port = Integer.parseInt(s.trim());
+                }
+                break;
+            }
+            else
+            {
+                if (--attempts < 0)
+                    break;
+                else
+                    Thread.currentThread().sleep(100);
+            }
+        }
+        return port;
+    }
+
+}

jetty-maven-plugin/src/it/jetty-run-distro-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_distro_mojo_it/TestGetContent.java

@@ -29,11 +29,11 @@ import org.junit.Test;
 /**
  *
  */
-public class TestHelloServlet
+public class TestGetContent
 {
 
     @Test
-    public void hello_servlet()
+    public void get_ping_response()
         throws Exception
     {
         int port = getPort();

jetty-maven-plugin/src/it/jetty-run-forked-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_forked_mojo_it/TestGetContent.java

@@ -29,10 +29,11 @@ import org.junit.Test;
 /**
  *
  */
-public class TestHelloServlet
+public class TestGetContent
+
 {
     @Test
-    public void hello_servlet()
+    public void get_ping_response()
         throws Exception
     {
        

jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestGetContent.java

@@ -16,8 +16,7 @@
 //  ========================================================================
 //
 
-
+package org.eclipse.jetty.its.jetty_run_forked_mojo_it;
-package org.eclipse.jetty.its.jetty_run_war_mojo_it;
 
 import java.io.File;
 import java.io.FileReader;
@@ -30,12 +29,14 @@ import org.junit.Test;
 /**
  *
  */
-public class TestHelloServlet
+public class TestGetContent
+
 {
     @Test
-    public void hello_servlet()
+    public void get_ping_response()
         throws Exception
     {
+       
         int port = getPort();
         Assert.assertTrue(port > 0);
         HttpClient httpClient = new HttpClient();
@@ -57,6 +58,7 @@ public class TestHelloServlet
         }
     }
 
+
     public int getPort()
     throws Exception
     {
@@ -89,5 +91,4 @@ public class TestHelloServlet
         }        
         return port;
     }
-
 }

jetty-maven-plugin/src/it/jetty-run-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_mojo_it/TestHelloServlet.java

@@ -1,91 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2018 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
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-
-package org.eclipse.jetty.its.jetty_run_mojo_it;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.LineNumberReader;
-
-import org.eclipse.jetty.client.HttpClient;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- *
- */
-public class TestHelloServlet
-{
-    @Test
-    public void hello_servlet()
-        throws Exception
-    {
-        int port = getPort();
-        HttpClient httpClient = new HttpClient();
-        try
-        {
-            httpClient.start();
-
-            String response = httpClient.GET( "http://localhost:" + port + "/hello?name=beer" ).getContentAsString();
-
-            Assert.assertEquals( "hello beer", response.trim() );
-
-            response = httpClient.GET( "http://localhost:" + port + "/ping?name=beer" ).getContentAsString();
-
-            Assert.assertEquals( "pong beer", response.trim() );
-        }
-        finally
-        {
-            httpClient.stop();
-        }
-    }
-
-    public int getPort()
-    throws Exception
-    {
-        int attempts = 20;
-        int port = -1;
-        String s = System.getProperty("jetty.port.file");
-        Assert.assertNotNull(s);
-        File f = new File(s);
-        while (true)
-        {
-            if (f.exists())
-            {
-                try (FileReader r = new FileReader(f);
-                     LineNumberReader lnr = new LineNumberReader(r);
-                    )
-                {
-                    s = lnr.readLine();
-                    Assert.assertNotNull(s);
-                    port = Integer.parseInt(s.trim());
-                }
-                break;
-            }
-            else
-            {
-                if (--attempts < 0)
-                    break;
-                else
-                    Thread.currentThread().sleep(100);
-            }
-        }        
-        return port;
-    }
-}

jetty-maven-plugin/src/it/jetty-run-war-exploded-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_war_exploded_mojo_it/TestGetContent.java

@@ -16,8 +16,7 @@
 //  ========================================================================
 //
 
-
+package org.eclipse.jetty.its.jetty_run_forked_mojo_it;
-package org.eclipse.jetty.its.jetty_run_war_exploded_mojo_it;
 
 import java.io.File;
 import java.io.FileReader;
@@ -30,12 +29,14 @@ import org.junit.Test;
 /**
  *
  */
-public class TestHelloServlet
+public class TestGetContent
+
 {
     @Test
-    public void hello_servlet()
+    public void get_ping_response()
         throws Exception
     {
+       
         int port = getPort();
         Assert.assertTrue(port > 0);
         HttpClient httpClient = new HttpClient();
@@ -57,6 +58,7 @@ public class TestHelloServlet
         }
     }
 
+
     public int getPort()
     throws Exception
     {
@@ -89,5 +91,4 @@ public class TestHelloServlet
         }        
         return port;
     }
-
 }

jetty-maven-plugin/src/it/jetty-run-war-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_run_war_mojo_it/TestGetContent.java

@@ -0,0 +1,94 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 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
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.its.jetty_run_forked_mojo_it;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.LineNumberReader;
+
+import org.eclipse.jetty.client.HttpClient;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestGetContent
+
+{
+    @Test
+    public void get_ping_response()
+        throws Exception
+    {
+       
+        int port = getPort();
+        Assert.assertTrue(port > 0);
+        HttpClient httpClient = new HttpClient();
+        try
+        {
+            httpClient.start();
+
+            String response = httpClient.GET( "http://localhost:" + port + "/hello?name=beer" ).getContentAsString();
+
+            Assert.assertEquals( "hello beer", response.trim() );
+
+            response = httpClient.GET( "http://localhost:" + port + "/ping?name=beer" ).getContentAsString();
+
+            Assert.assertEquals( "pong beer", response.trim() );
+        }
+        finally
+        {
+            httpClient.stop();
+        }
+    }
+
+
+    public int getPort()
+    throws Exception
+    {
+        int attempts = 20;
+        int port = -1;
+        String s = System.getProperty("jetty.port.file");
+        Assert.assertNotNull(s);
+        File f = new File(s);
+        while (true)
+        {
+            if (f.exists())
+            {
+                try (FileReader r = new FileReader(f);
+                     LineNumberReader lnr = new LineNumberReader(r);
+                    )
+                {
+                    s = lnr.readLine();
+                    Assert.assertNotNull(s);
+                    port = Integer.parseInt(s.trim());
+                }
+                break;
+            }
+            else
+            {
+                if (--attempts < 0)
+                    break;
+                else
+                    Thread.currentThread().sleep(100);
+            }
+        }        
+        return port;
+    }
+}

jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_start_mojo_it/TestGetContent.java

@@ -0,0 +1,94 @@
+//
+//  ========================================================================
+//  Copyright (c) 1995-2018 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
+//  and Apache License v2.0 which accompanies this distribution.
+//
+//      The Eclipse Public License is available at
+//      http://www.eclipse.org/legal/epl-v10.html
+//
+//      The Apache License v2.0 is available at
+//      http://www.opensource.org/licenses/apache2.0.php
+//
+//  You may elect to redistribute this code under either of these licenses.
+//  ========================================================================
+//
+
+package org.eclipse.jetty.its.jetty_run_forked_mojo_it;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.LineNumberReader;
+
+import org.eclipse.jetty.client.HttpClient;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class TestGetContent
+
+{
+    @Test
+    public void get_ping_response()
+        throws Exception
+    {
+       
+        int port = getPort();
+        Assert.assertTrue(port > 0);
+        HttpClient httpClient = new HttpClient();
+        try
+        {
+            httpClient.start();
+
+            String response = httpClient.GET( "http://localhost:" + port + "/hello?name=beer" ).getContentAsString();
+
+            Assert.assertEquals( "hello beer", response.trim() );
+
+            response = httpClient.GET( "http://localhost:" + port + "/ping?name=beer" ).getContentAsString();
+
+            Assert.assertEquals( "pong beer", response.trim() );
+        }
+        finally
+        {
+            httpClient.stop();
+        }
+    }
+
+
+    public int getPort()
+    throws Exception
+    {
+        int attempts = 20;
+        int port = -1;
+        String s = System.getProperty("jetty.port.file");
+        Assert.assertNotNull(s);
+        File f = new File(s);
+        while (true)
+        {
+            if (f.exists())
+            {
+                try (FileReader r = new FileReader(f);
+                     LineNumberReader lnr = new LineNumberReader(r);
+                    )
+                {
+                    s = lnr.readLine();
+                    Assert.assertNotNull(s);
+                    port = Integer.parseInt(s.trim());
+                }
+                break;
+            }
+            else
+            {
+                if (--attempts < 0)
+                    break;
+                else
+                    Thread.currentThread().sleep(100);
+            }
+        }        
+        return port;
+    }
+}

jetty-maven-plugin/src/it/jetty-start-mojo-it/jetty-simple-webapp/src/test/java/org/eclipse/jetty/its/jetty_start_mojo_it/TestHelloServlet.java

@@ -1,93 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2018 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
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-
-package org.eclipse.jetty.its.jetty_start_mojo_it;
-
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.LineNumberReader;
-
-import org.eclipse.jetty.client.HttpClient;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- *
- */
-public class TestHelloServlet
-{
-    @Test
-    public void hello_servlet()
-        throws Exception
-    {
-        int port = getPort();
-        Assert.assertTrue(port > 0);
-        HttpClient httpClient = new HttpClient();
-        try
-        {
-            httpClient.start();
-
-            String response = httpClient.GET( "http://localhost:" + port + "/hello?name=beer" ).getContentAsString();
-
-            Assert.assertEquals( "hello beer", response.trim() );
-
-            response = httpClient.GET( "http://localhost:" + port + "/ping?name=beer" ).getContentAsString();
-
-            Assert.assertEquals( "pong beer", response.trim() );
-        }
-        finally
-        {
-            httpClient.stop();
-        }
-    }
-    public int getPort()
-    throws Exception
-    {
-        int attempts = 20;
-        int port = -1;
-        String s = System.getProperty("jetty.port.file");
-        Assert.assertNotNull(s);
-        File f = new File(s);
-        while (true)
-        {
-            if (f.exists())
-            {
-                try (FileReader r = new FileReader(f);
-                     LineNumberReader lnr = new LineNumberReader(r);
-                    )
-                {   
-                    s = lnr.readLine();
-                    Assert.assertNotNull(s);
-                    port = Integer.parseInt(s.trim());
-                }
-                break;
-            }
-            else
-            {
-                if (--attempts < 0)
-                    break;
-                else
-                    Thread.currentThread().sleep(100);
-            }
-        }        
-        return port;
-    }
-
-}

jetty-xml/src/main/java/org/eclipse/jetty/xml/XmlConfiguration.java

@@ -32,10 +32,8 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.UnknownHostException;
 import java.security.AccessController;
-import java.security.PrivilegedAction;
 import java.security.PrivilegedExceptionAction;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -47,7 +45,6 @@ import java.util.Properties;
 import java.util.Queue;
 import java.util.ServiceLoader;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.eclipse.jetty.util.LazyList;
 import org.eclipse.jetty.util.Loader;
@@ -1515,22 +1512,6 @@ public class XmlConfiguration
                 {
                     Properties properties = null;
 
-                    // Look for properties from start.jar
-                    try
-                    {
-                        Class<?> config = XmlConfiguration.class.getClassLoader().loadClass("org.eclipse.jetty.start.Config");
-                        properties = (Properties)config.getMethod("getProperties").invoke(null);
-                        LOG.debug("org.eclipse.jetty.start.Config properties = {}",properties);
-                    }
-                    catch (NoClassDefFoundError | ClassNotFoundException e)
-                    {
-                        LOG.ignore(e);
-                    }
-                    catch (Exception e)
-                    {
-                        LOG.warn(e);
-                    }
-
                     // If no start.config properties, use clean slate
                     if (properties == null)
                     {

pom.xml

@@ -28,6 +28,9 @@
     <jmh.version>1.20</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>
     <surefireVersion>2.21.0</surefireVersion>
+
+    <mavenPluginToolsVersion>3.5</mavenPluginToolsVersion>
+    <mavenVersion>3.5.0</mavenVersion>
   </properties>
 
   <licenses>
@@ -956,12 +959,34 @@
         <version>1.2</version>
         <scope>provided</scope>
       </dependency>
-      <!-- Old Deps -->
+      <!-- maven deps -->
       <dependency>
         <groupId>org.apache.maven</groupId>
-        <artifactId>maven-plugin-tools-api</artifactId>
+        <artifactId>maven-plugin-api</artifactId>
-        <version>2.0</version>
+        <version>${mavenVersion}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>${mavenVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core</artifactId>
+        <version>${mavenVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-tools-api</artifactId>
+        <version>${mavenPluginToolsVersion}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.plugin-tools</groupId>
+        <artifactId>maven-plugin-annotations</artifactId>
+        <version>${mavenPluginToolsVersion}</version>
+        <scope>provided</scope>
+      </dependency>
+      <!-- Old Deps -->
       <dependency>
         <groupId>org.eclipse.jetty.toolchain</groupId>
         <artifactId>jetty-test-helper</artifactId>