configuring tomcat maven plugin too
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f6f1be62 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f6f1be62 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f6f1be62 Branch: refs/heads/master Commit: f6f1be62b943c93b67938a7af517f561532290c0 Parents: 7999dd0 Author: olivier lamy <[email protected]> Authored: Tue Aug 28 23:58:06 2012 +0200 Committer: olivier lamy <[email protected]> Committed: Tue Aug 28 23:58:06 2012 +0200 ---------------------------------------------------------------------- client/pom.xml | 19 +++++++++++++++++-- server/pom.xml | 2 +- 2 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f6f1be62/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index c537110..1525a7c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -114,6 +114,12 @@ <groupId>org.apache.cloudstack</groupId> <artifactId>cloud-plugin-hypervisor-kvm</artifactId> <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.cloudstack</groupId> @@ -155,8 +161,17 @@ </connector> </connectors> <contextPath>/client</contextPath> - <webXml>./WEB-INF/web.xml</webXml> - <webAppSourceDirectory>./target/generated-webapp</webAppSourceDirectory> + <webXml>${basedir}/WEB-INF/web.xml</webXml> + <webAppSourceDirectory>${basedir}/target/generated-webapp</webAppSourceDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.0-beta-1</version> + <configuration> + <tomcatWebXml>${basedir}/WEB-INF/web.xml</tomcatWebXml> + <warSourceDirectory>./target/generated-webapp</warSourceDirectory> </configuration> </plugin> <plugin> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f6f1be62/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 3731f71..f7178d8 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -35,7 +35,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>${cs.servlet.version}</version> <scope>provided</scope> </dependency> <dependency>
