From a74ad00b77a57f56513b8308f5b298a1468ebb91 Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Wed, 18 Oct 2017 10:44:18 +0200 Subject: [PATCH 1/3] Update ALPN support for Java 8u151 and 8u152. --- .../modules/protonego-impl/alpn-1.8.0_151.mod | 8 +++++++ .../modules/protonego-impl/alpn-1.8.0_152.mod | 8 +++++++ .../modules/protonego-impl/alpn-1.8.0_151.mod | 8 +++++++ .../modules/protonego-impl/alpn-1.8.0_152.mod | 8 +++++++ pom.xml | 24 +++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_151.mod create mode 100644 jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_152.mod create mode 100644 jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_151.mod create mode 100644 jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_152.mod diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_151.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_151.mod new file mode 100644 index 00000000000..fdd3868701d --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_151.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar diff --git a/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_152.mod b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_152.mod new file mode 100644 index 00000000000..fdd3868701d --- /dev/null +++ b/jetty-alpn/jetty-alpn-server/src/main/config/modules/protonego-impl/alpn-1.8.0_152.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_151.mod b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_151.mod new file mode 100644 index 00000000000..fdd3868701d --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_151.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar diff --git a/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_152.mod b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_152.mod new file mode 100644 index 00000000000..fdd3868701d --- /dev/null +++ b/jetty-start/src/test/resources/dist-home/modules/protonego-impl/alpn-1.8.0_152.mod @@ -0,0 +1,8 @@ +[name] +protonego-boot + +[files] +http://central.maven.org/maven2/org/mortbay/jetty/alpn/alpn-boot/8.1.11.v20170118/alpn-boot-8.1.11.v20170118.jar|lib/alpn/alpn-boot-8.1.11.v20170118.jar + +[exec] +-Xbootclasspath/p:lib/alpn/alpn-boot-8.1.11.v20170118.jar diff --git a/pom.xml b/pom.xml index d168aac5495..5e024f098e0 100644 --- a/pom.xml +++ b/pom.xml @@ -1389,5 +1389,29 @@ 8.1.11.v20170118 + + 8u151 + + + java.version + 1.8.0_151 + + + + 8.1.11.v20170118 + + + + 8u152 + + + java.version + 1.8.0_152 + + + + 8.1.11.v20170118 + + From 9356bd557b1838804502f2e7c0d4ace18b8d0864 Mon Sep 17 00:00:00 2001 From: WalkerWatch Date: Wed, 18 Oct 2017 16:28:17 -0400 Subject: [PATCH 2/3] Fixing link discrepancy --- .../asciidoc/development/handlers/writing-custom-handlers.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc b/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc index 1fc7b2418a3..c5238666e60 100644 --- a/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc +++ b/jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc @@ -171,4 +171,4 @@ This is typically used to pass a request to a link:{JDURL}/org/eclipse/jetty/ser [[more-about-handlers]] ==== More About Handlers -See the link:{JDURL}/[latest Jetty Source XRef] and the link:{JDURL}/[latest Jetty JavaDoc] for detailed information on each Jetty handler. +See the link:{JDURL}/[latest Jetty JavaDoc] for detailed information on each Jetty handler. From 9947a497a618648b77122eae03cfb66f264a8e6d Mon Sep 17 00:00:00 2001 From: WalkerWatch Date: Wed, 18 Oct 2017 16:38:20 -0400 Subject: [PATCH 3/3] Fixed war name --- .../asciidoc/quick-start/getting-started/jetty-deploying.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc index 19167c778b2..ee8b2ed5855 100644 --- a/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc +++ b/jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-deploying.adoc @@ -64,7 +64,7 @@ The demo-base/webapps directory contains the following deployable and auxiliary `test-spec.xml`:: A context configuration file that configures `test-spec.war`. Additional configuration includes setting up some objects in the naming space that can be referenced by annotations. -`xref-proxy.war`:: - A demonstration web application that uses a transparent proxy to serve the Jetty source link:{JDURL}/[xref] from the http://www.eclipse.org/jetty[Eclipse Jetty website]. +`javadoc-proxy.war`:: + A demonstration web application that uses a transparent proxy to serve the Jetty source link:{JDURL}/[Javadoc] from the http://www.eclipse.org/jetty[Eclipse Jetty website]. `example-moved.xml`:: A demonstration context configuration file that shows how to use the link:#moved-context-handler[`MovedContextHandler`] to redirect from one path to another.