Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-05-09 03:17:46 -0400
committerJan Bartel2013-05-09 03:17:46 -0400
commitbd153af2e2be1ff762e20dc1b61f5b5494b6a1da (patch)
tree6632c1786134aa202047ce608bdc90986a042fdf /pom.xml
parent9b57f9e29a4d54af91959296d68e72c1a3c901bc (diff)
downloadorg.eclipse.jetty.project-bd153af2e2be1ff762e20dc1b61f5b5494b6a1da.tar.gz
org.eclipse.jetty.project-bd153af2e2be1ff762e20dc1b61f5b5494b6a1da.tar.xz
org.eclipse.jetty.project-bd153af2e2be1ff762e20dc1b61f5b5494b6a1da.zip
Update to temporarily use jsp 2.3 and el 3.0 from maven
Diffstat (limited to 'pom.xml')
-rw-r--r--pom.xml36
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>

Back to the top