Merge branch 'jetty-9.3' into dev

dekellum · Aug 9, 2016 · 9ca80fa · 9ca80fa
2 parents a2377e7 + 71c5ada
commit 9ca80fa
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 21 deletions.
diff --git a/jetty/Gemfile.lock b/jetty/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rjack-jetty (9.3.10.0-java)
+    rjack-jetty (9.3.11.0-java)
 
 GEM
   remote: https://rubygems.org/

diff --git a/jetty/History.rdoc b/jetty/History.rdoc
@@ -1,3 +1,6 @@
+=== 9.3.11.0 (TBD)
+* Update to Jetty 9.3.11.v20160721
+
 === 9.3.10.0 (2016-7-18)
 * Update to Jetty 9.3.10.v20160621
 
@@ -44,6 +47,9 @@
 * Add ServerFactory#connections (and host) properties for creating
   multiple tcp/ssl connectors.
 
+=== 9.2.18.0 (2016-8-5)
+* Update to Jetty 9.2.18.v20160721
+
 === 9.2.17.0 (2016-7-17)
 * Update to Jetty 9.2.17.v20160517
 

diff --git a/jetty/Manifest.txt b/jetty/Manifest.txt
@@ -17,15 +17,15 @@ webapps/test/index.html
 webapps/test/WEB-INF/web.xml
 webapps/test.war
 lib/rjack-jetty/javax.servlet-api-3.1.0.jar
-lib/rjack-jetty/jetty-client-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-continuation-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-http-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-io-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-rewrite-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-security-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-server-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-servlet-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-util-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-webapp-9.3.10.v20160621.jar
-lib/rjack-jetty/jetty-xml-9.3.10.v20160621.jar
+lib/rjack-jetty/jetty-client-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-continuation-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-http-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-io-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-rewrite-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-security-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-server-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-servlet-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-util-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-webapp-9.3.11.v20160721.jar
+lib/rjack-jetty/jetty-xml-9.3.11.v20160721.jar
 lib/rjack-jetty/rjack-jetty-1.0.jar
diff --git a/jetty/lib/rjack-jetty/base.rb b/jetty/lib/rjack-jetty/base.rb
@@ -16,9 +16,9 @@
 
 module RJack
   module Jetty
-    JETTY_VERSION = '9.3.10'
+    JETTY_VERSION = '9.3.11'
     VERSION = JETTY_VERSION + '.0'
-    JETTY_BUILD = 'v20160621'
+    JETTY_BUILD = 'v20160721'
     SERVLET_API_VERSION = '3.1.0'
 
     JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:

diff --git a/jetty/pom.xml b/jetty/pom.xml
@@ -16,43 +16,43 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.3.10.v20160621</version>
+      <version>9.3.11.v20160721</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.3.10.v20160621</version>
+      <version>9.3.11.v20160721</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
-      <version>9.3.10.v20160621</version>
+      <version>9.3.11.v20160721</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>9.3.10.v20160621</version>
+      <version>9.3.11.v20160721</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-rewrite</artifactId>
-      <version>9.3.10.v20160621</version>
+      <version>9.3.11.v20160721</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.3.10.v20160621</version>
+      <version>9.3.11.v20160721</version>
     </dependency>
 
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-continuation</artifactId>
-      <version>9.3.10.v20160621</version>
+      <version>9.3.11.v20160721</version>
     </dependency>
 
   </dependencies>