rjack-jetty-jsp 7.5.3.0-java → 7.5.4.0-java

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 7.5.4.0 (2011-11-5)
+* Update to Jetty 7.5.4.v20111024
+* Includes glassfish jsp-impl 2.3.1-b10, ecj 3.7
+
 === 7.5.3.0 (2011-10-16)
 * Update to Jetty 7.5.3.v20111011
 

data/Manifest.txt

@@ -10,7 +10,8 @@ test/test_jsp.rb
 webapps/test/index.jsp
 webapps/test/WEB-INF/web.xml
 webapps/test.war
-lib/rjack-jetty-jsp/ecj-3.5.1.jar
-lib/rjack-jetty-jsp/jetty-jsp-2.1-7.5.3.v20111011.jar
-lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20100127.jar
-lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20100127.jar
+lib/rjack-jetty-jsp/ecj-3.7.jar
+lib/rjack-jetty-jsp/el-api-2.1.2-b02.jar
+lib/rjack-jetty-jsp/jetty-jsp-2.1-7.5.4.v20111024.jar
+lib/rjack-jetty-jsp/jsp-api-2.1.3-b02.jar
+lib/rjack-jetty-jsp/jsp-impl-2.1.3-b10.jar

data/assembly.xml

@@ -9,9 +9,10 @@
       <useProjectArtifact>false</useProjectArtifact>
       <includes>
         <include>org.eclipse.jetty:jetty-jsp-2.1</include>
-        <include>org.mortbay.jetty:jsp-api-2.1-glassfish</include>
-        <include>org.mortbay.jetty:jsp-2.1-glassfish</include>
+        <include>org.glassfish.web:jsp-impl</include>
         <include>org.eclipse.jdt.core.compiler:ecj</include>
+        <include>javax.servlet.jsp:jsp-api</include>
+        <include>javax.el:el-api</include>
       </includes>
     </dependencySet>
   </dependencySets>

data/lib/rjack-jetty-jsp/base.rb

@@ -17,10 +17,10 @@
 module RJack
   module Jetty
     module Jsp
-      JETTY_VERSION = '7.5.3'
+      JETTY_VERSION = '7.5.4'
       GEM_VERSION = '0'
       VERSION = [ JETTY_VERSION, GEM_VERSION ].join( '.' )
-      JETTY_BUILD = 'v20111011'
+      JETTY_BUILD = 'v20111024'
       JSP_VERSION = '2.1'
 
       JETTY_JSP_DIR = File.dirname( __FILE__ ) # :nodoc:

data/pom.xml

@@ -14,18 +14,17 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-jsp-2.1</artifactId>
-      <version>7.5.3.v20111011</version>
+      <version>7.5.4.v20111024</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-2.1-glassfish</artifactId>
-      <version>2.1.v20100127</version>
-      <exclusions>
-        <exclusion>
-          <groupId>org.mortbay.jetty</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>jsp-impl</artifactId>
+      <version>2.1.3-b10</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jdt.core.compiler</groupId>
+      <artifactId>ecj</artifactId>
+      <version>3.7</version>
     </dependency>
   </dependencies>
 

metadata

@@ -2,7 +2,7 @@
 name: rjack-jetty-jsp
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 7.5.3.0
+  version: 7.5.4.0
 platform: java
 authors: 
   - David Kellum
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-16 00:00:00 Z
+date: 2011-11-06 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rjack-jetty
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 7.5.3.0
+            version: 7.5.4.0
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -61,10 +61,11 @@ files:
   - webapps/test/index.jsp
   - webapps/test/WEB-INF/web.xml
   - webapps/test.war
-  - lib/rjack-jetty-jsp/ecj-3.5.1.jar
-  - lib/rjack-jetty-jsp/jetty-jsp-2.1-7.5.3.v20111011.jar
-  - lib/rjack-jetty-jsp/jsp-2.1-glassfish-2.1.v20100127.jar
-  - lib/rjack-jetty-jsp/jsp-api-2.1-glassfish-2.1.v20100127.jar
+  - lib/rjack-jetty-jsp/ecj-3.7.jar
+  - lib/rjack-jetty-jsp/el-api-2.1.2-b02.jar
+  - lib/rjack-jetty-jsp/jetty-jsp-2.1-7.5.4.v20111024.jar
+  - lib/rjack-jetty-jsp/jsp-api-2.1.3-b02.jar
+  - lib/rjack-jetty-jsp/jsp-impl-2.1.3-b10.jar
   - .gemtest
 homepage: http://rjack.rubyforge.org/jetty-jsp
 licenses: []
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rjack-jetty-jsp
-rubygems_version: 1.8.10
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: A gem packaging of the {Jetty Web Server}[http://www.mortbay.org/jetty/] JSP 2.1 support for JRuby