diff options
| author | Jan Bartel | 2012-09-07 03:46:51 +0000 |
|---|---|---|
| committer | Jan Bartel | 2012-10-27 06:38:43 +0000 |
| commit | 958d0c6949b7d3d188a6eef51318f099f0928cad (patch) | |
| tree | dd8063ae6d68b17c7c6ed2ff941f49441c833390 /pom.xml | |
| parent | 605b0360e18b4b99341a207a22f8b547989af8ae (diff) | |
| download | org.eclipse.jetty.project-958d0c6949b7d3d188a6eef51318f099f0928cad.tar.gz org.eclipse.jetty.project-958d0c6949b7d3d188a6eef51318f099f0928cad.tar.xz org.eclipse.jetty.project-958d0c6949b7d3d188a6eef51318f099f0928cad.zip | |
Start incorporating (EDR version) servlet 3.1 spec
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -147,7 +147,9 @@ <!-- Banned Dependencies (should use Orbit based versions now) --> <bannedDependencies> <excludes> +<!-- <exclude>javax.servlet</exclude> +--> <exclude>javax.servlet.jsp</exclude> <exclude>org.apache.geronimo.specs</exclude> <exclude>javax.mail</exclude> @@ -156,8 +158,16 @@ <!-- allowed combinations --> <includes> <include>org.apache.geronimo.specs:geronimo-atinject_1.0_spec:jar:*</include> +<!-- <include>javax.servlet:*:*:*:provided</include> +--> <include>javax.servlet.jsp:*:*:*:provided</include> + <include>javax.servlet</include> +<!-- + <include>org.apache.geronimo.specs</include> + <include>javax.mail</include> + <include>javax.activation</include> +--> </includes> <searchTransitive>true</searchTransitive> <message>This dependency is banned, use the ORBIT provided dependency instead.</message> @@ -430,9 +440,14 @@ <dependencies> <!-- Orbit Deps --> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet-api</artifactId> + <version>3.1-b01</version> +<!-- <groupId>org.eclipse.jetty.orbit</groupId> <artifactId>javax.servlet</artifactId> <version>3.0.0.v201112011016</version> +--> </dependency> <dependency> <groupId>org.eclipse.jetty.orbit</groupId> |