Update to temporarily use jsp 2.3 and el 3.0 from maven

3 files changed, 81 insertions, 5 deletions

diff --git a/jetty-distribution/pom.xml b/jetty-distribution/pom.xml
index 24b08f0ee9..26c4399a9b 100644
--- a/jetty-distribution/pom.xml
+++ b/jetty-distribution/pom.xml
@@ -297,7 +297,7 @@
             <configuration>
               <includeGroupIds>org.eclipse.jetty</includeGroupIds>
               <excludeGroupIds>org.eclipse.jetty.orbit,org.eclipse.jetty.spdy,org.eclipse.jetty.websocket,org.eclipse.jetty.drafts</excludeGroupIds>
-              <excludeArtifactIds>jetty-all,jetty-start,jetty-monitor,jetty-jsp</excludeArtifactIds>
+              <excludeArtifactIds>jetty-all,jetty-start,jetty-monitor</excludeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib</outputDirectory>
             </configuration>
@@ -430,8 +430,8 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
-              <includeArtifactIds>com.sun.el,javax.el,javax.servlet.jsp,javax.servlet.jsp.jstl,org.apache.jasper.glassfish,org.apache.taglibs.standard.glassfish,org.eclipse.jdt.core</includeArtifactIds>
+              <includeGroupIds>org.eclipse.jetty.orbit,org.glassfish.web, org.glassfish, javax.servlet.jsp</includeGroupIds>
+              <includeArtifactIds>javax.servlet.jsp.jstl,org.apache.taglibs.standard.glassfish,org.eclipse.jdt.core, javax.servlet.jsp-api, javax.servlet.jsp, javax.el</includeArtifactIds>
               <includeTypes>jar</includeTypes>
               <outputDirectory>${assembly-directory}/lib/jsp</outputDirectory>
             </configuration>
@@ -515,6 +515,23 @@
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.security.auth.message</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty.orbit</groupId>
+      <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>javax.servlet.jsp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish</groupId>
+      <artifactId>javax.el</artifactId>
+    </dependency>
 
     <!-- jetty deps -->
     <dependency>
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index bf283ef0a4..0cb400d2cc 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -14,6 +14,12 @@
   <dependencies>
     <!-- JSP Api -->
     <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>javax.servlet.jsp-api</artifactId>
+      <version>2.3.1</version>
+    </dependency>
+<!--
+    <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.servlet.jsp</artifactId>
       <version>2.2.0.v201112011158</version>
@@ -24,8 +30,15 @@
         </exclusion>
       </exclusions>
     </dependency>
+-->
     <!-- JSP Impl -->
     <dependency>
+      <groupId>org.glassfish.web</groupId>
+      <artifactId>javax.servlet.jsp</artifactId>
+      <version>2.3.1</version>
+    </dependency>
+<!--
+    <dependency>
        <groupId>org.eclipse.jetty.orbit</groupId>
        <artifactId>org.apache.jasper.glassfish</artifactId>
        <version>2.2.2.v201112011158</version>
@@ -36,6 +49,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+-->
     <!-- JSTL Api -->
     <dependency>
        <groupId>org.eclipse.jetty.orbit</groupId>
@@ -46,6 +60,10 @@
           <groupId>org.eclipse.jetty.orbit</groupId>
           <artifactId>javax.servlet</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>org.eclipse.jetty.orbit</groupId>
+          <artifactId>javax.servlet.jsp</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <!-- JSTL Impl -->
@@ -62,6 +80,12 @@
     </dependency>
     <!-- EL Api -->
     <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.el</artifactId>
+        <version>3.0-b07</version>
+    </dependency>
+<!--
+    <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.el</artifactId>
       <version>2.2.0.v201303151357</version>
@@ -72,7 +96,9 @@
         </exclusion>
       </exclusions>
     </dependency>
+-->
     <!-- EL Impl -->
+<!--
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>com.sun.el</artifactId>
@@ -84,6 +110,7 @@
         </exclusion>
       </exclusions>
     </dependency>
+-->
     <!-- Eclipse Java Compiler (for JSP Compilation) -->
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
diff --git a/pom.xml b/pom.xml
index 2d5c3aac11..b2a87de7d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,8 +149,8 @@
                   <excludes>
 <!--
                     <exclude>javax.servlet</exclude>
--->
                     <exclude>javax.servlet.jsp</exclude>
+-->
                     <exclude>org.apache.geronimo.specs</exclude>
                     <exclude>javax.mail</exclude>
                     <exclude>javax.activation</exclude>
@@ -508,11 +508,25 @@
         <artifactId>javax.servlet.jsp</artifactId>
         <version>2.1.0.v201105211820</version>
       </dependency>
+      -->
+      <dependency>
+        <groupId>javax.servlet.jsp</groupId>
+        <artifactId>javax.servlet.jsp-api</artifactId>
+        <version>2.3.1</version>
+      </dependency>
+
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>javax.servlet.jsp.jstl</artifactId>
         <version>1.2.0.v201105211821</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet.jsp</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
+<!--
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>javax.el</artifactId>
@@ -523,22 +537,40 @@
         <artifactId>com.sun.el</artifactId>
         <version>1.0.0.v201105211818</version>
       </dependency>
+-->
+      <dependency>
+        <groupId>org.glassfish</groupId>
+        <artifactId>javax.el</artifactId>
+        <version>3.0-b07</version>
+      </dependency>
+<!--
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>org.apache.jasper.glassfish</artifactId>
         <version>2.1.0.v201110031002</version>
       </dependency>
+-->
+      <dependency>
+        <groupId>org.glassfish.web</groupId>
+        <artifactId>javax.servlet.jsp</artifactId>
+        <version>2.3.1</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>org.apache.taglibs.standard.glassfish</artifactId>
         <version>1.2.0.v201112081803</version>
+        <exclusions>
+          <exclusion>
+            <groupId>org.eclipse.jetty.orbit</groupId>
+            <artifactId>javax.servlet.jsp</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.eclipse.jetty.orbit</groupId>
         <artifactId>org.eclipse.jdt.core</artifactId>
         <version>3.7.1</version>
       </dependency>
-        -->
 
       <!-- Old Deps -->
       <dependency>