jetty 6.1.11.1 → 6.1.12.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 6.1.12.1 / 2008-11-07
+
+* Update to Jetty 6.1.12
+* Fixed packaging of test.war
+
 === 6.1.11.1 / 2008-11-02
 
 * Inital release based on Jetty Web Server 6.1.11

data/Manifest.txt

@@ -15,8 +15,8 @@ test/test_jetty.rb
 webapps/test.war
 webapps/test/WEB-INF/web.xml
 webapps/test/index.html
-lib/jetty/jetty-6.1.11.jar
-lib/jetty/jetty-util-6.1.11.jar
-lib/jetty/jetty-rewrite-handler-6.1.11.jar
-lib/jetty/servlet-api-2.5-6.1.11.jar
+lib/jetty/jetty-6.1.12.jar
+lib/jetty/jetty-util-6.1.12.jar
+lib/jetty/jetty-rewrite-handler-6.1.12.jar
+lib/jetty/servlet-api-2.5-6.1.12.jar
 lib/jetty/gravitext-testservlets-1.0.jar

data/Rakefile

@@ -65,7 +65,8 @@ ASSEMBLY = "target/gravitext-testservlets-1.0-bin.dir"
 
 file 'webapps/test.war' => [ 'webapps/test/index.html', 
                              'webapps/test/WEB-INF/web.xml' ] do
-  sh( 'jar cvf webapps/test.war -C webapps/test .' )
+  sh( 'jar cvf webapps/test.war ' + 
+      '-C webapps/test index.html -C webapps/test WEB-INF/web.xml' )
 end
 
 file ASSEMBLY => [ 'pom.xml', 'assembly.xml' ] do
@@ -78,10 +79,10 @@ JARS.each do |jar|
   end
 end
 
-[ :gem, :test ].each { |t| task t => JAR_FILES }
+[ :gem, :test ].each { |t| task t => JAR_FILES + [ 'webapps/test.war' ] }
 
 task :mvn_clean do
-  rm_f( JAR_FILES )
+  rm_f( JAR_FILES + [ 'webapps/test.war' ] )
   sh( 'mvn clean' )
 end
 task :clean => :mvn_clean 

data/lib/jetty/base.rb

@@ -15,7 +15,7 @@
 #++
 
 module JettyBase
-  JETTY_VERSION = '6.1.11'
+  JETTY_VERSION = '6.1.12'
   VERSION = JETTY_VERSION + '.1'
   SERVLET_API_VERSION = '2.5'
 

data/pom.xml

@@ -11,25 +11,25 @@
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>servlet-api-2.5</artifactId>
-      <version>6.1.11</version>
+      <version>6.1.12</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
+      <version>6.1.12</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-util</artifactId>
-      <version>6.1.11</version>
+      <version>6.1.12</version>
     </dependency>
 
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty-rewrite-handler</artifactId>
-      <version>6.1.11</version>
+      <version>6.1.12</version>
     </dependency>
 
   </dependencies>

metadata

@@ -53,10 +53,10 @@ files:
 - webapps/test.war
 - webapps/test/WEB-INF/web.xml
 - webapps/test/index.html
-- lib/jetty/jetty-6.1.11.jar
-- lib/jetty/jetty-util-6.1.11.jar
-- lib/jetty/jetty-rewrite-handler-6.1.11.jar
-- lib/jetty/servlet-api-2.5-6.1.11.jar
+- lib/jetty/jetty-6.1.12.jar
+- lib/jetty/jetty-util-6.1.12.jar
+- lib/jetty/jetty-rewrite-handler-6.1.12.jar
+- lib/jetty/servlet-api-2.5-6.1.12.jar
 - lib/jetty/gravitext-testservlets-1.0.jar
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
@@ -71,12 +71,12 @@ requirements: []
 
 authors: 
 - David Kellum
-date: 2008-11-03 08:00:00 +00:00
+date: 2008-11-09 08:00:00 +00:00
 platform: ruby
 test_files: 
 - test/test_jetty.rb
 version: !ruby/object:Gem::Version 
-  version: 6.1.11.1
+  version: 6.1.12.1
 require_paths: 
 - lib
 dependencies: