You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2012/01/31 02:27:55 UTC
svn commit: r1238125 - in /incubator/rave/trunk: pom.xml rave-shindig/pom.xml
Author: ate
Date: Tue Jan 31 01:27:55 2012
New Revision: 1238125
URL: http://svn.apache.org/viewvc?rev=1238125&view=rev
Log:
RAVE-453: fix duplicate jar problem with rave-shindig module caused by using a war overlay on shindig-server which maven cannot check and align on dependency resolution
See: https://issues.apache.org/jira/browse/RAVE-453
Modified:
incubator/rave/trunk/pom.xml
incubator/rave/trunk/rave-shindig/pom.xml
Modified: incubator/rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/pom.xml?rev=1238125&r1=1238124&r2=1238125&view=diff
==============================================================================
--- incubator/rave/trunk/pom.xml (original)
+++ incubator/rave/trunk/pom.xml Tue Jan 31 01:27:55 2012
@@ -59,7 +59,7 @@
<commons-validator.version>1.3.0</commons-validator.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-codec.version>1.4</commons-codec.version>
- <icu4j.version>4.6.1</icu4j.version>
+ <icu4j.version>4.8.1.1</icu4j.version>
<easymock.version>3.0</easymock.version>
<com.h2database.version>1.3.154</com.h2database.version>
<openjpa.version>2.1.1</openjpa.version>
Modified: incubator/rave/trunk/rave-shindig/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/pom.xml?rev=1238125&r1=1238124&r2=1238125&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/pom.xml (original)
+++ incubator/rave/trunk/rave-shindig/pom.xml Tue Jan 31 01:27:55 2012
@@ -170,6 +170,21 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <overlays>
+ <overlay>
+ <groupId>org.apache.shindig</groupId>
+ <artifactId>shindig-server</artifactId>
+ <excludes>
+ <exclude>WEB-INF/lib/json-20070829.jar</exclude>
+ </excludes>
+ </overlay>
+ </overlays>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>openjpa-maven-plugin</artifactId>
<version>1.2</version>