Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2013-06-21 08:41:35 +0000
committerJan Bartel2013-06-21 08:41:35 +0000
commit4f6732a7e9ac5df843990d6141955d71a5f633bd (patch)
treeae717a6e94d0af5a45a7590e5ae499f218694e16 /jetty-jsp/pom.xml
parentb0064961985374f1eec5720a52abcc715782914e (diff)
downloadorg.eclipse.jetty.project-4f6732a7e9ac5df843990d6141955d71a5f633bd.tar.gz
org.eclipse.jetty.project-4f6732a7e9ac5df843990d6141955d71a5f633bd.tar.xz
org.eclipse.jetty.project-4f6732a7e9ac5df843990d6141955d71a5f633bd.zip
Use dependencyManagement to control servlet-api and jsp related jars; update to latest servlet-api and el jars post spec finalization.
Diffstat (limited to 'jetty-jsp/pom.xml')
-rw-r--r--jetty-jsp/pom.xml64
1 files changed, 9 insertions, 55 deletions
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml
index 4ee8294076..76ae6ef396 100644
--- a/jetty-jsp/pom.xml
+++ b/jetty-jsp/pom.xml
@@ -17,40 +17,13 @@
<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>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </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>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
</dependency>
--->
+
<!-- JSTL Api -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -79,39 +52,21 @@
</exclusion>
</exclusions>
</dependency>
+
<!-- EL Api -->
+
+ <!-- EL Impl -->
<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>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
--->
- <!-- EL Impl -->
-<!--
+
+
<dependency>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>com.sun.el</artifactId>
- <version>2.2.0.v201303151357</version>
- <exclusions>
- <exclusion>
- <groupId>org.eclipse.jetty.orbit</groupId>
- <artifactId>javax.servlet</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>javax.el</groupId>
+ <artifactId>javax.el-api</artifactId>
</dependency>
--->
+
<!-- Eclipse Java Compiler (for JSP Compilation) -->
<dependency>
<groupId>org.eclipse.jetty.orbit</groupId>
@@ -127,7 +82,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
- <version>3.1-b08</version>
</dependency>
</dependencies>
</project>

Back to the top