1 files changed, 34 insertions, 2 deletions
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>