You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2013/08/10 14:26:03 UTC
[22/22] git commit: use guice 4.0-beta from google
use guice 4.0-beta from google
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/d0abbad1
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/d0abbad1
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/d0abbad1
Branch: refs/heads/guice-from-google
Commit: d0abbad1c22e7d10bfa401f8896b8a6439902850
Parents: dc90e60
Author: Olivier Lamy <ol...@apache.org>
Authored: Sat Aug 10 22:25:26 2013 +1000
Committer: Olivier Lamy <ol...@apache.org>
Committed: Sat Aug 10 22:25:26 2013 +1000
----------------------------------------------------------------------
apache-maven/pom.xml | 4 ++++
maven-aether-provider/pom.xml | 11 ++---------
maven-core/pom.xml | 4 ++++
maven-model-builder/pom.xml | 6 +++++-
pom.xml | 39 +++++++++++++++++++++++++++++---------
5 files changed, 45 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/apache-maven/pom.xml
----------------------------------------------------------------------
diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 4b8c579..8452a07 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -48,6 +48,10 @@
<artifactId>maven-compat</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 9235f1c..9bc35fd 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -71,16 +71,9 @@ under the License.
<artifactId>plexus-utils</artifactId>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <classifier>no_aop</classifier>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>aopalliance</groupId>
- <artifactId>aopalliance</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- Testing -->
<dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/maven-core/pom.xml
----------------------------------------------------------------------
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 9041da0..d0e38a7 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -76,6 +76,10 @@
<artifactId>org.eclipse.sisu.plexus</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/maven-model-builder/pom.xml
----------------------------------------------------------------------
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index 57cdd8c..67eb5c9 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -41,7 +41,11 @@
<groupId>org.apache.maven</groupId>
<artifactId>maven-model</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
http://git-wip-us.apache.org/repos/asf/maven/blob/d0abbad1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f82b9a7..56f4683 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,20 +185,20 @@
<version>${guavaVersion}</version>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <version>${guiceVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <version>${guiceVersion}</version>
- <classifier>no_aop</classifier>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>4.0-beta</version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
<version>${sisuInjectVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -448,6 +448,27 @@
</pluginManagement>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.sonatype.sisu:sisu-guice</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
<version>1.6</version>