diff options
author | Jan Bartel | 2013-03-18 05:00:23 +0000 |
---|---|---|
committer | Jan Bartel | 2013-03-18 05:00:23 +0000 |
commit | 279dff381c170721addfb1783c298e8b0c20ace6 (patch) | |
tree | 172b22f2571b467a62c4f88ad1a60530cbb44015 /jetty-jsp | |
parent | c9db4ca8153661175080a9b5bd67ba3da365af8a (diff) | |
parent | d6cac8cf0dde2f8020800b9824c9df620495e524 (diff) | |
download | org.eclipse.jetty.project-279dff381c170721addfb1783c298e8b0c20ace6.tar.gz org.eclipse.jetty.project-279dff381c170721addfb1783c298e8b0c20ace6.tar.xz org.eclipse.jetty.project-279dff381c170721addfb1783c298e8b0c20ace6.zip |
Merge remote-tracking branch 'origin/master' into servlet-3.1-api
Conflicts:
jetty-osgi/pom.xml
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlets/pom.xml
tests/test-webapps/test-jetty-webapp/pom.xml
Diffstat (limited to 'jetty-jsp')
-rw-r--r-- | jetty-jsp/pom.xml | 44 |
1 files changed, 43 insertions, 1 deletions
diff --git a/jetty-jsp/pom.xml b/jetty-jsp/pom.xml index 593533c2ea..3ba7dd900a 100644 --- a/jetty-jsp/pom.xml +++ b/jetty-jsp/pom.xml @@ -2,7 +2,7 @@ <parent> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-project</artifactId> - <version>9.0.0-SNAPSHOT</version> + <version>9.0.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>jetty-jsp</artifactId> @@ -17,42 +17,84 @@ <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.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> <artifactId>javax.servlet.jsp.jstl</artifactId> <version>1.2.0.v201105211821</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> </dependency> <!-- JSTL Impl --> <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</artifactId> + </exclusion> + </exclusions> </dependency> <!-- EL Api --> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.el</artifactId> <version>2.2.0.v201108011116</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.v201108011116</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Eclipse Java Compiler (for JSP Compilation) --> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>org.eclipse.jdt.core</artifactId> <version>3.7.1</version> + <exclusions> + <exclusion> + <groupId>org.eclipse.jetty.orbit</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> |