From 16d14f90bb9cb2220e1ebdd97361705f816a8c73 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Fri, 7 Jul 2017 16:28:56 -0700 Subject: [PATCH 01/21] Adding test for bad URI query parsing during request.getParameterMap() --- .../org/eclipse/jetty/server/RequestTest.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java index 95ab4110069..39a617c9cd7 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java @@ -148,6 +148,32 @@ public class RequestTest assertTrue(responses.startsWith("HTTP/1.1 200")); } + @Test + public void testParamExtraction_BadSequence() throws Exception + { + _handler._checker = new RequestTester() + { + @Override + public boolean check(HttpServletRequest request,HttpServletResponse response) + { + Map map = request.getParameterMap(); + // should have thrown a BadMessageException + return false; + } + }; + + //Send a request with query string with illegal hex code to cause + //an exception parsing the params + String request="GET /?test_%e0%x8%81=missing HTTP/1.1\r\n"+ + "Host: whatever\r\n"+ + "Content-Type: text/html;charset=utf8\n"+ + "Connection: close\n"+ + "\n"; + + String responses=_connector.getResponses(request); + assertThat("Responses", responses, startsWith("HTTP/1.1 400")); + } + @Test public void testEmptyHeaders() throws Exception { From 12874baaa8e54e856b9f74835e18dfeb8c2d30eb Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 18 Sep 2017 14:15:46 -0700 Subject: [PATCH 02/21] Fixing jetty-bom references for Jetty 9.3.x --- jetty-bom/pom.xml | 72 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 94cc7ca6961..de161031497 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -103,22 +103,22 @@ org.eclipse.jetty cdi-core - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty cdi-full-servlet - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty cdi-servlet - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty cdi-websocket - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty @@ -130,21 +130,61 @@ jetty-continuation 9.3.22-SNAPSHOT + + org.eclipse.jetty.fcgi + fcgi-server + 9.3.22-SNAPSHOT + + + org.eclipse.jetty.fcgi + fcgi-server + 9.3.22-SNAPSHOT + org.eclipse.jetty jetty-gcloud-memcached-session-manager - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-gcloud-session-manager - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT + + + org.eclipse.jetty + jetty-hazelcast + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-http 9.3.22-SNAPSHOT + + org.eclipse.jetty.http2 + http2-client + 9.3.22-SNAPSHOT + + + org.eclipse.jetty.http2 + http2-common + 9.3.22-SNAPSHOT + + + org.eclipse.jetty.http2 + http2-hpack + 9.3.22-SNAPSHOT + + + org.eclipse.jetty.http2 + http2-http-client-transport + 9.3.22-SNAPSHOT + + + org.eclipse.jetty.http2 + http2-server + 9.3.22-SNAPSHOT + org.eclipse.jetty jetty-http-spi @@ -193,17 +233,17 @@ org.eclipse.jetty jetty-osgi-boot - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-osgi-boot-jsp - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-osgi-boot-warurl - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty @@ -268,37 +308,37 @@ org.eclipse.jetty javax-websocket-client-impl - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-server-impl - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-api - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-client - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-common - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-server - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-servlet - 9.3.20-SNAPSHOT + 9.3.22-SNAPSHOT org.eclipse.jetty From 6fb0eb5c9d222b91a8dacf2b2c04e4c51e921184 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 18 Sep 2017 14:18:21 -0700 Subject: [PATCH 03/21] Toolchain version updates --- pom.xml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f0396ea6321..4d51fdd41e3 100644 --- a/pom.xml +++ b/pom.xml @@ -496,7 +496,7 @@ org.eclipse.jetty.toolchain jetty-version-maven-plugin - 2.4 + 2.5 org.apache.felix @@ -717,7 +717,7 @@ org.eclipse.jetty.toolchain jetty-test-helper - 4.0 + 4.2 org.eclipse.jetty.toolchain @@ -827,6 +827,20 @@ true false true + Tag for release: jetty-${project.version} + + jetty-documentation/.* + examples/.* + aggregates/.* + .*/test-.* + .*/.*-test/.* + .*/.*-tests/.* + .*/src/test/.* + \.git.* + .*\.md$ + .*\.txt$ + Jenkinsfile + From e838eced95fc350e95e65d5dda229f2d86adcc23 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 18 Sep 2017 14:20:19 -0700 Subject: [PATCH 04/21] Removing M0 release details --- VERSION.txt | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index cfb03ab486e..7f03e3f73e1 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,18 +1,5 @@ jetty-9.3.22-SNAPSHOT -jetty-9.3.21.M0 - 01 August 2017 - + 1357 RolloverFileOutputStream: No rollout performed at midnight - + 1469 RolloverFileOutputStream: IllegalStateException Task already scheduled - + 1507 RolloverFileOutputStream: Negative delay Timer.schedule exception - + 1513 RolloverFileOutputStream: can't handle multiple instances - + 1655 Improve extensibility of ServerConnector - + 1661 AbstractProxyServlet onProxyResponseFailure Error - + 1664 IPAccessHandler CIDR IP range check is incorrect - + 1685 Update ALPN support for Java 8u141 - + 1687 HTTP2: Correcting missing callback notification when channel not found - + 1702 Update ALPN support for Java 8u144 - + 1703 Improve HttpInput failure logging - jetty-9.3.20.v20170531 - 31 May 2017 + 523 TLS close behaviour breaking session resumption + 1108 Please improve logging in SslContextFactory when there are no approved From 15bd75f858955ce088b3f4971527e6c828a19f16 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 18 Sep 2017 14:24:36 -0700 Subject: [PATCH 05/21] Updating to version 9.3.21.v20170918 --- VERSION.txt | 26 ++++- aggregates/jetty-all-compact3/pom.xml | 2 +- aggregates/jetty-all/pom.xml | 2 +- apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- examples/async-rest/async-rest-jar/pom.xml | 2 +- examples/async-rest/async-rest-webapp/pom.xml | 2 +- examples/async-rest/pom.xml | 2 +- examples/embedded/pom.xml | 2 +- examples/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 102 +++++++++--------- jetty-cdi/cdi-core/pom.xml | 2 +- jetty-cdi/cdi-full-servlet/pom.xml | 2 +- jetty-cdi/cdi-servlet/pom.xml | 2 +- jetty-cdi/cdi-websocket/pom.xml | 2 +- jetty-cdi/pom.xml | 2 +- jetty-cdi/test-cdi-webapp/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-documentation/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-alpn-tests/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- jetty-monitor/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-spring/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- .../javax-websocket-client-impl/pom.xml | 2 +- .../javax-websocket-server-impl/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-api/pom.xml | 2 +- jetty-websocket/websocket-client/pom.xml | 2 +- jetty-websocket/websocket-common/pom.xml | 2 +- jetty-websocket/websocket-server/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-continuation/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-gcloud-memcached-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-sessions/test-hash-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- tests/test-webapps/test-jaas-webapp/pom.xml | 2 +- tests/test-webapps/test-jetty-webapp/pom.xml | 2 +- tests/test-webapps/test-jndi-webapp/pom.xml | 2 +- .../test-webapps/test-mock-resources/pom.xml | 2 +- tests/test-webapps/test-proxy-webapp/pom.xml | 2 +- tests/test-webapps/test-servlet-spec/pom.xml | 2 +- .../test-container-initializer/pom.xml | 2 +- .../test-spec-webapp/pom.xml | 2 +- .../test-web-fragment/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 117 files changed, 191 insertions(+), 167 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 7f03e3f73e1..7a87828b946 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,4 +1,28 @@ -jetty-9.3.22-SNAPSHOT +jetty-9.3.21.v20170918 - 18 September 2017 + + 487 JDK 9 build compatibility + + 1116 Support empty HTTP header values + + 1357 RolloverFileOutputStream: No rollout performed at midnight + + 1469 RolloverFileOutputStream: IllegalStateException Task already scheduled + + 1507 RolloverFileOutputStream: Negative delay Timer.schedule exception + + 1513 RolloverFileOutputStream: can't handle multiple instances + + 1515 Improved RollOverFileOutputStream removeOldFiles() behavior + + 1556 Remove a timing channel in Password matching + + 1590 Improve RolloverFileOutputStream functionality with multiple TimeZones + + 1655 Improve extensibility of ServerConnector + + 1661 AbstractProxyServlet onProxyResponseFailure Error + + 1664 IPAccessHandler CIDR IP range check is incorrect + + 1685 Update ALPN support for Java 8u141 + + 1687 HTTP2: Correcting missing callback notification when channel not found + + 1702 Update ALPN support for Java 8u144 + + 1703 Improve HttpInput failure logging + + 1719 HTTP/2: Improve handling of queued requests + + 1741 Java 9 javadoc failure in build + + 1749 Dump HttpDestination exchange queue + + 1750 PoolingHttpDestination creates ConnectionPool twice + + 1759 HTTP/2: producer can block in onReset + + 1790 HTTP/2: 100% CPU usage seen during close/shutdown of endpoint + + 475546 ClosedChannelException when connection to HTTPS over HTTP proxy + with CONNECT jetty-9.3.20.v20170531 - 31 May 2017 + 523 TLS close behaviour breaking session resumption diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 8bdc308365e..95bfa1cdf48 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../../pom.xml 4.0.0 diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 7a5a2f0e7ee..6fe016933bd 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../../pom.xml 4.0.0 diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index fceba850861..df581e29b92 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 apache-jsp diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index bc8b6cff3df..d8c595b5db0 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 apache-jstl diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index f3d0c627aef..5d89e5fcd4c 100644 --- a/examples/async-rest/async-rest-jar/pom.xml +++ b/examples/async-rest/async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty example-async-rest - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index a846370ada8..51068ff7b88 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/examples/async-rest/async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty example-async-rest - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index 5c76391bf8b..2b967a6ccd3 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index ff1ddbb63ce..82707205998 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index 9ecdb2d4212..f246c596d2c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml org.eclipse.jetty.examples diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index 5398ffda09b..ad07762a0d7 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 44ecdae949e..13081b54bc0 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 5212730eef8..06c7cf5094e 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -5,7 +5,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index 85a76efa760..f6cc6680c71 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 72657c8b1c4..756888b7a21 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index eb408bae293..d6099d845a8 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index ab46158e0ef..f15b96fc980 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index de161031497..8c53befad58 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -6,7 +6,7 @@ 4.0.0 jetty-bom - 9.3.22-SNAPSHOT + 9.3.21.v20170918 Jetty :: Bom Jetty BOM artifact http://www.eclipse.org/jetty @@ -98,252 +98,252 @@ org.eclipse.jetty jetty-annotations - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty cdi-core - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty cdi-full-servlet - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty cdi-servlet - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty cdi-websocket - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-client - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-continuation - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty.fcgi fcgi-server - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty.fcgi fcgi-server - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-gcloud-memcached-session-manager - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-gcloud-session-manager - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-hazelcast - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-http - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty.http2 http2-client - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty.http2 http2-common - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty.http2 http2-hpack - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty.http2 http2-http-client-transport - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty.http2 http2-server - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-http-spi - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-infinispan - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-io - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-jaas - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-jaspi - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-jmx - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-jndi - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-monitor - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-nosql - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-osgi-boot - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-osgi-boot-jsp - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-osgi-boot-warurl - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-plus - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-proxy - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-quickstart - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-rewrite - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-security - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-server - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-servlet - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-servlets - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-spring - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-util - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-util-ajax - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-webapp - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty javax-websocket-client-impl - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty javax-websocket-server-impl - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty javax-websocket-api - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty javax-websocket-client - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty javax-websocket-common - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty javax-websocket-server - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty javax-websocket-servlet - 9.3.22-SNAPSHOT + 9.3.21.v20170918 org.eclipse.jetty jetty-xml - 9.3.22-SNAPSHOT + 9.3.21.v20170918 diff --git a/jetty-cdi/cdi-core/pom.xml b/jetty-cdi/cdi-core/pom.xml index 8223d912704..a61484715de 100644 --- a/jetty-cdi/cdi-core/pom.xml +++ b/jetty-cdi/cdi-core/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 cdi-core diff --git a/jetty-cdi/cdi-full-servlet/pom.xml b/jetty-cdi/cdi-full-servlet/pom.xml index d2f8af39559..d95e3d8a9d1 100644 --- a/jetty-cdi/cdi-full-servlet/pom.xml +++ b/jetty-cdi/cdi-full-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 cdi-full-servlet diff --git a/jetty-cdi/cdi-servlet/pom.xml b/jetty-cdi/cdi-servlet/pom.xml index fa9318343d2..58cf26092e0 100644 --- a/jetty-cdi/cdi-servlet/pom.xml +++ b/jetty-cdi/cdi-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 cdi-servlet diff --git a/jetty-cdi/cdi-websocket/pom.xml b/jetty-cdi/cdi-websocket/pom.xml index 2c8d1a27194..beb7d702ab4 100644 --- a/jetty-cdi/cdi-websocket/pom.xml +++ b/jetty-cdi/cdi-websocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 cdi-websocket diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 63f8d63b907..14e70ccf9ea 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 org.eclipse.jetty.cdi diff --git a/jetty-cdi/test-cdi-webapp/pom.xml b/jetty-cdi/test-cdi-webapp/pom.xml index 7d5ef0a6310..5243432b418 100644 --- a/jetty-cdi/test-cdi-webapp/pom.xml +++ b/jetty-cdi/test-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 test-cdi-webapp diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index bdc59985acd..00acfcfed5a 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index d6108e08885..dfe1a498377 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index b3be1a2103e..b7fe7f22963 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index b659b6197ee..2e5b07ab996 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-distribution diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index 945d963d590..19df91fe1aa 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 jetty-documentation Jetty :: Documentation diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index fea61c888dc..4f9afa4d4eb 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 97c3e709d9e..721348f824e 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 01ec07b5cee..7ed47c1e9ee 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml index 48874dbec74..df6ca0a80d8 100644 --- a/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index 4ddce9927f1..d6e312413f0 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index 24304c583f2..f10d75edba3 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index 4703bc42ef4..eff2788ec2b 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-hazelcast diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index db2cb2e3b62..fbccec79d6e 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index 7aa372e4eb2..c7de2ef388d 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-http diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index 1be1305436e..2658b18e7e1 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index be5a124dcda..4c1baf92bc1 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 807be9f9c01..274cd3bb2a6 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index dee94dc73dd..229c96bccf1 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 23bcefe196e..96fd5083b65 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 81c805ddcd1..6791a35bb4e 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index bedc2ace4c6..fd9a4c04c0b 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index cd3b48da395..86000690d72 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-infinispan diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index a86ebb2b575..1fcbdded429 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 7f8822216a9..58beb1d75fc 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index db03fafa835..e54f4288116 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 9d54b973625..17724f56ad1 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 2460d9f7619..83bb81102c2 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-jndi diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index c2944624d9d..8b8220be690 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index e321498b043..dc4af8fa05c 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-maven-plugin diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index 155426d542c..ac77a0e0e99 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-monitor diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 6f5e3c30432..7e3038caf1d 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 4577a75e919..6c1140e3bb5 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-osgi-alpn diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 547741cbc12..8147a1fee55 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-osgi-boot-jsp diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 0952f2a7e4d..3b73f43b4cb 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 1973bdd1117..8634f3c16b7 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-osgi-boot diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 30c16371908..4b10260f972 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 82ad0198cb0..702c953f54b 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index 4822e7590a1..a4eb8aaeca0 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index b41ad9c266c..af3286de690 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index ec24c86f150..c0a89d670f7 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index 3b75d064e90..a0da0e9f1cb 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 9b73bcc14a2..7865c630197 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index bd2cfa647e4..7e64bf005a6 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-proxy diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 0d88e664956..30ed85e4e00 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 org.eclipse.jetty diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index 38fe593b42f..c0978a4b89c 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index 7ed0b93c151..f79c00813ba 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index 2cacece608f..e73fdcba052 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index 908e64b76db..f29acf3d451 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index 8a009b62a28..a48d269082f 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 141e3581a9b..9fefd1a50af 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-servlets diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index 7927383f2bd..f814c8edc25 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index e7ee42a9751..5b794c268ef 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-start diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 999719f36df..5c50226c607 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 8340023f99c..9ef634409dc 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 4ecce31c25b..1269d301515 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-webapp diff --git a/jetty-websocket/javax-websocket-client-impl/pom.xml b/jetty-websocket/javax-websocket-client-impl/pom.xml index 3057b25afdb..5a80f10239a 100644 --- a/jetty-websocket/javax-websocket-client-impl/pom.xml +++ b/jetty-websocket/javax-websocket-client-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml index 7dfb41ba0e7..f379fd2c3cd 100644 --- a/jetty-websocket/javax-websocket-server-impl/pom.xml +++ b/jetty-websocket/javax-websocket-server-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index 46a430c78a4..f37bb09aa7d 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 7bd404a5262..3e7303e79d7 100644 --- a/jetty-websocket/websocket-api/pom.xml +++ b/jetty-websocket/websocket-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index c1c497edb58..1ee31553dac 100644 --- a/jetty-websocket/websocket-client/pom.xml +++ b/jetty-websocket/websocket-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 4d722fd9961..99339992b7a 100644 --- a/jetty-websocket/websocket-common/pom.xml +++ b/jetty-websocket/websocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index 05c81ac2940..4ccc4107ee4 100644 --- a/jetty-websocket/websocket-server/pom.xml +++ b/jetty-websocket/websocket-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 95276a10d31..90d594d320f 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index e6eda86e395..a3733565946 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 4d51fdd41e3..6637865bd1d 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 Jetty :: Project http://www.eclipse.org/jetty pom diff --git a/tests/pom.xml b/tests/pom.xml index eb1075851bb..f7c5ad723e2 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index e41307ee740..8d724e65754 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index 9d7bf7ad266..cc5d9ea32f5 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 77f9c074a1c..2b41c4ecec6 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index b5ea092472d..e8d8cea070c 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index bd29b827d27..ef2bd5cdab6 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index f52a19b1954..5dccd23f97b 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 4.0.0 test-jmx-parent diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index d1257d0375c..58f6b02206d 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index 187757463d7..fd01607a097 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 3ac3ebb5e7a..85f5ff10f76 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml b/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml index 56970bb5430..fb234991e03 100644 --- a/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-gcloud-memcached-sessions Jetty Tests :: Sessions :: GCloud with Memcached diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index 9d4b23f19bf..d71aa7d3641 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index 83599a4b134..a13e0c0db3b 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-hash-sessions Jetty Tests :: Sessions :: Hash diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index 7650aee522b..a587981f793 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 26b6559f9ec..07038647bb0 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index 143d22eeff9..cba5d93e268 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index b4d045bc425..326e5079e11 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index 135b3c10a06..ced574ae95c 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml index 9011dd260be..c9840f0ce39 100644 --- a/tests/test-webapps/test-jaas-webapp/pom.xml +++ b/tests/test-webapps/test-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-jaas-webapp Jetty Tests :: WebApp :: JAAS diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index d425bf3afaf..9a25b51ed76 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml index 98b834d5afd..ea79afc4f8d 100644 --- a/tests/test-webapps/test-jndi-webapp/pom.xml +++ b/tests/test-webapps/test-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-jndi-webapp Jetty Tests :: WebApp :: JNDI diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml index ded8fe8821b..4b1e754df46 100644 --- a/tests/test-webapps/test-mock-resources/pom.xml +++ b/tests/test-webapps/test-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 Jetty Tests :: WebApp :: Mock Resources test-mock-resources diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index 19ed9bd9696..6548b80ccaa 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 ../pom.xml 4.0.0 diff --git a/tests/test-webapps/test-servlet-spec/pom.xml b/tests/test-webapps/test-servlet-spec/pom.xml index 12247309e6c..1371a020aae 100644 --- a/tests/test-webapps/test-servlet-spec/pom.xml +++ b/tests/test-webapps/test-servlet-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-servlet-spec-parent Jetty Tests :: Spec Test WebApp :: Parent diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml index 3838d070d5f..055dd3c2d5a 100644 --- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-servlet-spec-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-container-initializer jar diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml index e3af5cc5a69..98cba4308a8 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-servlet-spec-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 Jetty Tests :: Webapps :: Spec Webapp test-spec-webapp diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml index e538df58e73..9699526c1c7 100644 --- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-servlet-spec-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 862a3b761c6..4da3b3cc56d 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.22-SNAPSHOT + 9.3.21.v20170918 test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 17e11a7e7de308ffdbd41506a0dbbac66abe1d3f Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 18 Sep 2017 15:04:47 -0700 Subject: [PATCH 06/21] Updating to version 9.3.22-SNAPSHOT --- VERSION.txt | 2 + aggregates/jetty-all-compact3/pom.xml | 2 +- aggregates/jetty-all/pom.xml | 2 +- apache-jsp/pom.xml | 2 +- apache-jstl/pom.xml | 2 +- examples/async-rest/async-rest-jar/pom.xml | 2 +- examples/async-rest/async-rest-webapp/pom.xml | 2 +- examples/async-rest/pom.xml | 2 +- examples/embedded/pom.xml | 2 +- examples/pom.xml | 2 +- jetty-alpn/jetty-alpn-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-client/pom.xml | 2 +- jetty-alpn/jetty-alpn-java-server/pom.xml | 2 +- jetty-alpn/jetty-alpn-server/pom.xml | 2 +- jetty-alpn/pom.xml | 2 +- jetty-annotations/pom.xml | 2 +- jetty-ant/pom.xml | 2 +- jetty-bom/pom.xml | 102 +++++++++--------- jetty-cdi/cdi-core/pom.xml | 2 +- jetty-cdi/cdi-full-servlet/pom.xml | 2 +- jetty-cdi/cdi-servlet/pom.xml | 2 +- jetty-cdi/cdi-websocket/pom.xml | 2 +- jetty-cdi/pom.xml | 2 +- jetty-cdi/test-cdi-webapp/pom.xml | 2 +- jetty-client/pom.xml | 2 +- jetty-continuation/pom.xml | 2 +- jetty-deploy/pom.xml | 2 +- jetty-distribution/pom.xml | 2 +- jetty-documentation/pom.xml | 2 +- jetty-fcgi/fcgi-client/pom.xml | 2 +- jetty-fcgi/fcgi-server/pom.xml | 2 +- jetty-fcgi/pom.xml | 2 +- .../pom.xml | 2 +- .../jetty-gcloud-session-manager/pom.xml | 2 +- jetty-gcloud/pom.xml | 2 +- jetty-hazelcast/pom.xml | 2 +- jetty-http-spi/pom.xml | 2 +- jetty-http/pom.xml | 2 +- jetty-http2/http2-alpn-tests/pom.xml | 2 +- jetty-http2/http2-client/pom.xml | 2 +- jetty-http2/http2-common/pom.xml | 2 +- jetty-http2/http2-hpack/pom.xml | 2 +- .../http2-http-client-transport/pom.xml | 2 +- jetty-http2/http2-server/pom.xml | 2 +- jetty-http2/pom.xml | 2 +- jetty-infinispan/pom.xml | 2 +- jetty-io/pom.xml | 2 +- jetty-jaas/pom.xml | 2 +- jetty-jaspi/pom.xml | 2 +- jetty-jmx/pom.xml | 2 +- jetty-jndi/pom.xml | 2 +- jetty-jspc-maven-plugin/pom.xml | 2 +- jetty-maven-plugin/pom.xml | 2 +- jetty-monitor/pom.xml | 2 +- jetty-nosql/pom.xml | 2 +- jetty-osgi/jetty-osgi-alpn/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-jsp/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot-warurl/pom.xml | 2 +- jetty-osgi/jetty-osgi-boot/pom.xml | 2 +- jetty-osgi/jetty-osgi-httpservice/pom.xml | 2 +- jetty-osgi/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-context/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-fragment/pom.xml | 2 +- jetty-osgi/test-jetty-osgi-webapp/pom.xml | 2 +- jetty-osgi/test-jetty-osgi/pom.xml | 2 +- jetty-plus/pom.xml | 2 +- jetty-proxy/pom.xml | 2 +- jetty-quickstart/pom.xml | 2 +- jetty-rewrite/pom.xml | 2 +- jetty-runner/pom.xml | 2 +- jetty-security/pom.xml | 2 +- jetty-server/pom.xml | 2 +- jetty-servlet/pom.xml | 2 +- jetty-servlets/pom.xml | 2 +- jetty-spring/pom.xml | 2 +- jetty-start/pom.xml | 2 +- jetty-util-ajax/pom.xml | 2 +- jetty-util/pom.xml | 2 +- jetty-webapp/pom.xml | 2 +- .../javax-websocket-client-impl/pom.xml | 2 +- .../javax-websocket-server-impl/pom.xml | 2 +- jetty-websocket/pom.xml | 2 +- jetty-websocket/websocket-api/pom.xml | 2 +- jetty-websocket/websocket-client/pom.xml | 2 +- jetty-websocket/websocket-common/pom.xml | 2 +- jetty-websocket/websocket-server/pom.xml | 2 +- jetty-websocket/websocket-servlet/pom.xml | 2 +- jetty-xml/pom.xml | 2 +- pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-continuation/pom.xml | 2 +- tests/test-http-client-transport/pom.xml | 2 +- tests/test-integration/pom.xml | 2 +- tests/test-jmx/jmx-webapp-it/pom.xml | 2 +- tests/test-jmx/jmx-webapp/pom.xml | 2 +- tests/test-jmx/pom.xml | 2 +- tests/test-loginservice/pom.xml | 2 +- tests/test-quickstart/pom.xml | 2 +- tests/test-sessions/pom.xml | 2 +- .../test-gcloud-memcached-sessions/pom.xml | 2 +- .../test-gcloud-sessions/pom.xml | 2 +- .../test-sessions/test-hash-sessions/pom.xml | 2 +- .../test-infinispan-sessions/pom.xml | 2 +- .../test-sessions/test-jdbc-sessions/pom.xml | 2 +- .../test-mongodb-sessions/pom.xml | 2 +- .../test-sessions-common/pom.xml | 2 +- tests/test-webapps/pom.xml | 2 +- tests/test-webapps/test-jaas-webapp/pom.xml | 2 +- tests/test-webapps/test-jetty-webapp/pom.xml | 2 +- tests/test-webapps/test-jndi-webapp/pom.xml | 2 +- .../test-webapps/test-mock-resources/pom.xml | 2 +- tests/test-webapps/test-proxy-webapp/pom.xml | 2 +- tests/test-webapps/test-servlet-spec/pom.xml | 2 +- .../test-container-initializer/pom.xml | 2 +- .../test-spec-webapp/pom.xml | 2 +- .../test-web-fragment/pom.xml | 2 +- .../test-webapps/test-webapp-rfc2616/pom.xml | 2 +- 117 files changed, 168 insertions(+), 166 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 7a87828b946..e7a93b0d16c 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,3 +1,5 @@ +jetty-9.3.22-SNAPSHOT + jetty-9.3.21.v20170918 - 18 September 2017 + 487 JDK 9 build compatibility + 1116 Support empty HTTP header values diff --git a/aggregates/jetty-all-compact3/pom.xml b/aggregates/jetty-all-compact3/pom.xml index 95bfa1cdf48..8bdc308365e 100644 --- a/aggregates/jetty-all-compact3/pom.xml +++ b/aggregates/jetty-all-compact3/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/aggregates/jetty-all/pom.xml b/aggregates/jetty-all/pom.xml index 6fe016933bd..7a5a2f0e7ee 100644 --- a/aggregates/jetty-all/pom.xml +++ b/aggregates/jetty-all/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml index df581e29b92..fceba850861 100644 --- a/apache-jsp/pom.xml +++ b/apache-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 apache-jsp diff --git a/apache-jstl/pom.xml b/apache-jstl/pom.xml index d8c595b5db0..bc8b6cff3df 100644 --- a/apache-jstl/pom.xml +++ b/apache-jstl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 apache-jstl diff --git a/examples/async-rest/async-rest-jar/pom.xml b/examples/async-rest/async-rest-jar/pom.xml index 5d89e5fcd4c..f3d0c627aef 100644 --- a/examples/async-rest/async-rest-jar/pom.xml +++ b/examples/async-rest/async-rest-jar/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty example-async-rest - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/examples/async-rest/async-rest-webapp/pom.xml b/examples/async-rest/async-rest-webapp/pom.xml index 51068ff7b88..a846370ada8 100644 --- a/examples/async-rest/async-rest-webapp/pom.xml +++ b/examples/async-rest/async-rest-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty example-async-rest - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 org.eclipse.jetty.example-async-rest diff --git a/examples/async-rest/pom.xml b/examples/async-rest/pom.xml index 2b967a6ccd3..5c76391bf8b 100644 --- a/examples/async-rest/pom.xml +++ b/examples/async-rest/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/embedded/pom.xml b/examples/embedded/pom.xml index 82707205998..ff1ddbb63ce 100644 --- a/examples/embedded/pom.xml +++ b/examples/embedded/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.examples examples-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/examples/pom.xml b/examples/pom.xml index f246c596d2c..9ecdb2d4212 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml org.eclipse.jetty.examples diff --git a/jetty-alpn/jetty-alpn-client/pom.xml b/jetty-alpn/jetty-alpn-client/pom.xml index ad07762a0d7..5398ffda09b 100644 --- a/jetty-alpn/jetty-alpn-client/pom.xml +++ b/jetty-alpn/jetty-alpn-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-alpn-client diff --git a/jetty-alpn/jetty-alpn-java-client/pom.xml b/jetty-alpn/jetty-alpn-java-client/pom.xml index 13081b54bc0..44ecdae949e 100644 --- a/jetty-alpn/jetty-alpn-java-client/pom.xml +++ b/jetty-alpn/jetty-alpn-java-client/pom.xml @@ -6,7 +6,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-java-server/pom.xml b/jetty-alpn/jetty-alpn-java-server/pom.xml index 06c7cf5094e..5212730eef8 100644 --- a/jetty-alpn/jetty-alpn-java-server/pom.xml +++ b/jetty-alpn/jetty-alpn-java-server/pom.xml @@ -5,7 +5,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-alpn/jetty-alpn-server/pom.xml b/jetty-alpn/jetty-alpn-server/pom.xml index f6cc6680c71..85a76efa760 100644 --- a/jetty-alpn/jetty-alpn-server/pom.xml +++ b/jetty-alpn/jetty-alpn-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-alpn-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-alpn-server diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 756888b7a21..72657c8b1c4 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-alpn-parent diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml index d6099d845a8..eb408bae293 100644 --- a/jetty-annotations/pom.xml +++ b/jetty-annotations/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-annotations diff --git a/jetty-ant/pom.xml b/jetty-ant/pom.xml index f15b96fc980..ab46158e0ef 100644 --- a/jetty-ant/pom.xml +++ b/jetty-ant/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-ant diff --git a/jetty-bom/pom.xml b/jetty-bom/pom.xml index 8c53befad58..de161031497 100644 --- a/jetty-bom/pom.xml +++ b/jetty-bom/pom.xml @@ -6,7 +6,7 @@ 4.0.0 jetty-bom - 9.3.21.v20170918 + 9.3.22-SNAPSHOT Jetty :: Bom Jetty BOM artifact http://www.eclipse.org/jetty @@ -98,252 +98,252 @@ org.eclipse.jetty jetty-annotations - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty cdi-core - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty cdi-full-servlet - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty cdi-servlet - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty cdi-websocket - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-client - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-continuation - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty.fcgi fcgi-server - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty.fcgi fcgi-server - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-gcloud-memcached-session-manager - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-gcloud-session-manager - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-hazelcast - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-http - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty.http2 http2-client - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty.http2 http2-common - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty.http2 http2-hpack - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty.http2 http2-http-client-transport - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty.http2 http2-server - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-http-spi - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-infinispan - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-io - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-jaas - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-jaspi - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-jmx - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-jndi - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-monitor - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-nosql - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-osgi-boot - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-osgi-boot-jsp - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-osgi-boot-warurl - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-plus - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-proxy - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-quickstart - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-rewrite - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-security - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-server - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-servlet - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-servlets - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-spring - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-util - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-util-ajax - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-webapp - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-client-impl - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-server-impl - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-api - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-client - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-common - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-server - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty javax-websocket-servlet - 9.3.21.v20170918 + 9.3.22-SNAPSHOT org.eclipse.jetty jetty-xml - 9.3.21.v20170918 + 9.3.22-SNAPSHOT diff --git a/jetty-cdi/cdi-core/pom.xml b/jetty-cdi/cdi-core/pom.xml index a61484715de..8223d912704 100644 --- a/jetty-cdi/cdi-core/pom.xml +++ b/jetty-cdi/cdi-core/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 cdi-core diff --git a/jetty-cdi/cdi-full-servlet/pom.xml b/jetty-cdi/cdi-full-servlet/pom.xml index d95e3d8a9d1..d2f8af39559 100644 --- a/jetty-cdi/cdi-full-servlet/pom.xml +++ b/jetty-cdi/cdi-full-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 cdi-full-servlet diff --git a/jetty-cdi/cdi-servlet/pom.xml b/jetty-cdi/cdi-servlet/pom.xml index 58cf26092e0..fa9318343d2 100644 --- a/jetty-cdi/cdi-servlet/pom.xml +++ b/jetty-cdi/cdi-servlet/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 cdi-servlet diff --git a/jetty-cdi/cdi-websocket/pom.xml b/jetty-cdi/cdi-websocket/pom.xml index beb7d702ab4..2c8d1a27194 100644 --- a/jetty-cdi/cdi-websocket/pom.xml +++ b/jetty-cdi/cdi-websocket/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 cdi-websocket diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml index 14e70ccf9ea..63f8d63b907 100644 --- a/jetty-cdi/pom.xml +++ b/jetty-cdi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 org.eclipse.jetty.cdi diff --git a/jetty-cdi/test-cdi-webapp/pom.xml b/jetty-cdi/test-cdi-webapp/pom.xml index 5243432b418..7d5ef0a6310 100644 --- a/jetty-cdi/test-cdi-webapp/pom.xml +++ b/jetty-cdi/test-cdi-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.cdi jetty-cdi-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 test-cdi-webapp diff --git a/jetty-client/pom.xml b/jetty-client/pom.xml index 00acfcfed5a..bdc59985acd 100644 --- a/jetty-client/pom.xml +++ b/jetty-client/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-continuation/pom.xml b/jetty-continuation/pom.xml index dfe1a498377..d6108e08885 100644 --- a/jetty-continuation/pom.xml +++ b/jetty-continuation/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-continuation diff --git a/jetty-deploy/pom.xml b/jetty-deploy/pom.xml index b7fe7f22963..b3be1a2103e 100644 --- a/jetty-deploy/pom.xml +++ b/jetty-deploy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-deploy diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml index 2e5b07ab996..b659b6197ee 100644 --- a/jetty-distribution/pom.xml +++ b/jetty-distribution/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-distribution diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml index 19df91fe1aa..945d963d590 100644 --- a/jetty-documentation/pom.xml +++ b/jetty-documentation/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT jetty-documentation Jetty :: Documentation diff --git a/jetty-fcgi/fcgi-client/pom.xml b/jetty-fcgi/fcgi-client/pom.xml index 4f9afa4d4eb..fea61c888dc 100644 --- a/jetty-fcgi/fcgi-client/pom.xml +++ b/jetty-fcgi/fcgi-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/fcgi-server/pom.xml b/jetty-fcgi/fcgi-server/pom.xml index 721348f824e..97c3e709d9e 100644 --- a/jetty-fcgi/fcgi-server/pom.xml +++ b/jetty-fcgi/fcgi-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.fcgi fcgi-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-fcgi/pom.xml b/jetty-fcgi/pom.xml index 7ed47c1e9ee..01ec07b5cee 100644 --- a/jetty-fcgi/pom.xml +++ b/jetty-fcgi/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml index df6ca0a80d8..48874dbec74 100644 --- a/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-memcached-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml index d6e312413f0..4ddce9927f1 100644 --- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml +++ b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.gcloud gcloud-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml index f10d75edba3..24304c583f2 100644 --- a/jetty-gcloud/pom.xml +++ b/jetty-gcloud/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-hazelcast/pom.xml b/jetty-hazelcast/pom.xml index eff2788ec2b..4703bc42ef4 100644 --- a/jetty-hazelcast/pom.xml +++ b/jetty-hazelcast/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-hazelcast diff --git a/jetty-http-spi/pom.xml b/jetty-http-spi/pom.xml index fbccec79d6e..db2cb2e3b62 100644 --- a/jetty-http-spi/pom.xml +++ b/jetty-http-spi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-http-spi diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml index c7de2ef388d..7aa372e4eb2 100644 --- a/jetty-http/pom.xml +++ b/jetty-http/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-http diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index 2658b18e7e1..1be1305436e 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-client/pom.xml b/jetty-http2/http2-client/pom.xml index 4c1baf92bc1..be5a124dcda 100644 --- a/jetty-http2/http2-client/pom.xml +++ b/jetty-http2/http2-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-common/pom.xml b/jetty-http2/http2-common/pom.xml index 274cd3bb2a6..807be9f9c01 100644 --- a/jetty-http2/http2-common/pom.xml +++ b/jetty-http2/http2-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-hpack/pom.xml b/jetty-http2/http2-hpack/pom.xml index 229c96bccf1..dee94dc73dd 100644 --- a/jetty-http2/http2-hpack/pom.xml +++ b/jetty-http2/http2-hpack/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-http-client-transport/pom.xml b/jetty-http2/http2-http-client-transport/pom.xml index 96fd5083b65..23bcefe196e 100644 --- a/jetty-http2/http2-http-client-transport/pom.xml +++ b/jetty-http2/http2-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-http2/http2-server/pom.xml b/jetty-http2/http2-server/pom.xml index 6791a35bb4e..81c805ddcd1 100644 --- a/jetty-http2/http2-server/pom.xml +++ b/jetty-http2/http2-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.http2 http2-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-http2/pom.xml b/jetty-http2/pom.xml index fd9a4c04c0b..bedc2ace4c6 100644 --- a/jetty-http2/pom.xml +++ b/jetty-http2/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml index 86000690d72..cd3b48da395 100644 --- a/jetty-infinispan/pom.xml +++ b/jetty-infinispan/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-infinispan diff --git a/jetty-io/pom.xml b/jetty-io/pom.xml index 1fcbdded429..a86ebb2b575 100644 --- a/jetty-io/pom.xml +++ b/jetty-io/pom.xml @@ -2,7 +2,7 @@ jetty-project org.eclipse.jetty - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-io diff --git a/jetty-jaas/pom.xml b/jetty-jaas/pom.xml index 58beb1d75fc..7f8822216a9 100644 --- a/jetty-jaas/pom.xml +++ b/jetty-jaas/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-jaas diff --git a/jetty-jaspi/pom.xml b/jetty-jaspi/pom.xml index e54f4288116..db03fafa835 100644 --- a/jetty-jaspi/pom.xml +++ b/jetty-jaspi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-jaspi diff --git a/jetty-jmx/pom.xml b/jetty-jmx/pom.xml index 17724f56ad1..9d54b973625 100644 --- a/jetty-jmx/pom.xml +++ b/jetty-jmx/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-jmx diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml index 83bb81102c2..2460d9f7619 100644 --- a/jetty-jndi/pom.xml +++ b/jetty-jndi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-jndi diff --git a/jetty-jspc-maven-plugin/pom.xml b/jetty-jspc-maven-plugin/pom.xml index 8b8220be690..c2944624d9d 100644 --- a/jetty-jspc-maven-plugin/pom.xml +++ b/jetty-jspc-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-jspc-maven-plugin diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml index dc4af8fa05c..e321498b043 100644 --- a/jetty-maven-plugin/pom.xml +++ b/jetty-maven-plugin/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-maven-plugin diff --git a/jetty-monitor/pom.xml b/jetty-monitor/pom.xml index ac77a0e0e99..155426d542c 100644 --- a/jetty-monitor/pom.xml +++ b/jetty-monitor/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-monitor diff --git a/jetty-nosql/pom.xml b/jetty-nosql/pom.xml index 7e3038caf1d..6f5e3c30432 100644 --- a/jetty-nosql/pom.xml +++ b/jetty-nosql/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-nosql diff --git a/jetty-osgi/jetty-osgi-alpn/pom.xml b/jetty-osgi/jetty-osgi-alpn/pom.xml index 6c1140e3bb5..4577a75e919 100644 --- a/jetty-osgi/jetty-osgi-alpn/pom.xml +++ b/jetty-osgi/jetty-osgi-alpn/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-osgi-alpn diff --git a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml index 8147a1fee55..547741cbc12 100644 --- a/jetty-osgi/jetty-osgi-boot-jsp/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-jsp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-osgi-boot-jsp diff --git a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml index 3b73f43b4cb..0952f2a7e4d 100644 --- a/jetty-osgi/jetty-osgi-boot-warurl/pom.xml +++ b/jetty-osgi/jetty-osgi-boot-warurl/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml index 8634f3c16b7..1973bdd1117 100644 --- a/jetty-osgi/jetty-osgi-boot/pom.xml +++ b/jetty-osgi/jetty-osgi-boot/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-osgi-boot diff --git a/jetty-osgi/jetty-osgi-httpservice/pom.xml b/jetty-osgi/jetty-osgi-httpservice/pom.xml index 4b10260f972..30c16371908 100644 --- a/jetty-osgi/jetty-osgi-httpservice/pom.xml +++ b/jetty-osgi/jetty-osgi-httpservice/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-httpservice diff --git a/jetty-osgi/pom.xml b/jetty-osgi/pom.xml index 702c953f54b..82ad0198cb0 100644 --- a/jetty-osgi/pom.xml +++ b/jetty-osgi/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-context/pom.xml b/jetty-osgi/test-jetty-osgi-context/pom.xml index a4eb8aaeca0..4822e7590a1 100644 --- a/jetty-osgi/test-jetty-osgi-context/pom.xml +++ b/jetty-osgi/test-jetty-osgi-context/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 test-jetty-osgi-context diff --git a/jetty-osgi/test-jetty-osgi-fragment/pom.xml b/jetty-osgi/test-jetty-osgi-fragment/pom.xml index af3286de690..b41ad9c266c 100644 --- a/jetty-osgi/test-jetty-osgi-fragment/pom.xml +++ b/jetty-osgi/test-jetty-osgi-fragment/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi-webapp/pom.xml b/jetty-osgi/test-jetty-osgi-webapp/pom.xml index c0a89d670f7..ec24c86f150 100644 --- a/jetty-osgi/test-jetty-osgi-webapp/pom.xml +++ b/jetty-osgi/test-jetty-osgi-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml index a0da0e9f1cb..3b75d064e90 100644 --- a/jetty-osgi/test-jetty-osgi/pom.xml +++ b/jetty-osgi/test-jetty-osgi/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.osgi jetty-osgi-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml index 7865c630197..9b73bcc14a2 100644 --- a/jetty-plus/pom.xml +++ b/jetty-plus/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-plus diff --git a/jetty-proxy/pom.xml b/jetty-proxy/pom.xml index 7e64bf005a6..bd2cfa647e4 100644 --- a/jetty-proxy/pom.xml +++ b/jetty-proxy/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-proxy diff --git a/jetty-quickstart/pom.xml b/jetty-quickstart/pom.xml index 30ed85e4e00..0d88e664956 100644 --- a/jetty-quickstart/pom.xml +++ b/jetty-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 org.eclipse.jetty diff --git a/jetty-rewrite/pom.xml b/jetty-rewrite/pom.xml index c0978a4b89c..38fe593b42f 100644 --- a/jetty-rewrite/pom.xml +++ b/jetty-rewrite/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-rewrite diff --git a/jetty-runner/pom.xml b/jetty-runner/pom.xml index f79c00813ba..7ed0b93c151 100644 --- a/jetty-runner/pom.xml +++ b/jetty-runner/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-runner diff --git a/jetty-security/pom.xml b/jetty-security/pom.xml index e73fdcba052..2cacece608f 100644 --- a/jetty-security/pom.xml +++ b/jetty-security/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-security diff --git a/jetty-server/pom.xml b/jetty-server/pom.xml index f29acf3d451..908e64b76db 100644 --- a/jetty-server/pom.xml +++ b/jetty-server/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-server diff --git a/jetty-servlet/pom.xml b/jetty-servlet/pom.xml index a48d269082f..8a009b62a28 100644 --- a/jetty-servlet/pom.xml +++ b/jetty-servlet/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-servlet diff --git a/jetty-servlets/pom.xml b/jetty-servlets/pom.xml index 9fefd1a50af..141e3581a9b 100644 --- a/jetty-servlets/pom.xml +++ b/jetty-servlets/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-servlets diff --git a/jetty-spring/pom.xml b/jetty-spring/pom.xml index f814c8edc25..7927383f2bd 100644 --- a/jetty-spring/pom.xml +++ b/jetty-spring/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-spring diff --git a/jetty-start/pom.xml b/jetty-start/pom.xml index 5b794c268ef..e7ee42a9751 100644 --- a/jetty-start/pom.xml +++ b/jetty-start/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-start diff --git a/jetty-util-ajax/pom.xml b/jetty-util-ajax/pom.xml index 5c50226c607..999719f36df 100644 --- a/jetty-util-ajax/pom.xml +++ b/jetty-util-ajax/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-util-ajax diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index 9ef634409dc..8340023f99c 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-util diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml index 1269d301515..4ecce31c25b 100644 --- a/jetty-webapp/pom.xml +++ b/jetty-webapp/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-webapp diff --git a/jetty-websocket/javax-websocket-client-impl/pom.xml b/jetty-websocket/javax-websocket-client-impl/pom.xml index 5a80f10239a..3057b25afdb 100644 --- a/jetty-websocket/javax-websocket-client-impl/pom.xml +++ b/jetty-websocket/javax-websocket-client-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/javax-websocket-server-impl/pom.xml b/jetty-websocket/javax-websocket-server-impl/pom.xml index f379fd2c3cd..7dfb41ba0e7 100644 --- a/jetty-websocket/javax-websocket-server-impl/pom.xml +++ b/jetty-websocket/javax-websocket-server-impl/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/pom.xml b/jetty-websocket/pom.xml index f37bb09aa7d..46a430c78a4 100644 --- a/jetty-websocket/pom.xml +++ b/jetty-websocket/pom.xml @@ -3,7 +3,7 @@ jetty-project org.eclipse.jetty - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-api/pom.xml b/jetty-websocket/websocket-api/pom.xml index 3e7303e79d7..7bd404a5262 100644 --- a/jetty-websocket/websocket-api/pom.xml +++ b/jetty-websocket/websocket-api/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-client/pom.xml b/jetty-websocket/websocket-client/pom.xml index 1ee31553dac..c1c497edb58 100644 --- a/jetty-websocket/websocket-client/pom.xml +++ b/jetty-websocket/websocket-client/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-common/pom.xml b/jetty-websocket/websocket-common/pom.xml index 99339992b7a..4d722fd9961 100644 --- a/jetty-websocket/websocket-common/pom.xml +++ b/jetty-websocket/websocket-common/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-server/pom.xml b/jetty-websocket/websocket-server/pom.xml index 4ccc4107ee4..05c81ac2940 100644 --- a/jetty-websocket/websocket-server/pom.xml +++ b/jetty-websocket/websocket-server/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-websocket/websocket-servlet/pom.xml b/jetty-websocket/websocket-servlet/pom.xml index 90d594d320f..95276a10d31 100644 --- a/jetty-websocket/websocket-servlet/pom.xml +++ b/jetty-websocket/websocket-servlet/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.websocket websocket-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml index a3733565946..e6eda86e395 100644 --- a/jetty-xml/pom.xml +++ b/jetty-xml/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jetty-xml diff --git a/pom.xml b/pom.xml index 6637865bd1d..4d51fdd41e3 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT Jetty :: Project http://www.eclipse.org/jetty pom diff --git a/tests/pom.xml b/tests/pom.xml index f7c5ad723e2..eb1075851bb 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty jetty-project - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml org.eclipse.jetty.tests diff --git a/tests/test-continuation/pom.xml b/tests/test-continuation/pom.xml index 8d724e65754..e41307ee740 100644 --- a/tests/test-continuation/pom.xml +++ b/tests/test-continuation/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index cc5d9ea32f5..9d7bf7ad266 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 diff --git a/tests/test-integration/pom.xml b/tests/test-integration/pom.xml index 2b41c4ecec6..77f9c074a1c 100644 --- a/tests/test-integration/pom.xml +++ b/tests/test-integration/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 test-integration diff --git a/tests/test-jmx/jmx-webapp-it/pom.xml b/tests/test-jmx/jmx-webapp-it/pom.xml index e8d8cea070c..b5ea092472d 100644 --- a/tests/test-jmx/jmx-webapp-it/pom.xml +++ b/tests/test-jmx/jmx-webapp-it/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 jmx-webapp-it diff --git a/tests/test-jmx/jmx-webapp/pom.xml b/tests/test-jmx/jmx-webapp/pom.xml index ef2bd5cdab6..bd29b827d27 100644 --- a/tests/test-jmx/jmx-webapp/pom.xml +++ b/tests/test-jmx/jmx-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-jmx-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT jmx-webapp war diff --git a/tests/test-jmx/pom.xml b/tests/test-jmx/pom.xml index 5dccd23f97b..f52a19b1954 100644 --- a/tests/test-jmx/pom.xml +++ b/tests/test-jmx/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT 4.0.0 test-jmx-parent diff --git a/tests/test-loginservice/pom.xml b/tests/test-loginservice/pom.xml index 58f6b02206d..d1257d0375c 100644 --- a/tests/test-loginservice/pom.xml +++ b/tests/test-loginservice/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-loginservice Jetty Tests :: Login Service diff --git a/tests/test-quickstart/pom.xml b/tests/test-quickstart/pom.xml index fd01607a097..187757463d7 100644 --- a/tests/test-quickstart/pom.xml +++ b/tests/test-quickstart/pom.xml @@ -2,7 +2,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-sessions/pom.xml b/tests/test-sessions/pom.xml index 85f5ff10f76..3ac3ebb5e7a 100644 --- a/tests/test-sessions/pom.xml +++ b/tests/test-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-sessions-parent Jetty Tests :: Sessions :: Parent diff --git a/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml b/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml index fb234991e03..56970bb5430 100644 --- a/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-memcached-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-gcloud-memcached-sessions Jetty Tests :: Sessions :: GCloud with Memcached diff --git a/tests/test-sessions/test-gcloud-sessions/pom.xml b/tests/test-sessions/test-gcloud-sessions/pom.xml index d71aa7d3641..9d4b23f19bf 100644 --- a/tests/test-sessions/test-gcloud-sessions/pom.xml +++ b/tests/test-sessions/test-gcloud-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-gcloud-sessions Jetty Tests :: Sessions :: GCloud diff --git a/tests/test-sessions/test-hash-sessions/pom.xml b/tests/test-sessions/test-hash-sessions/pom.xml index a13e0c0db3b..83599a4b134 100644 --- a/tests/test-sessions/test-hash-sessions/pom.xml +++ b/tests/test-sessions/test-hash-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-hash-sessions Jetty Tests :: Sessions :: Hash diff --git a/tests/test-sessions/test-infinispan-sessions/pom.xml b/tests/test-sessions/test-infinispan-sessions/pom.xml index a587981f793..7650aee522b 100644 --- a/tests/test-sessions/test-infinispan-sessions/pom.xml +++ b/tests/test-sessions/test-infinispan-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-infinispan-sessions Jetty Tests :: Sessions :: Infinispan diff --git a/tests/test-sessions/test-jdbc-sessions/pom.xml b/tests/test-sessions/test-jdbc-sessions/pom.xml index 07038647bb0..26b6559f9ec 100644 --- a/tests/test-sessions/test-jdbc-sessions/pom.xml +++ b/tests/test-sessions/test-jdbc-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-jdbc-sessions Jetty Tests :: Sessions :: JDBC diff --git a/tests/test-sessions/test-mongodb-sessions/pom.xml b/tests/test-sessions/test-mongodb-sessions/pom.xml index cba5d93e268..143d22eeff9 100644 --- a/tests/test-sessions/test-mongodb-sessions/pom.xml +++ b/tests/test-sessions/test-mongodb-sessions/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-mongodb-sessions Jetty Tests :: Sessions :: Mongo diff --git a/tests/test-sessions/test-sessions-common/pom.xml b/tests/test-sessions/test-sessions-common/pom.xml index 326e5079e11..b4d045bc425 100644 --- a/tests/test-sessions/test-sessions-common/pom.xml +++ b/tests/test-sessions/test-sessions-common/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-sessions-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-sessions-common Jetty Tests :: Sessions :: Common diff --git a/tests/test-webapps/pom.xml b/tests/test-webapps/pom.xml index ced574ae95c..135b3c10a06 100644 --- a/tests/test-webapps/pom.xml +++ b/tests/test-webapps/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests tests-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml test-webapps-parent diff --git a/tests/test-webapps/test-jaas-webapp/pom.xml b/tests/test-webapps/test-jaas-webapp/pom.xml index c9840f0ce39..9011dd260be 100644 --- a/tests/test-webapps/test-jaas-webapp/pom.xml +++ b/tests/test-webapps/test-jaas-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-jaas-webapp Jetty Tests :: WebApp :: JAAS diff --git a/tests/test-webapps/test-jetty-webapp/pom.xml b/tests/test-webapps/test-jetty-webapp/pom.xml index 9a25b51ed76..d425bf3afaf 100644 --- a/tests/test-webapps/test-jetty-webapp/pom.xml +++ b/tests/test-webapps/test-jetty-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml index ea79afc4f8d..98b834d5afd 100644 --- a/tests/test-webapps/test-jndi-webapp/pom.xml +++ b/tests/test-webapps/test-jndi-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-jndi-webapp Jetty Tests :: WebApp :: JNDI diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml index 4b1e754df46..ded8fe8821b 100644 --- a/tests/test-webapps/test-mock-resources/pom.xml +++ b/tests/test-webapps/test-mock-resources/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT Jetty Tests :: WebApp :: Mock Resources test-mock-resources diff --git a/tests/test-webapps/test-proxy-webapp/pom.xml b/tests/test-webapps/test-proxy-webapp/pom.xml index 6548b80ccaa..19ed9bd9696 100644 --- a/tests/test-webapps/test-proxy-webapp/pom.xml +++ b/tests/test-webapps/test-proxy-webapp/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT ../pom.xml 4.0.0 diff --git a/tests/test-webapps/test-servlet-spec/pom.xml b/tests/test-webapps/test-servlet-spec/pom.xml index 1371a020aae..12247309e6c 100644 --- a/tests/test-webapps/test-servlet-spec/pom.xml +++ b/tests/test-webapps/test-servlet-spec/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-servlet-spec-parent Jetty Tests :: Spec Test WebApp :: Parent diff --git a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml index 055dd3c2d5a..3838d070d5f 100644 --- a/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-container-initializer/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-servlet-spec-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-container-initializer jar diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml index 98cba4308a8..e3af5cc5a69 100644 --- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-servlet-spec-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT Jetty Tests :: Webapps :: Spec Webapp test-spec-webapp diff --git a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml index 9699526c1c7..e538df58e73 100644 --- a/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml +++ b/tests/test-webapps/test-servlet-spec/test-web-fragment/pom.xml @@ -3,7 +3,7 @@ org.eclipse.jetty.tests test-servlet-spec-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT Jetty Tests :: WebApp :: Servlet Spec :: Fragment Jar diff --git a/tests/test-webapps/test-webapp-rfc2616/pom.xml b/tests/test-webapps/test-webapp-rfc2616/pom.xml index 4da3b3cc56d..862a3b761c6 100644 --- a/tests/test-webapps/test-webapp-rfc2616/pom.xml +++ b/tests/test-webapps/test-webapp-rfc2616/pom.xml @@ -4,7 +4,7 @@ org.eclipse.jetty.tests test-webapps-parent - 9.3.21.v20170918 + 9.3.22-SNAPSHOT test-webapp-rfc2616 Jetty Tests :: WebApp :: RFC2616 From 219b61f5b4d8e76d1e204dcf20e4beb93884fc05 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 19 Sep 2017 13:40:59 +1000 Subject: [PATCH 07/21] Issue #1797 Converted jetty-util to be a multi release jar Added org/eclipse/jetty/util/MultiReleaseJarFile as botha java8 and java9 version deprecated jarScanner updated AnnotationParser to use MultiReleaseJarFile --- .../jetty/annotations/AnnotationParser.java | 122 +++------------ jetty-util/pom.xml | 67 ++++++++ .../jetty/util/MultiReleaseJarFile.java | 109 +++++++++++++ .../jetty/util/MultiReleaseJarFile.java | 143 ++++++++++++++++++ jetty-util/src/test/resources/example.jar | Bin 0 -> 3571 bytes .../org/eclipse/jetty/webapp/JarScanner.java | 2 + pom.xml | 110 +++++++------- 7 files changed, 398 insertions(+), 155 deletions(-) create mode 100644 jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java create mode 100644 jetty-util/src/main/java9/org/eclipse/jetty/util/MultiReleaseJarFile.java create mode 100644 jetty-util/src/test/resources/example.jar diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java index 7a68ff0b4c8..8418c4a405b 100644 --- a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java +++ b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java @@ -35,10 +35,12 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.jar.JarEntry; +import java.util.jar.JarFile; import java.util.jar.JarInputStream; import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.MultiException; +import org.eclipse.jetty.util.MultiReleaseJarFile; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; import org.eclipse.jetty.util.resource.Resource; @@ -708,35 +710,10 @@ public class AnnotationParser * @param nullInclusive if true, an empty pattern means all names match, if false, none match * @throws Exception if unable to parse */ + @Deprecated public void parse (final Set handlers, ClassLoader loader, boolean visitParents, boolean nullInclusive) throws Exception { - if (loader==null) - return; - - if (!(loader instanceof URLClassLoader)) - return; //can't extract classes? - - final MultiException me = new MultiException(); - - JarScanner scanner = new JarScanner() - { - @Override - public void processEntry(URI jarUri, JarEntry entry) - { - try - { - parseJarEntry(handlers, Resource.newResource(jarUri), entry); - } - catch (Exception e) - { - me.add(new RuntimeException("Error parsing entry "+entry.getName()+" from jar "+ jarUri, e)); - } - } - - }; - - scanner.scan(null, loader, nullInclusive, visitParents); - me.ifExceptionThrow(); + throw new UnsupportedOperationException(); } /** @@ -836,32 +813,20 @@ public class AnnotationParser if (LOG.isDebugEnabled()) LOG.debug("Scanning jar {}", jarResource); - //treat it as a jar that we need to open and scan all entries from - InputStream in = jarResource.getInputStream(); - if (in==null) - return; - MultiException me = new MultiException(); - try (JarInputStream jar_in = new JarInputStream(in)) + JarFile jarFile = MultiReleaseJarFile.open(jarResource.getFile()); + MultiReleaseJarFile.stream(jarFile).forEach(e-> { - JarEntry entry = jar_in.getNextJarEntry(); - while (entry != null) + try { - try - { - parseJarEntry(handlers, jarResource, entry); - } - catch (Exception e) - { - me.add(new RuntimeException("Error scanning entry " + entry.getName() + " from jar " + jarResource, e)); - } - entry = jar_in.getNextJarEntry(); + parseJarEntry(handlers, jarResource, jarFile, e); } - } - catch (Exception e) - { - me.add(new RuntimeException("Error scanning jar " + jarResource, e)); - } + catch (Exception ex) + { + me.add(new RuntimeException("Error scanning entry " + e.getName() + " from jar " + jarResource, ex)); + } + }); + me.ifExceptionThrow(); } @@ -871,13 +836,13 @@ public class AnnotationParser * Parse a single entry in a jar file * * @param handlers the handlers to look for classes in - * @param jar the jar resource to parse + * @param jarFile the jar resource being parses * @param entry the entry in the jar resource to parse * @throws Exception if unable to parse */ - protected void parseJarEntry (Set handlers, Resource jar, JarEntry entry) throws Exception + protected void parseJarEntry (Set handlers, Resource jar, JarFile jarFile, JarEntry entry) throws Exception { - if (jar == null || entry == null) + if (jarFile == null || entry == null) return; //skip directories @@ -894,7 +859,7 @@ public class AnnotationParser addParsedClass(shortName, clazz); if (LOG.isDebugEnabled()) LOG.debug("Scanning class from jar {}", clazz); - try (InputStream is = clazz.getInputStream()) + try (InputStream is = jarFile.getInputStream(entry)) { scanClass(handlers, jar, is); } @@ -979,57 +944,6 @@ public class AnnotationParser if (path == null || path.length()==0) return false; - if (path.startsWith("META-INF/versions/")) - { - // Handle JEP 238 - Multi-Release Jars - if (JVM_MAJOR_VER < 9) - { - if (LOG.isDebugEnabled()) - { - LOG.debug("JEP-238 Multi-Release JAR not supported on Java " + - System.getProperty("java.version") + ": " + path); - } - return false; - } - - // Safety check for ASM bytecode support level. - // When ASM 6.0 is integrated, the below will start to work. - if (ASM_OPCODE_VERSION <= Opcodes.ASM5) - { - // Cannot scan Java 9 classes with ASM version 5 - if (LOG.isDebugEnabled()) - { - LOG.debug("Unable to scan newer Java bytecode (Java 9?) with ASM 5 (skipping): " + path); - } - return false; - } - - int idxStart = "META-INF/versions/".length(); - int idxEnd = path.indexOf('/', idxStart + 1); - try - { - int pathVersion = Integer.parseInt(path.substring(idxStart, idxEnd)); - if (pathVersion < JVM_MAJOR_VER) - { - if (LOG.isDebugEnabled()) - { - LOG.debug("JEP-238 Multi-Release JAR version " + pathVersion + - " not supported on Java " + System.getProperty("java.version") + - ": " + path); - } - return false; - } - } - catch (NumberFormatException e) - { - if (LOG.isDebugEnabled()) - { - LOG.debug("Not a valid JEP-238 Multi-Release path: " + path); - } - return false; - } - } - // skip any classfiles that are in a hidden directory if (path.startsWith(".") || path.contains("/.")) { diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml index a75e4f8c6ce..87243dd3a2d 100644 --- a/jetty-util/pom.xml +++ b/jetty-util/pom.xml @@ -11,6 +11,8 @@ http://www.eclipse.org/jetty ${project.groupId}.util + ${project.basedir}/src/main/java9 + ${project.build.directory}/classes-java9 @@ -70,4 +72,69 @@ test + + + + jdk9 MR Jar + + [1.9,) + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + compile-java9 + compile + + + + + + + + run + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + prepare-package + + copy-resources + + + ${project.build.outputDirectory}/META-INF/versions/9 + + + ${java9.build.outputDirectory} + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + + + + + + + + diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java new file mode 100644 index 00000000000..f98973f375e --- /dev/null +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/MultiReleaseJarFile.java @@ -0,0 +1,109 @@ +// +// ======================================================================== +// Copyright (c) 1995-2017 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.util; + +import java.io.File; +import java.io.IOException; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.stream.Stream; + +/** + *

Utility class to create a stream of Multi Release {@link JarEntry}s

+ *

This is the java 8 version of this class. + * A java 9 version of this class is included as a Multi Release class in the + * jetty-util jar, that uses java 9 APIs to correctly handle Multi Release jars.

+ */ +public class MultiReleaseJarFile +{ + private static final String META_INF_VERSIONS = "META-INF/versions/"; + + public static JarFile open(File file) throws IOException + { + return new JarFile(file); + } + + public static Stream streamVersioned(JarFile jf) + { + return jf.stream() + .map(VersionedJarEntry::new); + } + + public static Stream stream(JarFile jf) + { + // Java 8 version of this class, ignores all versioned entries. + return streamVersioned(jf) + .filter(e->!e.isVersioned()) + .map(e->e.resolve(jf)); + } + + public static class VersionedJarEntry + { + final JarEntry entry; + final String name; + final int version; + + VersionedJarEntry(JarEntry entry) + { + int v = 0; + String name = entry.getName(); + if (name.startsWith(META_INF_VERSIONS)) + { + v=-1; + int index = name.indexOf('/', META_INF_VERSIONS.length()); + if (index >= 0 && index < name.length()) + { + try + { + v = Integer.parseInt(name.substring(META_INF_VERSIONS.length(), index), 10); + name = name.substring(index + 1); + } + catch (NumberFormatException x) + { + } + } + } + + this.entry = entry; + this.name = name; + this.version = v; + } + + public int version() + { + return version; + } + + public boolean isVersioned() + { + return version > 0; + } + + @Override + public String toString() + { + return entry.toString() + (version==0?"[base]":("["+version+"]")); + } + + public JarEntry resolve(JarFile jf) + { + return entry; + } + } +} diff --git a/jetty-util/src/main/java9/org/eclipse/jetty/util/MultiReleaseJarFile.java b/jetty-util/src/main/java9/org/eclipse/jetty/util/MultiReleaseJarFile.java new file mode 100644 index 00000000000..b15e2a3ceaf --- /dev/null +++ b/jetty-util/src/main/java9/org/eclipse/jetty/util/MultiReleaseJarFile.java @@ -0,0 +1,143 @@ +// +// ======================================================================== +// Copyright (c) 1995-2017 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.util; + +import java.io.File; +import java.io.IOException; +import java.util.Map; +import java.util.TreeMap; +import java.util.jar.JarEntry; +import java.util.jar.JarFile; +import java.util.stream.Stream; + +/** + *

Utility class to create a stream of Multi Release {@link JarEntry}s

+ *

This is the java 9 version of this class. + * A java 8 version of this class is included as the base version in a Multi Release + * jetty-util jar, that uses does not use java 9 APIs.

+ */ +public class MultiReleaseJarFile +{ + private static final String META_INF_VERSIONS = "META-INF/versions/"; + + public static JarFile open(File file) throws IOException + { + return new JarFile(file,true,JarFile.OPEN_READ,Runtime.version()); + } + + public static Stream streamVersioned(JarFile jf) + { + return jf.stream() + .map(VersionedJarEntry::new); + } + + public static Stream stream(JarFile jf) + { + if (!jf.isMultiRelease()) + return jf.stream(); + + // Map to hold unversioned name to VersionedJarEntry + Map entries = new TreeMap<>(); + + // Fill the map, removing non applicable entries and replacing versions with later versions. + streamVersioned(jf) + .filter(e->e.isApplicable(jf.getVersion().major())) + .forEach(e->entries.compute(e.name, (k, v) -> v==null || v.isReplacedBy(e) ? e : v)); + + // filter the values to remove non applicable inner classes and map to versioned entry + return entries.values().stream() + .filter(e-> { + if (!e.inner) + return true; + VersionedJarEntry outer = entries.get(e.outer); + return outer != null && outer.version == e.version; + }) + .map(e->e.resolve(jf)); + } + + public static class VersionedJarEntry + { + final JarEntry entry; + final String name; + final int version; + final boolean inner; + final String outer; + + VersionedJarEntry(JarEntry entry) + { + int v = 0; + String name = entry.getName(); + if (name.startsWith(META_INF_VERSIONS)) + { + v=-1; + int index = name.indexOf('/', META_INF_VERSIONS.length()); + if (index >= 0 && index < name.length()) + { + try + { + v = Integer.parseInt(name, META_INF_VERSIONS.length(), index, 10); + name = name.substring(index + 1); + } + catch (NumberFormatException x) + { + } + } + } + + this.entry = entry; + this.name = name; + this.version = v; + this.inner = name.contains("$") && name.toLowerCase().endsWith(".class"); + this.outer = inner?name.substring(0,name.indexOf('$'))+name.substring(name.length()-6,name.length()):null; + } + + public int version() + { + return version; + } + + public boolean isVersioned() + { + return version > 0; + } + + boolean isApplicable(int version) + { + return this.version>=0 && this.version <= version; + } + + boolean isReplacedBy(VersionedJarEntry entry) + { + return this.name.equals(entry.name) && entry.version>version; + } + + @Override + public String toString() + { + return entry.toString() + (version==0?"[base]":("["+version+"]")); + } + + public JarEntry resolve(JarFile jf) + { + if (version>0) + return jf.getJarEntry(name); + return entry; + } + } +} diff --git a/jetty-util/src/test/resources/example.jar b/jetty-util/src/test/resources/example.jar new file mode 100644 index 0000000000000000000000000000000000000000..3c3e1cdaa1d416df813419ffcaf63b1cc6953468 GIT binary patch literal 3571 zcmbVNT}V@57(SbtOY}w*GQv!}@MmXdrX>bl7$}_`&o-t(bvI=FuBkg3bs2^fLKhK4 zmr*wcL8cYaP2H)RQ*+uy1fi{aYdY8Ds{jLdv=-Mw7Ckc(3|Bhuh`Sw*YA>h zw&i%NSK?jE6%yZ^h%ZhD+{w0&sV#n?X)ameSrBEX_gSE^saZ~?qAri@6y@d7M>ByZ z{Y#sIr#B&<7)l7uvx3KIyRh~twVtwPM3vvT_Ms0^2GBoFgcU4M=PS>uCW@U2YRxLsSBz%x8Pd&qfI0i?~HHeW&C~CqMSLTH||Mz%I z;-d_w?c3Jt280Nx|H+Bi4R%Oy+NaXDmCA_;8@R=DvVPz|LBc(Tn>3?YA`bC-qwmXJ z)C~yuT1Up{Ypq1T>TbLoiYn&^BMM;y)+m&F_4S>3I)Fcyp;O3jx4JxCg)PWi=vHmn zsUGF_XvJ{yM_O4C)ZuGcdy!ns@#%DuINz1v!7~El0WNdHv{_I>8rP~G!c|X6Rl^<6 z_a8!>z-zAR@D5eMU|BpULKtQDSMTrnKp0S)3v*f)wi7wzScJbmoN^%+U@{+zYC|2Z zZo=p6B-NO;&_*90qX!V4fZXvwOwd-?>EOVE?P8?W4R$v>vyS#9%IxvB_D%FKlfDw~ z4E=0HT)=03ea3UgY(}-aWi9YzlNac?dvgZQoy}gw(IKrRFoZN+`Z+;l`z5-S%t?6U za2-XTdMgpwfKbMn=P5>bi#}Bs;0~jF#U1Hv2Q~m!3pq$8B%~y+TARwHb+YM8?i-NE z+=J}HHO?TB&lJvA7LSZI8t->LJpF-T@yHm1D8Y3R-84BQq^|%)yBl^;A@Xp=5Q=`g zdZ3a0MiGen{}}c|AYuh90=*Bu$Vh<}kQjw^OdS@1z6SE3XkK8?mW(hMU0nAqpiu$J zLX$ZJS%j+vjb-kEtJ~Ftl2*$mB1=H#31kYcH#;Q2;l^^1Spj*0>vW0LO{ni2Ae;FS zvIf_>A#x^p%po9qa8>Uz5|@32NhL;EgkgH~!Du(d9vPVv@Ji#FumVRX6$?&2{j^_e aO7m=4(@H-OB}fm)RinQn=<5Lj;JANsQf-O= literal 0 HcmV?d00001 diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java index 7dfa1603661..aa6b97b8936 100644 --- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java +++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JarScanner.java @@ -43,7 +43,9 @@ import org.eclipse.jetty.util.resource.Resource; * Subclasses should implement the processEntry(URL jarUrl, JarEntry entry) * method to handle entries in jar files whose names match the supplied * pattern. + * @deprecated Does not handle MR Jars */ +@Deprecated() public abstract class JarScanner extends org.eclipse.jetty.util.PatternMatcher { private static final Logger LOG = Log.getLogger(JarScanner.class); diff --git a/pom.xml b/pom.xml index d8fc754385b..c4b333c0c7e 100644 --- a/pom.xml +++ b/pom.xml @@ -150,57 +150,6 @@ - - org.jacoco - jacoco-maven-plugin - - - - **/org/eclipse/jetty/ant/** - **/org/eclipse/jetty/maven/** - **/org/eclipse/jetty/jspc/** - - **/org/eclipse/jetty/embedded/** - **/org/eclipse/jetty/asyncrest/** - **/org/eclipse/jetty/demo/** - - **/org/eclipse/jetty/gcloud/** - **/org/eclipse/jetty/infinispan/** - **/org/eclipse/jetty/osgi/** - **/org/eclipse/jetty/spring/** - **/org/eclipse/jetty/http/spi/** - - **/org/eclipse/jetty/tests/** - **/org/eclipse/jetty/test/** - - - - - jacoco-initialize - initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - **/org/eclipse/jetty/** - - - - - maven-pmd-plugin @@ -1136,6 +1085,65 @@ + + jacoco + + + + org.jacoco + jacoco-maven-plugin + + + + **/org/eclipse/jetty/ant/** + **/org/eclipse/jetty/maven/** + **/org/eclipse/jetty/jspc/** + + **/org/eclipse/jetty/embedded/** + **/org/eclipse/jetty/asyncrest/** + **/org/eclipse/jetty/demo/** + + **/org/eclipse/jetty/gcloud/** + **/org/eclipse/jetty/infinispan/** + **/org/eclipse/jetty/osgi/** + **/org/eclipse/jetty/spring/** + **/org/eclipse/jetty/http/spi/** + + **/org/eclipse/jetty/tests/** + **/org/eclipse/jetty/test/** + + + + + jacoco-initialize + initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + **/org/eclipse/jetty/** + + + + + + + + + + **/org/eclipse/jetty/ant/** + **/org/eclipse/jetty/maven/** + **/org/eclipse/jetty/jspc/** + + **/org/eclipse/jetty/embedded/** + **/org/eclipse/jetty/asyncrest/** + **/org/eclipse/jetty/demo/** + + **/org/eclipse/jetty/gcloud/** + **/org/eclipse/jetty/infinispan/** + **/org/eclipse/jetty/osgi/** + **/org/eclipse/jetty/spring/** + **/org/eclipse/jetty/http/spi/** + + **/org/eclipse/jetty/tests/** + **/org/eclipse/jetty/test/** + + + + + jacoco-initialize + initialize + + prepare-agent + + + + jacoco-site + package + + report + + + + + **/org/eclipse/jetty/** + + + + + maven-pmd-plugin @@ -1085,65 +1136,6 @@ - - jacoco - - - - org.jacoco - jacoco-maven-plugin - - - - **/org/eclipse/jetty/ant/** - **/org/eclipse/jetty/maven/** - **/org/eclipse/jetty/jspc/** - - **/org/eclipse/jetty/embedded/** - **/org/eclipse/jetty/asyncrest/** - **/org/eclipse/jetty/demo/** - - **/org/eclipse/jetty/gcloud/** - **/org/eclipse/jetty/infinispan/** - **/org/eclipse/jetty/osgi/** - **/org/eclipse/jetty/spring/** - **/org/eclipse/jetty/http/spi/** - - **/org/eclipse/jetty/tests/** - **/org/eclipse/jetty/test/** - - - - - jacoco-initialize - initialize - - prepare-agent - - - - jacoco-site - package - - report - - - - - **/org/eclipse/jetty/** - - - - - - - - - - - - diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod new file mode 100644 index 00000000000..d726e163d24 --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl.mod @@ -0,0 +1,5 @@ +[description] +Selects an ALPN (Application Layer Protocol Negotiation) implementation by java version. + +[depend] +alpn-impl/alpn-${java.version.platform} diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod index a591d419f89..6ace07a2e6b 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn-impl/alpn-8.mod @@ -17,6 +17,9 @@ specific version of Java. [depend] alpn-impl/alpn-${java.version} +[lib] +lib/jetty-alpn-openjdk8-server-${jetty.version}.jar + [files] lib/ lib/alpn/ diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod index e25948f4bc8..cb02222ed89 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/alpn.mod @@ -3,7 +3,7 @@ Enables the ALPN (Application Layer Protocol Negotiation) TLS extension. [depend] ssl -alpn-impl/alpn-${java.version.platform} +alpn-impl [lib] lib/jetty-alpn-client-${jetty.version}.jar @@ -21,6 +21,3 @@ etc/jetty-alpn.xml ## Specifies what protocol to use when negotiation fails. # jetty.alpn.defaultProtocol=http/1.1 -## ALPN debug logging on System.err -# jetty.alpn.debug=false - diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java index f3e5835c33b..83f819f62fb 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java +++ b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnection.java @@ -24,7 +24,6 @@ import java.util.List; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLSession; -import org.eclipse.jetty.alpn.ALPN; import org.eclipse.jetty.io.EndPoint; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Connector; @@ -32,24 +31,21 @@ import org.eclipse.jetty.server.NegotiatingServerConnection; import org.eclipse.jetty.util.log.Log; import org.eclipse.jetty.util.log.Logger; -public class ALPNServerConnection extends NegotiatingServerConnection implements ALPN.ServerProvider +public class ALPNServerConnection extends NegotiatingServerConnection { private static final Logger LOG = Log.getLogger(ALPNServerConnection.class); public ALPNServerConnection(Connector connector, EndPoint endPoint, SSLEngine engine, List protocols, String defaultProtocol) { super(connector, endPoint, engine, protocols, defaultProtocol); - ALPN.put(engine, this); } - @Override public void unsupported() { select(Collections.emptyList()); } - - @Override - public String select(List clientProtocols) + + public void select(List clientProtocols) { SSLEngine sslEngine = getSSLEngine(); List serverProtocols = getProtocols(); @@ -70,7 +66,7 @@ public class ALPNServerConnection extends NegotiatingServerConnection implements if (factory instanceof CipherDiscriminator && !((CipherDiscriminator)factory).isAcceptable(serverProtocol, tlsProtocol, tlsCipher)) { if (LOG.isDebugEnabled()) - LOG.debug("{} protocol {} not acceptable to {} for {}/{}", this, serverProtocol, factory, tlsProtocol, tlsCipher); + LOG.debug("Protocol {} not acceptable to {} for {}/{} on {}", serverProtocol, factory, tlsProtocol, tlsCipher, getEndPoint()); continue; } @@ -87,21 +83,12 @@ public class ALPNServerConnection extends NegotiatingServerConnection implements else { if (LOG.isDebugEnabled()) - LOG.debug("{} could not negotiate protocol among client{} and server{}", this, clientProtocols, serverProtocols); + LOG.debug("Could not negotiate protocol from client{} and server{} on {}", clientProtocols, serverProtocols, getEndPoint()); throw new IllegalStateException(); } } if (LOG.isDebugEnabled()) - LOG.debug("{} protocol selected {} among client{} and server{}", this, negotiated, clientProtocols, serverProtocols); + LOG.debug("Protocol selected {} from client{} and server{} on {}", negotiated, clientProtocols, serverProtocols, getEndPoint()); setProtocol(negotiated); - ALPN.remove(sslEngine); - return negotiated; - } - - @Override - public void close() - { - ALPN.remove(getSSLEngine()); - super.close(); } } diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java index ccf886a73ef..0bf03f6ddd3 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java +++ b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java @@ -18,7 +18,8 @@ package org.eclipse.jetty.alpn.server; -import java.util.Iterator; +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.ServiceLoader; @@ -26,52 +27,68 @@ import javax.net.ssl.SSLEngine; import org.eclipse.jetty.io.AbstractConnection; import org.eclipse.jetty.io.EndPoint; -import org.eclipse.jetty.io.ssl.ALPNProcessor; -import org.eclipse.jetty.io.ssl.SslHandshakeListener; +import org.eclipse.jetty.io.ssl.ALPNProcessor.Server; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.NegotiatingServerConnectionFactory; import org.eclipse.jetty.util.annotation.Name; +import org.eclipse.jetty.util.log.Log; +import org.eclipse.jetty.util.log.Logger; -public class ALPNServerConnectionFactory extends NegotiatingServerConnectionFactory implements SslHandshakeListener +public class ALPNServerConnectionFactory extends NegotiatingServerConnectionFactory { - private final ALPNProcessor.Server alpnProcessor; + private static final Logger LOG = Log.getLogger(ALPNServerConnectionFactory.class); - public ALPNServerConnectionFactory(String protocols) + private final List processors = new ArrayList<>(); + + public ALPNServerConnectionFactory(@Name("protocols") String protocols) { this(protocols.trim().split(",", 0)); } - + public ALPNServerConnectionFactory(@Name("protocols") String... protocols) { super("alpn", protocols); - checkProtocolNegotiationAvailable(); - Iterator processors = ServiceLoader.load(ALPNProcessor.Server.class).iterator(); - alpnProcessor = processors.hasNext() ? processors.next() : ALPNProcessor.Server.NOOP; - } - public ALPNProcessor.Server getALPNProcessor() - { - return alpnProcessor; + IllegalStateException failure = new IllegalStateException("No Server ALPNProcessors!"); + for (Server processor : ServiceLoader.load(Server.class)) + { + try + { + processor.init(); + processors.add(processor); + } + catch (Throwable x) + { + if (LOG.isDebugEnabled()) + LOG.debug("Could not initialize " + processor, x); + failure.addSuppressed(x); + } + } + + if (LOG.isDebugEnabled()) + { + LOG.debug("protocols: {}", Arrays.asList(protocols)); + LOG.debug("processors: {}", processors); + } + + if (processors.isEmpty()) + throw failure; } @Override protected AbstractConnection newServerConnection(Connector connector, EndPoint endPoint, SSLEngine engine, List protocols, String defaultProtocol) { - getALPNProcessor().configure(engine); - return new ALPNServerConnection(connector, endPoint, engine, protocols, defaultProtocol); - } - - @Override - public void handshakeSucceeded(Event event) - { - if (alpnProcessor instanceof SslHandshakeListener) - ((SslHandshakeListener)alpnProcessor).handshakeSucceeded(event); - } - - @Override - public void handshakeFailed(Event event, Throwable failure) - { - if (alpnProcessor instanceof SslHandshakeListener) - ((SslHandshakeListener)alpnProcessor).handshakeFailed(event, failure); + for (Server processor : processors) + { + if (processor.appliesTo(engine)) + { + if (LOG.isDebugEnabled()) + LOG.debug("{} for {} on {}", processor, engine, endPoint); + ALPNServerConnection connection = new ALPNServerConnection(connector, endPoint, engine, protocols, defaultProtocol); + processor.configure(engine, connection); + return connection; + } + } + throw new IllegalStateException("No ALPNProcessor for " + engine); } } diff --git a/jetty-alpn/pom.xml b/jetty-alpn/pom.xml index 100a0e70660..0e73e9fb628 100644 --- a/jetty-alpn/pom.xml +++ b/jetty-alpn/pom.xml @@ -13,6 +13,10 @@ jetty-alpn-server jetty-alpn-client + jetty-alpn-openjdk8-server + jetty-alpn-openjdk8-client + jetty-alpn-conscrypt-server + jetty-alpn-conscrypt-client diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml index 38ef5f40efe..16f83ae5766 100644 --- a/jetty-home/pom.xml +++ b/jetty-home/pom.xml @@ -499,6 +499,16 @@ jetty-alpn-server ${project.version} + + org.eclipse.jetty + jetty-alpn-openjdk8-server + ${project.version} + + + org.eclipse.jetty + jetty-alpn-conscrypt-server + ${project.version} + org.eclipse.jetty jetty-jaspi diff --git a/jetty-home/src/main/resources/modules/conscrypt.mod b/jetty-home/src/main/resources/modules/conscrypt.mod index 9d2158ea66e..b4ac145a033 100644 --- a/jetty-home/src/main/resources/modules/conscrypt.mod +++ b/jetty-home/src/main/resources/modules/conscrypt.mod @@ -7,21 +7,26 @@ Installs the Conscrypt JSSE provider [depend] ssl +[provides] +alpn-impl + [files] maven://org.conscrypt/conscrypt-openjdk-uber/${conscrypt.version}|lib/conscrypt/conscrypt-uber-${conscrypt.version}.jar +#maven://org.conscrypt/conscrypt-openjdk/${conscrypt.version}/jar/linux-x86_64|lib/conscrypt/conscrypt-${conscrypt.version}-linux-x86_64.jar basehome:modules/conscrypt/conscrypt.xml|etc/conscrypt.xml -[lib] -lib/conscrypt/**.jar - [xml] etc/conscrypt.xml +[lib] +lib/conscrypt/**.jar +lib/jetty-alpn-conscrypt-server-${jetty.version}.jar + [license] Conscrypt is distributed under the Apache Licence 2.0 https://github.com/google/conscrypt/blob/master/LICENSE [ini] -conscrypt.version?=1.0.0.RC9 -jetty.sslContext.provider?=AndroidOpenSSL +conscrypt.version?=1.0.0.RC10 +jetty.sslContext.provider?=Conscrypt diff --git a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties index cfdad688c7c..b4ad431489b 100644 --- a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties +++ b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties @@ -76,6 +76,7 @@ mov=video/quicktime movie=video/x-sgi-movie mp2=audio/mpeg mp3=audio/mpeg +mp4=video/mp4 mpe=video/mpeg mpeg=video/mpeg mpg=video/mpeg diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java index 85c34bfdc02..f79a1f428bb 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/NegotiatingClientConnection.java @@ -45,7 +45,7 @@ public abstract class NegotiatingClientConnection extends AbstractConnection this.context = context; } - protected SSLEngine getSSLEngine() + public SSLEngine getSSLEngine() { return engine; } diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/ALPNProcessor.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/ALPNProcessor.java index f8fddc892f0..5e053fb302f 100644 --- a/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/ALPNProcessor.java +++ b/jetty-io/src/main/java/org/eclipse/jetty/io/ssl/ALPNProcessor.java @@ -18,35 +18,54 @@ package org.eclipse.jetty.io.ssl; -import java.util.List; - import javax.net.ssl.SSLEngine; +import org.eclipse.jetty.io.Connection; + public interface ALPNProcessor { - public interface Server + /** + * Initializes this ALPNProcessor + * + * @throws RuntimeException if this processor is unavailable (e.g. missing dependencies or wrong JVM) + */ + public default void init() { - public static final ALPNProcessor.Server NOOP = new ALPNProcessor.Server() - { - }; - - public default void configure(SSLEngine sslEngine) - { - } } - public interface Client + /** + * Tests if this processor can be applied to the given SSLEngine. + * + * @param sslEngine the SSLEngine to check + * @return true if the processor can be applied to the given SSLEngine + */ + public default boolean appliesTo(SSLEngine sslEngine) { - public static final Client NOOP = new Client() - { - }; + return false; + } - public default void configure(SSLEngine sslEngine, List protocols) - { - } + /** + * Configures the given SSLEngine and the given Connection for ALPN. + * + * @param sslEngine the SSLEngine to configure + * @param connection the Connection to configure + * @throws RuntimeException if this processor cannot be configured + */ + public default void configure(SSLEngine sslEngine, Connection connection) + { + } - public default void process(SSLEngine sslEngine) - { - } + /** + * Server-side interface used by ServiceLoader. + */ + public interface Server extends ALPNProcessor + { + } + + /** + * Client-side interface used by ServiceLoader. + */ + public interface Client extends ALPNProcessor + { } } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java index cb45294f410..8df5f42d0d0 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnection.java @@ -55,27 +55,27 @@ public abstract class NegotiatingServerConnection extends AbstractConnection this.engine = engine; } - protected List getProtocols() + public List getProtocols() { return protocols; } - protected String getDefaultProtocol() + public String getDefaultProtocol() { return defaultProtocol; } - protected Connector getConnector() + public Connector getConnector() { return connector; } - protected SSLEngine getSSLEngine() + public SSLEngine getSSLEngine() { return engine; } - protected String getProtocol() + public String getProtocol() { return protocol; } diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java index 2fbbb64094d..2abdec1a8f8 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/NegotiatingServerConnectionFactory.java @@ -32,28 +32,6 @@ import org.eclipse.jetty.io.ssl.SslConnection; public abstract class NegotiatingServerConnectionFactory extends AbstractConnectionFactory { - public static void checkProtocolNegotiationAvailable() - { - try - { - String javaVersion = System.getProperty("java.version"); - String alpnClassName = "org.eclipse.jetty.alpn.ALPN"; - if (javaVersion.startsWith("1.")) - { - Class klass = ClassLoader.getSystemClassLoader().loadClass(alpnClassName); - if (klass.getClassLoader() != null) - throw new IllegalStateException(alpnClassName + " must be on JVM boot classpath"); - } - else - { - NegotiatingServerConnectionFactory.class.getClassLoader().loadClass(alpnClassName); - } - } - catch (ClassNotFoundException x) - { - throw new IllegalStateException("No ALPN classes available"); - } - } private final List negotiatedProtocols; private String defaultProtocol; diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java index 9b5f4ca3e38..11a40c6dffd 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/ResourceHandler.java @@ -109,7 +109,8 @@ public class ResourceHandler extends HandlerWrapper implements ResourceFactory,W { Context scontext = ContextHandler.getCurrentContext(); _context = (scontext == null?null:scontext.getContextHandler()); - _mimeTypes = _context == null?new MimeTypes():_context.getMimeTypes(); + if (_mimeTypes==null) + _mimeTypes = _context == null?new MimeTypes():_context.getMimeTypes(); _resourceService.setContentFactory(new ResourceContentFactory(this,_mimeTypes,_resourceService.getPrecompressedFormats())); _resourceService.setWelcomeFactory(this); From aa1e56c8c6d8936928aa09e654b138b97805246c Mon Sep 17 00:00:00 2001 From: WalkerWatch Date: Wed, 20 Sep 2017 17:40:23 -0400 Subject: [PATCH 15/21] Resolving warnings present during doc generation. --- .../asciidoc/administration/sessions/sessions-usecases.adoc | 6 +++--- .../asciidoc/configuring/connectors/configuring-ssl.adoc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc b/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc index 4556b72d15d..57600be6ad5 100644 --- a/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc +++ b/jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc @@ -17,7 +17,7 @@ [[sessions-usecases]] === Use Cases -===== Clustering with a Sticky Load Balancer +==== Clustering with a Sticky Load Balancer Preferably, your cluster will utilize a sticky load balancer. This will route requests for the same Session to the same Jetty instance. @@ -36,7 +36,7 @@ With this policy, Session objects will remain in the cache until they either exp If you have a high likelihood of simultaneous requests for the same session object, then the `EVICT_ON_SESSION_EXIT` policy will ensure the Session object stays in the cache as long as it is needed. -===== Clustering Without a Sticky Load Balancer +==== Clustering Without a Sticky Load Balancer Without a sticky load balancer requests for the same session may arrive on any node in the cluster. This means it is likely that the copy of the Session object in any `SessionCache` is likely to be out-of-date, as the Session was probably last accessed on a different node. @@ -52,7 +52,7 @@ Again, due to the lack of Session transactionality, the ordering outcome of writ As the Session is cached while at least one request is accessing it, it is possible for multiple simultaneous requests to share the same Session object. -===== Handling corrupted or unloadable session data +==== Handling corrupted or unloadable session data For various reasons it might not be possible for the `SessionDataStore` to re-read a stored session. One scenario is that the session stores a serialized object in it's attributes, and after a redeployment there in an incompatible class change. diff --git a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc index fd749015d61..c2ecdc26aef 100644 --- a/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc +++ b/jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc @@ -20,7 +20,7 @@ This document provides an overview of how to configure SSL and TLS for Jetty. [[configuring-jetty-for-ssl]] -===== Configuring Jetty for SSL +==== Configuring Jetty for SSL To configure Jetty for SSL, complete the tasks in the following sections: From 236658d61c223e4be7bc25a54289920df87fc433 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Wed, 20 Sep 2017 15:02:56 -0700 Subject: [PATCH 16/21] Build fix --- .../src/test/java/org/eclipse/jetty/server/RequestTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java index cd5f04c2de3..5277241ec42 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/RequestTest.java @@ -44,6 +44,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Enumeration; import java.util.Locale; +import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -58,7 +59,6 @@ import javax.servlet.http.HttpServletResponse; import javax.servlet.http.Part; import org.eclipse.jetty.http.BadMessageException; -import org.eclipse.jetty.http.CookieCompliance; import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.http.MimeTypes; import org.eclipse.jetty.server.LocalConnector.LocalEndPoint; @@ -173,7 +173,7 @@ public class RequestTest "Connection: close\n"+ "\n"; - String responses=_connector.getResponses(request); + String responses=_connector.getResponse(request); assertThat("Responses", responses, startsWith("HTTP/1.1 400")); } From 817dabe873ac421cf2ea409e3514b1dd286332e5 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 21 Sep 2017 08:07:56 +1000 Subject: [PATCH 17/21] Issue#215 fixed tests dependencies --- .../src/main/resources/jetty-logging.properties | 2 +- jetty-http2/http2-alpn-tests/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/embedded/src/main/resources/jetty-logging.properties b/examples/embedded/src/main/resources/jetty-logging.properties index a68d5a315ef..810f9896c7e 100644 --- a/examples/embedded/src/main/resources/jetty-logging.properties +++ b/examples/embedded/src/main/resources/jetty-logging.properties @@ -8,4 +8,4 @@ #org.eclipse.jetty.io.ssl.LEVEL=DEBUG #org.eclipse.jetty.server.LEVEL=DEBUG #org.eclipse.jetty.servlets.LEVEL=DEBUG -org.eclipse.jetty.alpn.LEVEL=DEBUG +#org.eclipse.jetty.alpn.LEVEL=DEBUG diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index 026efeb69d8..ca55d3fa952 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -51,14 +51,14 @@ - org.eclipse.jetty.alpn - alpn-api - ${alpn.api.version} - provided + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + test org.eclipse.jetty - jetty-alpn-server + jetty-alpn-openjdk8-server ${project.version} test From 687561e1c9d990c07ffdbdc579b1f102c7d3c82e Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 21 Sep 2017 09:02:24 +1000 Subject: [PATCH 18/21] Issue#215 fixed tests dependencies --- .../client/ALPNClientConnectionFactory.java | 18 ++++++++++++++- .../server/ALPNServerConnectionFactory.java | 17 +++++++++++++- jetty-http2/http2-alpn-tests/pom.xml | 23 ++++++++++++++----- 3 files changed, 50 insertions(+), 8 deletions(-) diff --git a/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java b/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java index a7203cd12b4..1fc8b560956 100644 --- a/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java +++ b/jetty-alpn/jetty-alpn-client/src/main/java/org/eclipse/jetty/alpn/client/ALPNClientConnectionFactory.java @@ -20,6 +20,7 @@ package org.eclipse.jetty.alpn.client; import java.io.IOException; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.ServiceLoader; @@ -54,8 +55,23 @@ public class ALPNClientConnectionFactory extends NegotiatingClientConnectionFact this.protocols = protocols; IllegalStateException failure = new IllegalStateException("No Client ALPNProcessors!"); - for (Client processor : ServiceLoader.load(Client.class)) + + // Use a for loop on iterator so load exceptions can be caught and ignored + for (Iterator i = ServiceLoader.load(Client.class).iterator(); i.hasNext();) { + Client processor; + try + { + processor = i.next(); + } + catch(Throwable x) + { + if (LOG.isDebugEnabled()) + LOG.debug(x); + failure.addSuppressed(x); + continue; + } + try { processor.init(); diff --git a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java index 0bf03f6ddd3..56135bd008d 100644 --- a/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java +++ b/jetty-alpn/jetty-alpn-server/src/main/java/org/eclipse/jetty/alpn/server/ALPNServerConnectionFactory.java @@ -20,6 +20,7 @@ package org.eclipse.jetty.alpn.server; import java.util.ArrayList; import java.util.Arrays; +import java.util.Iterator; import java.util.List; import java.util.ServiceLoader; @@ -50,8 +51,22 @@ public class ALPNServerConnectionFactory extends NegotiatingServerConnectionFact super("alpn", protocols); IllegalStateException failure = new IllegalStateException("No Server ALPNProcessors!"); - for (Server processor : ServiceLoader.load(Server.class)) + // Use a for loop on iterator so load exceptions can be caught and ignored + for (Iterator i = ServiceLoader.load(Server.class).iterator(); i.hasNext();) { + Server processor; + try + { + processor = i.next(); + } + catch(Throwable x) + { + if (LOG.isDebugEnabled()) + LOG.debug(x); + failure.addSuppressed(x); + continue; + } + try { processor.init(); diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index ca55d3fa952..c472fa13921 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -50,12 +50,6 @@ - - org.eclipse.jetty - jetty-alpn-java-server - ${project.version} - test - org.eclipse.jetty jetty-alpn-openjdk8-server @@ -86,4 +80,21 @@ + + + jdk9 + + [1.9,) + + + + + org.eclipse.jetty + jetty-alpn-java-server + ${project.version} + test + + + + From 5edb2b6f4f39e8291b5f8c13de6b177fd3b10690 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 21 Sep 2017 09:35:18 +1000 Subject: [PATCH 19/21] Issue#215 fixed tests dependencies --- jetty-http2/http2-alpn-tests/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jetty-http2/http2-alpn-tests/pom.xml b/jetty-http2/http2-alpn-tests/pom.xml index c472fa13921..b954701d1a4 100644 --- a/jetty-http2/http2-alpn-tests/pom.xml +++ b/jetty-http2/http2-alpn-tests/pom.xml @@ -50,6 +50,12 @@ + + org.eclipse.jetty.alpn + alpn-api + ${alpn.api.version} + provided + org.eclipse.jetty jetty-alpn-openjdk8-server From 1bc348a9adf9fcc584aa7a3e34fb32106fc9d830 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Thu, 21 Sep 2017 09:40:08 +1000 Subject: [PATCH 20/21] Issue #1831 --- .../src/main/config/demo-base/webapps/test.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml index 4a978e9fa79..10347114ba0 100644 --- a/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml +++ b/tests/test-webapps/test-jetty-webapp/src/main/config/demo-base/webapps/test.xml @@ -71,9 +71,7 @@ detected. From 5452ed18fab5915afa6f9c15bf6b2ae3a0489deb Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 21 Sep 2017 10:19:16 +1000 Subject: [PATCH 21/21] Issue#215 fixed tests dependencies --- tests/test-http-client-transport/pom.xml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tests/test-http-client-transport/pom.xml b/tests/test-http-client-transport/pom.xml index cb5bc38ad21..0a0ba853318 100644 --- a/tests/test-http-client-transport/pom.xml +++ b/tests/test-http-client-transport/pom.xml @@ -21,6 +21,20 @@ [1.8,1.9) + + + org.eclipse.jetty + jetty-alpn-openjdk8-client + ${project.version} + test + + + org.eclipse.jetty + jetty-alpn-openjdk8-server + ${project.version} + test + + @@ -116,12 +130,6 @@ ${project.version} test - - org.eclipse.jetty - jetty-alpn-server - ${project.version} - test - org.eclipse.jetty.http2 http2-http-client-transport