[gatein-commits] gatein SVN: r6264 - in components/wsrp/branches/2.0.x: common and 1 other directories.

Author: chris.laprun(a)jboss.com Date: 2011-04-18 08:38:56 -0400 (Mon, 18 Apr 2011) New Revision: 6264 Modified: components/wsrp/branches/2.0.x/common/pom.xml components/wsrp/branches/2.0.x/pom.xml components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml Log: - GTNWSRP-222: Replaced Google collections by Guava. Modified: components/wsrp/branches/2.0.x/common/pom.xml =================================================================== --- components/wsrp/branches/2.0.x/common/pom.xml 2011-04-18 10:53:41 UTC (rev 6263) +++ components/wsrp/branches/2.0.x/common/pom.xml 2011-04-18 12:38:56 UTC (rev 6264) @@ -21,7 +21,8 @@ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -66,8 +67,8 @@ <artifactId>saaj-api</artifactId> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> </dependency> <!-- tests --> Modified: components/wsrp/branches/2.0.x/pom.xml =================================================================== --- components/wsrp/branches/2.0.x/pom.xml 2011-04-18 10:53:41 UTC (rev 6263) +++ components/wsrp/branches/2.0.x/pom.xml 2011-04-18 12:38:56 UTC (rev 6264) @@ -56,7 +56,7 @@ <version.javax.mail>1.4.1</version.javax.mail> <version.javax.xml.ws>2.1</version.javax.xml.ws> <version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj> - <version.google-collections>1.0</version.google-collections> + <com.google.guava.version>r09</com.google.guava.version> </properties> <dependencyManagement> @@ -156,9 +156,9 @@ </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>${version.google-collections}</version> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>${com.google.guava.version}</version> </dependency> <!-- Modified: components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml =================================================================== --- components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 10:53:41 UTC (rev 6263) +++ components/wsrp/branches/2.0.x/wsrp-producer-war/src/test/assembly/test-producer.xml 2011-04-18 12:38:56 UTC (rev 6264) @@ -62,7 +62,7 @@ <include>junit:junit</include> <include>commons-fileupload:commons-fileupload</include> - <include>com.google.collections:google-collections</include> + <include>com.google.guava:guava</include> </includes> </dependencySet>