[richfaces-svn-commits] JBoss Rich Faces SVN: r19670 - in branches/RF-8742/cdk: generator/src/main/java/org/richfaces/cdk/templatecompiler/statements and 2 other directories.
Author: alexsmirnov
Date: 2010-10-25 23:54:48 -0400 (Mon, 25 Oct 2010)
New Revision: 19670
Modified:
branches/RF-8742/cdk/generator/pom.xml
branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/statements/WriteAttributesSetStatement.java
branches/RF-8742/cdk/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/StatatementsContainerTest.java
branches/RF-8742/cdk/parent/pom.xml
Log:
https://jira.jboss.org/browse/RF-9415
Modified: branches/RF-8742/cdk/generator/pom.xml
===================================================================
--- branches/RF-8742/cdk/generator/pom.xml 2010-10-26 03:42:34 UTC (rev 19669)
+++ branches/RF-8742/cdk/generator/pom.xml 2010-10-26 03:54:48 UTC (rev 19670)
@@ -180,8 +180,8 @@
</dependency>
<dependency>
- <groupId>com.google.inject.extensions</groupId>
+ <groupId>org.sonatype.sisu.inject</groupId>
<artifactId>guice-multibindings</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified:
branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/statements/WriteAttributesSetStatement.java
===================================================================
---
branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/statements/WriteAttributesSetStatement.java 2010-10-26
03:42:34 UTC (rev 19669)
+++
branches/RF-8742/cdk/generator/src/main/java/org/richfaces/cdk/templatecompiler/statements/WriteAttributesSetStatement.java 2010-10-26
03:54:48 UTC (rev 19670)
@@ -31,8 +31,8 @@
import org.richfaces.cdk.generate.freemarker.FreeMarkerRenderer;
import org.richfaces.cdk.templatecompiler.TemplateModel;
+import com.google.common.collect.Sets;
import com.google.inject.Inject;
-import com.google.inject.internal.Sets;
/**
* @author Nick Belaevski
Modified:
branches/RF-8742/cdk/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/StatatementsContainerTest.java
===================================================================
---
branches/RF-8742/cdk/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/StatatementsContainerTest.java 2010-10-26
03:42:34 UTC (rev 19669)
+++
branches/RF-8742/cdk/generator/src/test/java/org/richfaces/cdk/templatecompiler/statements/StatatementsContainerTest.java 2010-10-26
03:54:48 UTC (rev 19670)
@@ -14,9 +14,9 @@
import org.richfaces.cdk.templatecompiler.builder.model.JavaImport;
import org.richfaces.cdk.templatecompiler.el.types.TypesFactory;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.inject.Inject;
-import com.google.inject.internal.ImmutableSet;
import com.google.inject.name.Named;
@RunWith(CdkTestRunner.class)
Modified: branches/RF-8742/cdk/parent/pom.xml
===================================================================
--- branches/RF-8742/cdk/parent/pom.xml 2010-10-26 03:42:34 UTC (rev 19669)
+++ branches/RF-8742/cdk/parent/pom.xml 2010-10-26 03:54:48 UTC (rev 19670)
@@ -150,7 +150,7 @@
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
- <version>2.1.7</version>
+ <version>2.9.0</version>
</dependency>
<!--
<dependency>
@@ -160,9 +160,15 @@
</dependency>
-->
<dependency>
- <groupId>com.google.inject.extensions</groupId>
+ <groupId>org.sonatype.sisu.inject</groupId>
<artifactId>guice-multibindings</artifactId>
- <version>2.0</version>
+ <version>2.9.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.inject.extensions</groupId>