You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2013/01/07 19:00:01 UTC
svn commit: r1429925 - in /rave/trunk: pom.xml
rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
Author: jasha
Date: Mon Jan 7 18:00:01 2013
New Revision: 1429925
URL: http://svn.apache.org/viewvc?rev=1429925&view=rev
Log:
RAVE-866 fix duplicate jars in rave-shindig
Explicitly define version for httpcore/httpclient
Modified:
rave/trunk/pom.xml
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
Modified: rave/trunk/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/pom.xml?rev=1429925&r1=1429924&r2=1429925&view=diff
==============================================================================
--- rave/trunk/pom.xml (original)
+++ rave/trunk/pom.xml Mon Jan 7 18:00:01 2013
@@ -70,6 +70,8 @@
<jackson.version>1.9.11</jackson.version>
<json.version>20090211</json.version>
<guice.version>3.0</guice.version>
+ <httpclient.version>4.2.2</httpclient.version>
+ <httpcore.version>4.2.3</httpcore.version>
<cobertura.version>2.5.2</cobertura.version>
<org.hamcrest.version>1.3</org.hamcrest.version>
<tiles.version>2.2.2</tiles.version>
@@ -342,6 +344,16 @@
<version>${jstl.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
<version>${openjpa.version}</version>
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml?rev=1429925&r1=1429924&r2=1429925&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/pom.xml Mon Jan 7 18:00:01 2013
@@ -105,6 +105,10 @@
<excludes>
<exclude>WEB-INF/lib/commons-logging-*.jar</exclude>
<exclude>WEB-INF/lib/slf4j-*.jar</exclude>
+ <exclude>WEB-INF/lib/commons-codec-*.jar</exclude>
+ <exclude>WEB-INF/lib/httpclient-*.jar</exclude>
+ <exclude>WEB-INF/lib/httpcore-*.jar</exclude>
+ <exclude>WEB-INF/lib/icu4j-*.jar</exclude>
</excludes>
</overlay>
</overlays>
@@ -140,6 +144,12 @@
<dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-jpa</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</profile>
@@ -149,6 +159,12 @@
<dependency>
<groupId>org.apache.rave</groupId>
<artifactId>rave-mongodb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</profile>