Author: nilsga
Date: Mon Nov 5 01:57:38 2007
New Revision: 591939
URL: http://svn.apache.org/viewvc?rev=591939&view=rev
Log:
WW-2295 Exclude servlet-api from beeing included from commons-digester.
Modified:
struts/struts2/trunk/apps/portlet/pom.xml
Modified: struts/struts2/trunk/apps/portlet/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/portlet/pom.xml?rev=591939&r1=591938&r2=591939&view=diff
==============================================================================
--- struts/struts2/trunk/apps/portlet/pom.xml (original)
+++ struts/struts2/trunk/apps/portlet/pom.xml Mon Nov 5 01:57:38 2007
@@ -39,38 +39,59 @@
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/apps/portlet/</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/apps/portlet/</url>
</scm>
-
- <profiles>
- <profile>
- <id>pluto</id>
- <build>
- <plugins>
- <!-- configure maven-war-plugin to use updated web.xml -->
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
-
<webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
- </configuration>
- </plugin>
- <!-- bind 'pluto:assemble' goal to 'process-resources' lifecycle
-->
- <plugin>
- <groupId>org.apache.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <version>1.1.3</version>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
+
+ <profiles>
+ <profile>
+ <id>pluto</id>
+ <build>
+ <plugins>
+ <!-- configure maven-war-plugin to use
updated web.xml -->
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+
<webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <!-- bind 'pluto:assemble' goal to
'process-resources' lifecycle -->
+ <plugin>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <version>1.1.3</version>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>maven-jetty-plugin</artifactId>
+ <configuration>
+
<webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+
<webDefaultXml>src/main/webapp/WEB-INF/jetty-pluto-web-default.xml</webDefaultXml>
+ <systemProperties>
+ <systemProperty>
+
<name>org.apache.pluto.embedded.portletId</name>
+ <value>StrutsPortlet</value>
+ </systemProperty>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>com.bekk.boss</groupId>
+
<artifactId>maven-jetty-pluto-embedded</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>portlet-api</groupId>
@@ -108,6 +129,12 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
@@ -130,7 +157,40 @@
<artifactId>commons-lang</artifactId>
<version>2.0</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>6.1.4rc0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sourceforge.jwebunit</groupId>
+ <artifactId>jwebunit-htmlunit-plugin</artifactId>
+ <version>1.4.1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.bekk.boss</groupId>
+ <artifactId>maven-jetty-pluto-embedded</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ <version>6.1.4rc0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.1</version>
+ </dependency>
</dependencies>
