Repository: maven Updated Branches: refs/heads/master 31e70dba9 -> 545c6e268
Switch to official Guice 4.0 Signed-off-by: Jason van Zyl <ja...@tesla.io> closes #45 Project: http://git-wip-us.apache.org/repos/asf/maven/repo Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/545c6e26 Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/545c6e26 Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/545c6e26 Branch: refs/heads/master Commit: 545c6e2685ca238cde4944f8179a3f3fbffa07ae Parents: 9f7971d Author: Stuart McCulloch <mccu...@gmail.com> Authored: Wed Apr 29 00:38:57 2015 +0100 Committer: Jason van Zyl <ja...@tesla.io> Committed: Fri Sep 11 18:36:02 2015 -0400 ---------------------------------------------------------------------- maven-aether-provider/pom.xml | 4 ++-- maven-core/pom.xml | 4 ++-- maven-model-builder/pom.xml | 4 ++-- pom.xml | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven/blob/545c6e26/maven-aether-provider/pom.xml ---------------------------------------------------------------------- diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml index 0995155..274a318 100644 --- a/maven-aether-provider/pom.xml +++ b/maven-aether-provider/pom.xml @@ -71,8 +71,8 @@ under the License. <artifactId>plexus-utils</artifactId> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> <classifier>no_aop</classifier> <optional>true</optional> <exclusions> http://git-wip-us.apache.org/repos/asf/maven/blob/545c6e26/maven-core/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/pom.xml b/maven-core/pom.xml index 87e2e3a..4876a0b 100644 --- a/maven-core/pom.xml +++ b/maven-core/pom.xml @@ -81,8 +81,8 @@ <artifactId>org.eclipse.sisu.plexus</artifactId> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> <classifier>no_aop</classifier> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/545c6e26/maven-model-builder/pom.xml ---------------------------------------------------------------------- diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml index 47ee2ba..03bbdee 100644 --- a/maven-model-builder/pom.xml +++ b/maven-model-builder/pom.xml @@ -59,8 +59,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> <classifier>no_aop</classifier> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/maven/blob/545c6e26/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b24c40f..35efc7c 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ <plexusUtilsVersion>3.0.22</plexusUtilsVersion> <!-- Latest version of Guava that works with Sisu --> <guavaVersion>18.0</guavaVersion> - <guiceVersion>3.2.5</guiceVersion> + <guiceVersion>4.0</guiceVersion> <sisuInjectVersion>0.3.1</sisuInjectVersion> <wagonVersion>2.9</wagonVersion> <!-- Verify SNAPSHOT for MNG-5605 --> <securityDispatcherVersion>1.3</securityDispatcherVersion> @@ -216,13 +216,13 @@ <version>${guavaVersion}</version> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> <version>${guiceVersion}</version> </dependency> <dependency> - <groupId>org.sonatype.sisu</groupId> - <artifactId>sisu-guice</artifactId> + <groupId>com.google.inject</groupId> + <artifactId>guice</artifactId> <version>${guiceVersion}</version> <classifier>no_aop</classifier> </dependency>
