diff --git a/VERSION.txt b/VERSION.txt index 5fb540da654..9f32ff0a045 100644 --- a/VERSION.txt +++ b/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) diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 5321153b47d..d0fef206a70 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -444,7 +444,7 @@ joakim.erdfelt@gmail.com Webtide, LLC https://webtide.com - -7 + -6 sbordet diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 4fe47700db4..087c6ce3052 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -10,6 +10,7 @@ Jetty :: Jetty JSPC Maven Plugin ${project.groupId}.jspc.plugin + false @@ -96,6 +97,30 @@ apache-jstl ${project.version} + + org.eclipse.jetty + jetty-servlets + ${project.version} + test + + + org.eclipse.jetty + jetty-client + ${project.version} + test + + + org.eclipse.jetty + jetty-proxy + ${project.version} + test + + + org.eclipse.jetty.http2 + http2-client + ${project.version} + test + @@ -120,4 +145,44 @@ + + + run-its + + + + org.apache.maven.plugins + maven-invoker-plugin + + + integration-test + + install + integration-test + verify + + + + + ${it.debug} + true + src/it + ${project.build.directory}/it + + */pom.xml + + ${project.build.directory}/local-repo + src/it/settings.xml + + ${surefireVersion} + + + clean + + + + + + + diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index 64dbc6b6e1e..4696b3d6b1d 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -10,8 +10,6 @@ Jetty :: Jetty Maven Plugin Jetty maven plugins - 3.5.0 - 3.5 ${project.groupId}.maven.plugin 2.20.1 false @@ -52,33 +50,22 @@ org.apache.maven maven-plugin-api - ${mavenVersion} org.apache.maven maven-artifact - ${mavenVersion} org.apache.maven maven-core - ${mavenVersion} org.apache.maven.plugin-tools maven-plugin-tools-api - ${pluginToolsVersion} - - - junit - junit - - org.apache.maven.plugin-tools maven-plugin-annotations - ${pluginToolsVersion} provided @@ -180,6 +167,13 @@ ${project.version} test + + org.eclipse.jetty + jetty-home + ${project.version} + test + zip + diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/invoker.properties b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/invoker.properties new file mode 100644 index 00000000000..816c3f38def --- /dev/null +++ b/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 \ No newline at end of file diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml new file mode 100644 index 00000000000..d654bf0a736 --- /dev/null +++ b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/pom.xml @@ -0,0 +1,140 @@ + + + 4.0.0 + + org.eclipse.jetty.its.jetty-deploy-war-mojo-it + jetty-simple-project + 0.0.1-SNAPSHOT + + Jetty :: Simple deploy war mojo test + + + @project.version@ + ${project.build.directory}/jetty-run-war-port.txt + + + + + org.eclipse.jetty + jetty-client + @project.version@ + test + + + + junit + junit + 4.12 + test + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-surefire-plugin + @surefireVersion@ + + true + + ${jetty.port.file} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + @surefireVersion@ + + + ${jetty.port.file} + + + **/*TestHelloServlet* + + + + + integration-test + + integration-test + + + + verify + + verify + + + + + + org.eclipse.jetty + jetty-maven-plugin + @project.version@ + + + start-jetty + test-compile + + deploy-war + + + ${project.build.directory}/bean-validation-webapp-2.25.1.war + true + + + jetty.port.file + ${jetty.port.file} + + + ${basedir}/src/config/jetty.xml + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.2 + + + load-war + generate-resources + + copy + + + + + org.glassfish.jersey.examples + bean-validation-webapp + 2.25.1 + war + true + ** + ${project.build.directory} + + + + + + + + + + + diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/config/jetty.xml b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/config/jetty.xml new file mode 100644 index 00000000000..c38bcced0e1 --- /dev/null +++ b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/config/jetty.xml @@ -0,0 +1,40 @@ + + + + + + https + + 32768 + 8192 + 8192 + 512 + + + + + + + + + + + + + + + + + + + + + + + + 0 + 30000 + + + + diff --git a/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/test/java/org/eclipse/jetty/its/jetty_run_war_mojo_it/TestGetContent.java b/jetty-maven-plugin/src/it/jetty-deploy-war-mojo-it/src/test/java/org/eclipse/jetty/its/jetty_run_war_mojo_it/TestGetContent.java new file mode 100644 index 00000000000..bc20fef11b7 --- /dev/null +++ b/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; + } + +} diff --git a/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/TestHelloServlet.java b/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 similarity index 97% rename from 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/TestHelloServlet.java rename to 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 index 5c9873dd9f6..09cf12de869 100644 --- a/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/TestHelloServlet.java +++ b/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(); diff --git a/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/TestHelloServlet.java b/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 similarity index 97% rename from 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/TestHelloServlet.java rename to 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 index 54529685394..a0da6ee489c 100644 --- a/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/TestHelloServlet.java +++ b/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 { diff --git a/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/TestHelloServlet.java b/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 similarity index 94% rename from 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/TestHelloServlet.java rename to 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 index 2a967dc81f0..a0da6ee489c 100644 --- a/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/TestHelloServlet.java +++ b/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_war_mojo_it; +package org.eclipse.jetty.its.jetty_run_forked_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 { @@ -86,8 +88,7 @@ public class TestHelloServlet else Thread.currentThread().sleep(100); } - } + } return port; } - } diff --git a/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 b/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 deleted file mode 100644 index d6ffda24671..00000000000 --- a/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 +++ /dev/null @@ -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; - } -} diff --git a/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/TestHelloServlet.java b/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 similarity index 94% rename from 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/TestHelloServlet.java rename to 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 index 16426c494ab..a0da6ee489c 100644 --- a/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/TestHelloServlet.java +++ b/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_war_exploded_mojo_it; +package org.eclipse.jetty.its.jetty_run_forked_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 { @@ -86,8 +88,7 @@ public class TestHelloServlet else Thread.currentThread().sleep(100); } - } + } return port; } - } diff --git a/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 b/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 new file mode 100644 index 00000000000..a0da6ee489c --- /dev/null +++ b/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; + } +} diff --git a/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 b/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 new file mode 100644 index 00000000000..a0da6ee489c --- /dev/null +++ b/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; + } +} diff --git a/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 b/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 deleted file mode 100644 index c02bf727000..00000000000 --- a/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 +++ /dev/null @@ -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; - } - -} diff --git a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerConnectorListener.java b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerConnectorListener.java index dc67466f5d7..10bd2603a61 100644 --- a/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerConnectorListener.java +++ b/jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/ServerConnectorListener.java @@ -40,7 +40,7 @@ public class ServerConnectorListener extends AbstractLifeCycleListener private String _fileName; private String _sysPropertyName; - + /** * @see org.eclipse.jetty.util.component.AbstractLifeCycle.AbstractLifeCycleListener#lifeCycleStarted(org.eclipse.jetty.util.component.LifeCycle) @@ -91,7 +91,7 @@ public class ServerConnectorListener extends AbstractLifeCycleListener */ public void setFileName(String name) { - + _fileName = name; } diff --git a/pom.xml b/pom.xml index bc5745118d0..497c9e5088c 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,9 @@ 1.20 benchmarks 2.21.0 + + 3.5 + 3.5.0 @@ -626,7 +629,7 @@ org.jacoco jacoco-maven-plugin - 0.8.0 + 0.8.1 com.agilejava.docbkx @@ -952,12 +955,34 @@ 1.2 provided - + org.apache.maven - maven-plugin-tools-api - 2.0 + maven-plugin-api + ${mavenVersion} + + org.apache.maven + maven-artifact + ${mavenVersion} + + + org.apache.maven + maven-core + ${mavenVersion} + + + org.apache.maven.plugin-tools + maven-plugin-tools-api + ${mavenPluginToolsVersion} + + + org.apache.maven.plugin-tools + maven-plugin-annotations + ${mavenPluginToolsVersion} + provided + + org.eclipse.jetty.toolchain jetty-test-helper @@ -1007,51 +1032,6 @@ - - - jdk10 - - 10 - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.1-SNAPSHOT - - false - - - - - - - - oss.snapshots - OSS Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - apache.snapshots - https://repository.apache.org/content/repositories/snapshots - - false - - - true - - - - jdk11 @@ -1064,7 +1044,7 @@ org.jacoco jacoco-maven-plugin - 0.8.1-SNAPSHOT + 0.8.2-SNAPSHOT true