Permalink
Browse files

Merge branch 'jetty-7.6.x' into dev

  • Loading branch information...
2 parents 079b552 + 857928c commit c2ce1c91d1a79ab81d3d576bc4e3427babba40bb @dekellum committed Mar 11, 2012
View
@@ -1,13 +1,13 @@
PATH
remote: .
specs:
- rjack-jetty-jsp (7.6.0.0-java)
- rjack-jetty (~> 7.6.0.0)
+ rjack-jetty-jsp (7.6.2.0-java)
+ rjack-jetty (~> 7.6.2.0)
PATH
remote: /home/david/src/rjack/jetty
specs:
- rjack-jetty (7.6.0.0-java)
+ rjack-jetty (7.6.2.0-java)
GEM
remote: http://rubygems.org/
View
@@ -1,3 +1,6 @@
+=== 7.6.2.0 (TBD)
+* Update to Jetty 7.6.2.v20120308
+
=== 7.6.0.0 (2012-1-29)
* Update to Jetty 7.6.0.v20120127. The jetty-jsp-2.1 jar is no longer
required or available with jetty 7.6.0,
@@ -17,10 +17,10 @@
module RJack
module Jetty
module Jsp
- JETTY_VERSION = '7.6.0'
+ JETTY_VERSION = '7.6.2'
GEM_VERSION = '0'
VERSION = [ JETTY_VERSION, GEM_VERSION ].join( '.' )
- JETTY_BUILD = 'v20120127'
+ JETTY_BUILD = 'v20120308'
JSP_VERSION = '2.1'
JETTY_JSP_DIR = File.dirname( __FILE__ ) # :nodoc:
View
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- rjack-jetty (7.6.0.0-java)
+ rjack-jetty (7.6.2.0-java)
GEM
remote: http://rubygems.org/
View
@@ -1,3 +1,6 @@
+=== 7.6.2.0 (TBD)
+* Update to Jetty 7.6.2.v20120308
+
=== 7.6.0.0 (2012-1-29)
* Update to Jetty 7.6.0.v20120127
* Upgrade to tarpit ~> 2.0 (build)
View
@@ -15,16 +15,16 @@ test/test_jetty.rb
webapps/test/index.html
webapps/test/WEB-INF/web.xml
webapps/test.war
-lib/rjack-jetty/jetty-client-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-continuation-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-http-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-io-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-rewrite-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-security-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-server-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-servlet-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-util-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-webapp-7.6.0.v20120127.jar
-lib/rjack-jetty/jetty-xml-7.6.0.v20120127.jar
+lib/rjack-jetty/jetty-client-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-continuation-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-http-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-io-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-rewrite-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-security-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-server-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-servlet-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-util-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-webapp-7.6.2.v20120308.jar
+lib/rjack-jetty/jetty-xml-7.6.2.v20120308.jar
lib/rjack-jetty/rjack-jetty-1.0.jar
lib/rjack-jetty/servlet-api-2.5.jar
@@ -16,9 +16,9 @@
module RJack
module Jetty
- JETTY_VERSION = '7.6.0'
+ JETTY_VERSION = '7.6.2'
VERSION = JETTY_VERSION + '.0'
- JETTY_BUILD = 'v20120127'
+ JETTY_BUILD = 'v20120308'
SERVLET_API_VERSION = '2.5'
JETTY_DIR = File.dirname( __FILE__ ) # :nodoc:
View
@@ -16,37 +16,43 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
- <version>7.6.0.v20120127</version>
+ <version>7.6.2.v20120308</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>7.6.0.v20120127</version>
+ <version>7.6.2.v20120308</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
- <version>7.6.0.v20120127</version>
+ <version>7.6.2.v20120308</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>7.6.0.v20120127</version>
+ <version>7.6.2.v20120308</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-rewrite</artifactId>
- <version>7.6.0.v20120127</version>
+ <version>7.6.2.v20120308</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-client</artifactId>
- <version>7.6.0.v20120127</version>
+ <version>7.6.2.v20120308</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
</dependency>
</dependencies>

0 comments on commit c2ce1c9

Please sign in to comment.