Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project

VERSION.txt

@@ -5,6 +5,7 @@ jetty-7.5.0-SNAPSHOT
  + 353624 HttpURI accepts java.net.URI object in constructor
  + 354080 ServletContextHandler allows to replace any subordinate handler when restarted
  + 356128 Moved integration tests from jetty-monitor to test-integration module
+ + 356137 Upgrade to jsp implementation version 2.1.3-b10
 
 jetty-7.5.0.RC1 - 19 August 2011
  + 276670 SLF4J loggers show correct location information

jetty-distribution/pom.xml

@@ -20,7 +20,8 @@
     <orbit-javax-servlet-jsp-version>2.1.0.v201004190952</orbit-javax-servlet-jsp-version>
     <orbit-javax-servlet-jsp-jstl-version>1.2.0.v201004190952</orbit-javax-servlet-jsp-jstl-version>
     <orbit-com-sun-el-version>1.0.0.v201004190952</orbit-com-sun-el-version>
-    <orbit-org-apache-jasper-version>2.1.0.v201007080150</orbit-org-apache-jasper-version>
+    <!-- orbit-org-apache-jasper-version>2.1.0.v201007080150</orbit-org-apache-jasper-version -->
+    <central-jsp-version>2.1.3-b10</central-jsp-version>
     <orbit-org-apache-taglibs-standard-version>1.2.0.v201004190952</orbit-org-apache-taglibs-standard-version>
     <orbit-org-objectweb-asm-version>3.1.0.v200803061910</orbit-org-objectweb-asm-version>
     <orbit-javax-transaction-version>1.1.1.v201004190952</orbit-javax-transaction-version>
@@ -76,7 +77,7 @@
                   <url url="${jetty-orbit-url}/javax.servlet.jsp_${orbit-javax-servlet-jsp-version}.jar" />
                   <url url="${jetty-orbit-url}/javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
                   <url url="${jetty-orbit-url}/com.sun.el_${orbit-com-sun-el-version}.jar" />
-                  <url url="${jetty-orbit-url}/org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />
+                  <!-- url url="${jetty-orbit-url}/org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" / -->
                   <url url="${jetty-orbit-url}/org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
                   <url url="${jetty-orbit-url}/org.objectweb.asm_${orbit-org-objectweb-asm-version}.jar" />
                   <url url="${jetty-orbit-url}/javax.transaction_${orbit-javax-transaction-version}.jar" />
@@ -544,6 +545,15 @@
                   <includes>**</includes>
                   <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.glassfish.web</groupId>
+                  <artifactId>jsp-impl</artifactId>
+                  <version>${central-jsp-version}</version>
+                  <type>jar</type>
+                  <overWrite>true</overWrite>
+                  <includes>**</includes>
+                  <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
+                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -663,5 +673,10 @@
       <artifactId>jetty-jsp-2.1</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>jsp-impl</artifactId>
+      <version>${central-jsp-version}</version>
+    </dependency>
   </dependencies>
 </project>