Author: alexsmirnov Date: 2011-01-12 14:16:35 -0500 (Wed, 12 Jan 2011) New Revision: 20971 Modified: trunk/cdk/generator/pom.xml trunk/cdk/parent/pom.xml Log: Complete - task : Update google guice to 3.0.RC2 Modified: trunk/cdk/generator/pom.xml =================================================================== --- trunk/cdk/generator/pom.xml 2011-01-12 18:17:40 UTC (rev 20970) +++ trunk/cdk/generator/pom.xml 2011-01-12 19:16:35 UTC (rev 20971) @@ -168,11 +168,20 @@ <artifactId>javaparser</artifactId> <scope>test</scope> </dependency> - <!-- <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId> - <version>1.0</version> </dependency> --> + <dependency> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-assistedinject</artifactId> + </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + </dependency> - <!-- <dependency> <groupId>javax.inject</groupId> <artifactId>javax.inject</artifactId> - <version>1</version> </dependency> --> + <!-- <dependency> <groupId>org.sonatype.sisu</groupId> <artifactId>sisu-guice</artifactId> @@ -182,5 +191,6 @@ <groupId>org.sonatype.sisu.inject</groupId> <artifactId>guice-multibindings</artifactId> </dependency> + --> </dependencies> </project> Modified: trunk/cdk/parent/pom.xml =================================================================== --- trunk/cdk/parent/pom.xml 2011-01-12 18:17:40 UTC (rev 20970) +++ trunk/cdk/parent/pom.xml 2011-01-12 19:16:35 UTC (rev 20971) @@ -151,13 +151,11 @@ <artifactId>sisu-guice</artifactId> <version>2.9.0</version> </dependency> - <!-- <dependency> <groupId>com.google.inject</groupId> <artifactId>guice</artifactId> - <version>2.0</version> + <version>3.0-rc2</version> </dependency> - --> <dependency> <groupId>org.sonatype.sisu.inject</groupId> <artifactId>guice-multibindings</artifactId> @@ -172,13 +170,18 @@ <dependency> <groupId>com.google.inject.extensions</groupId> <artifactId>guice-grapher</artifactId> - <version>2.0</version> + <version>3.0-rc2</version> </dependency> <dependency> <groupId>com.google.inject.extensions</groupId> - <artifactId>guice-assisted-inject</artifactId> - <version>2.0</version> + <artifactId>guice-assistedinject</artifactId> + <version>3.0-rc2</version> </dependency> + <dependency> + <groupId>com.google.inject.extensions</groupId> + <artifactId>guice-multibindings</artifactId> + <version>3.0-rc2</version> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-guice</artifactId>