Author: lindner
Date: Wed Sep 1 10:08:21 2010
New Revision: 991493
URL: http://svn.apache.org/viewvc?rev=991493&view=rev
Log:
bump war plugin to final 2.1 release, fix jetty/jasper dependency version
numbers
Modified:
shindig/trunk/java/gadgets/pom.xml
shindig/trunk/pom.xml
Modified: shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/pom.xml?rev=991493&r1=991492&r2=991493&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/pom.xml (original)
+++ shindig/trunk/java/gadgets/pom.xml Wed Sep 1 10:08:21 2010
@@ -79,17 +79,6 @@
</plugins>
<resources>
<resource>
- <!-- duplicated here for the jar build. -->
- <!-- TODO: Eliminate duplicate copies in WAR output -->
- <!-- this is relative to the pom.xml directory -->
- <directory>${basedir}/../../content/</directory>
- <targetPath>files</targetPath>
- <includes>
- <include>**/*.*</include>
- </includes>
- </resource>
-
- <resource>
<targetPath>config</targetPath>
<directory>${basedir}/../../config</directory>
<includes>
@@ -234,7 +223,6 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.0.1</version>
</dependency>
<!-- test -->
Modified: shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=991493&r1=991492&r2=991493&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Wed Sep 1 10:08:21 2010
@@ -1075,7 +1075,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.1-beta-1</version>
+ <version>2.1</version>
</plugin>
<!-- Mojo -->
@@ -1114,7 +1114,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.24</version>
+ <version>6.1.25</version>
</plugin>
<plugin>
<groupId>org.apache.geronimo.genesis.plugins</groupId>
@@ -1483,7 +1483,7 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.22</version>
+ <version>6.1.25</version>
</dependency>
<dependency>
<groupId>joda-time</groupId>
@@ -1563,7 +1563,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>el-api</artifactId>
- <version>6.0.26</version>
+ <version>6.0.29</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
@@ -1582,11 +1582,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>net.sf.ezmorph</groupId>
- <artifactId>ezmorph</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.04</version>
