Updated Branches: refs/heads/wicket-6.x 632e4a37c -> 2ee020c97
'exclude' dependency to javax.servlet-api 2.5, otherwise wicket-examples will not run in Eclipse with wicket-cdi requiring Servlet 3 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2ee020c9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2ee020c9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2ee020c9 Branch: refs/heads/wicket-6.x Commit: 2ee020c974e9cd636d22f1b8a141cc4c576e899c Parents: 632e4a3 Author: svenmeier <[email protected]> Authored: Wed Feb 5 12:05:27 2014 +0100 Committer: svenmeier <[email protected]> Committed: Wed Feb 5 12:05:27 2014 +0100 ---------------------------------------------------------------------- wicket-examples/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2ee020c9/wicket-examples/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 1cb3313..3486681 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -135,6 +135,14 @@ <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>
