2:29 p.m.
Author: julien_viet
Date: 2011-04-27 15:29:38 -0400 (Wed, 27 Apr 2011)
New Revision: 6382
Modified:
portal/trunk/gadgets/server/pom.xml
portal/trunk/packaging/jboss-as5/pkg/pom.xml
portal/trunk/packaging/jboss-as6/pkg/pom.xml
portal/trunk/packaging/jetty/pkg/pom.xml
portal/trunk/packaging/tomcat/pkg/pom.xml
portal/trunk/pom.xml
Log:
GTNPORTAL-1885 : Update gatein-dep to 1.1.0-Beta02 and Shindig 1.0-r790473-Patch06
Modified: portal/trunk/gadgets/server/pom.xml
===================================================================
--- portal/trunk/gadgets/server/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/gadgets/server/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -102,8 +102,8 @@
</dependency>
-->
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -622,8 +622,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -613,8 +613,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -582,8 +582,8 @@
<artifactId>filters</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -580,8 +580,8 @@
<artifactId>filters</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -42,7 +42,7 @@
<org.exoplatform.core.version>2.4.0-CR1</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.0-CR1</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.14.0-CR1</org.exoplatform.jcr.version>
- <org.shindig.version>1.0-r790473-Patch05</org.shindig.version>
+ <org.shindig.version>1.0-r790473-Patch06</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta02</org.gatein.wci.version>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.1.0-Beta01</version>
+ <version>1.1.0-Beta02</version>
<type>pom</type>
<scope>import</scope>
</dependency>