Updated Branches: refs/heads/wicket-6.x 2ee020c97 -> 7cc191318
Revert "'exclude' dependency to javax.servlet-api 2.5, otherwise" This reverts commit 2ee020c974e9cd636d22f1b8a141cc4c576e899c. Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7cc19131 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7cc19131 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7cc19131 Branch: refs/heads/wicket-6.x Commit: 7cc191318ccdb98fc5b129b8f70f73de98b600e5 Parents: 2ee020c Author: svenmeier <[email protected]> Authored: Wed Feb 5 13:47:43 2014 +0100 Committer: svenmeier <[email protected]> Committed: Wed Feb 5 13:47:43 2014 +0100 ---------------------------------------------------------------------- wicket-examples/pom.xml | 8 -------- 1 file changed, 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7cc19131/wicket-examples/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 3486681..1cb3313 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -135,14 +135,6 @@ <groupId>org.apache.wicket</groupId> <artifactId>wicket-cdi-1.1</artifactId> </dependency> - <!-- wicket-cdi uses servlet-api 3, so override the 2.5 dependency from parent, - otherwise DispatcherType will not be available when run from Eclipse --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - <version>3.0.1</version> - <scope>provided</scope> - </dependency> <dependency> <groupId>javax.el</groupId> <artifactId>javax.el-api</artifactId>
