From 13c3af2368f7552762bcbdf7c4dd5a019b1e449d Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Tue, 9 Aug 2011 18:03:37 +1000
Subject: [PATCH] Update to use jsp-2.2 from orbit repository.

---
 jetty-distribution/pom.xml | 20 +++-----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 8409b222faf..07192dbe2b8 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -23,7 +23,7 @@
     <orbit-org-apache-taglibs-standard-version>1.2.0.v201004190952</orbit-org-apache-taglibs-standard-version>
     <orbit-org-objectweb-asm-version>3.3.1.v201101071600</orbit-org-objectweb-asm-version>
     <orbit-javax-transaction-version>1.1.1.v201004190952</orbit-javax-transaction-version>
-    <!-- >orbit-org-apache-jasper-version>2.1.0.v201007080150</orbit-org-apache-jasper-version -->
+    <orbit-org-apache-jasper-version>2.2.2.v201108011116</orbit-org-apache-jasper-version>
   </properties>
   <build>
     <plugins>
@@ -76,7 +76,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" />
@@ -124,7 +124,7 @@
                     <include name="javax.servlet.jsp.jstl_${orbit-javax-servlet-jsp-jstl-version}.jar" />
                     <include name="com.sun.el_${orbit-com-sun-el-version}.jar" />
                     <include name="org.apache.taglibs.standard.glassfish_${orbit-org-apache-taglibs-standard-version}.jar" />
-                    <!--  include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" / -->         
+                    <include name="org.apache.jasper.glassfish_${orbit-org-apache-jasper-version}.jar" />         
                   </fileset>
                 </copy>
                 <copy file="../VERSION.txt" todir="${assembly-directory}" />
@@ -543,15 +543,6 @@
                   <includes>**</includes>
                   <outputDirectory>${assembly-directory}/lib</outputDirectory>
                 </artifactItem>
-                <artifactItem>
-                  <groupId>org.mortbay.jetty</groupId>
-                  <artifactId>jsp-impl</artifactId>
-                  <version>2.2.2.b05.0</version>
-                  <type>jar</type>
-                  <overWrite>true</overWrite>
-                  <includes>**/**</includes>
-                  <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
-                </artifactItem>
               </artifactItems>
             </configuration>
           </execution>
@@ -676,10 +667,5 @@
       <artifactId>jetty-websocket</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jsp-impl</artifactId>
-      <version>2.2.2.b05.0</version>
-    </dependency>
   </dependencies>
 </project>