Author: lindner
Date: Sat Jan 2 07:03:19 2010
New Revision: 895137
URL: http://svn.apache.org/viewvc?rev=895137&view=rev
Log:
SHINDIG-1253 | Use Google Guice from maven central
Modified:
incubator/shindig/trunk/java/common/pom.xml
incubator/shindig/trunk/java/gadgets/pom.xml
incubator/shindig/trunk/java/samples/pom.xml
incubator/shindig/trunk/java/server/pom.xml
incubator/shindig/trunk/java/social-api/pom.xml
incubator/shindig/trunk/pom.xml
Modified: incubator/shindig/trunk/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=895137&r1=895136&r2=895137&view=diff
==============================================================================
--- incubator/shindig/trunk/java/common/pom.xml (original)
+++ incubator/shindig/trunk/java/common/pom.xml Sat Jan 2 07:03:19 2010
@@ -76,13 +76,20 @@
<dependencies>
<!-- external dependencies -->
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-jmx</artifactId>
+ </dependency>
+
+
+ <!--<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
+-->
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
Modified: incubator/shindig/trunk/java/gadgets/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/pom.xml?rev=895137&r1=895136&r2=895137&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/pom.xml (original)
+++ incubator/shindig/trunk/java/gadgets/pom.xml Sat Jan 2 07:03:19 2010
@@ -150,13 +150,14 @@
<artifactId>google-collections</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
+-->
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
Modified: incubator/shindig/trunk/java/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/samples/pom.xml?rev=895137&r1=895136&r2=895137&view=diff
==============================================================================
--- incubator/shindig/trunk/java/samples/pom.xml (original)
+++ incubator/shindig/trunk/java/samples/pom.xml Sat Jan 2 07:03:19 2010
@@ -95,13 +95,15 @@
</dependency>
<!-- external depenencies -->
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
+<!--
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
+-->
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
Modified: incubator/shindig/trunk/java/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/server/pom.xml?rev=895137&r1=895136&r2=895137&view=diff
==============================================================================
--- incubator/shindig/trunk/java/server/pom.xml (original)
+++ incubator/shindig/trunk/java/server/pom.xml Sat Jan 2 07:03:19 2010
@@ -140,13 +140,14 @@
<artifactId>google-collections</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
+-->
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
Modified: incubator/shindig/trunk/java/social-api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/social-api/pom.xml?rev=895137&r1=895136&r2=895137&view=diff
==============================================================================
--- incubator/shindig/trunk/java/social-api/pom.xml (original)
+++ incubator/shindig/trunk/java/social-api/pom.xml Sat Jan 2 07:03:19 2010
@@ -72,13 +72,15 @@
<artifactId>json</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.guice</groupId>
+ <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
+<!--
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
</dependency>
+-->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Modified: incubator/shindig/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/trunk/pom.xml?rev=895137&r1=895136&r2=895137&view=diff
==============================================================================
--- incubator/shindig/trunk/pom.xml (original)
+++ incubator/shindig/trunk/pom.xml Sat Jan 2 07:03:19 2010
@@ -1216,10 +1216,6 @@
<id>oauth</id>
<url>http://oauth.googlecode.com/svn/code/maven</url>
</repository>
- <repository>
- <id>guice</id>
- <url>http://guice-maven.googlecode.com/svn/trunk/</url>
- </repository>
<!-- for jstl-1.2 for now.. -->
<repository>
<id>java.net</id>
@@ -1305,17 +1301,25 @@
</dependency>
<!-- external dependencies -->
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>2.0</version>
+ </dependency>
+
<dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice</artifactId>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-jmx</artifactId>
<version>2.0</version>
</dependency>
- <!-- dependency not declared in guice pom -->
+
+ <!-- dependency not declared in guice pom
<dependency>
<groupId>aopalliance</groupId>
<artifactId>aopalliance</artifactId>
<version>1.0</version>
- </dependency>
+ </dependency> -->
+
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
