master branch really ? 2013/3/13 <[email protected]>: > Updated Branches: > refs/heads/master 41a292d9a -> 2c2bf6e6e > > > Use Eclipse/Sisu 0.0.0.M2 milestone > > Signed-off-by: Jason van Zyl <[email protected]> > > > Project: http://git-wip-us.apache.org/repos/asf/maven/repo > Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/2c2bf6e6 > Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/2c2bf6e6 > Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/2c2bf6e6 > > Branch: refs/heads/master > Commit: 2c2bf6e6e5b06c35a935ca69c5dcb54b381baf46 > Parents: 41a292d > Author: Stuart McCulloch <[email protected]> > Authored: Wed Mar 13 01:11:34 2013 +0000 > Committer: Jason van Zyl <[email protected]> > Committed: Wed Mar 13 08:49:00 2013 -0400 > > ---------------------------------------------------------------------- > apache-maven/pom.xml | 4 +- > maven-aether-provider/pom.xml | 4 +- > maven-compat/pom.xml | 4 +- > maven-core/pom.xml | 4 +- > .../apache/maven/DefaultArtifactFilterManager.java | 1 + > .../maven/classrealm/DefaultClassRealmManager.java | 5 +- > maven-embedder/pom.xml | 4 +- > maven-model-builder/pom.xml | 4 +- > maven-plugin-api/pom.xml | 4 +- > pom.xml | 34 +++++++++++---- > 10 files changed, 42 insertions(+), 26 deletions(-) > ---------------------------------------------------------------------- > > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/apache-maven/pom.xml > ---------------------------------------------------------------------- > diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml > index ce547e7..9794928 100644 > --- a/apache-maven/pom.xml > +++ b/apache-maven/pom.xml > @@ -48,8 +48,8 @@ > <artifactId>maven-compat</artifactId> > </dependency> > <dependency> > - <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > </dependency> > <!-- CLI --> > <dependency> > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-aether-provider/pom.xml > ---------------------------------------------------------------------- > diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml > index 6c61177..f6985d9 100644 > --- a/maven-aether-provider/pom.xml > +++ b/maven-aether-provider/pom.xml > @@ -76,8 +76,8 @@ under the License. > <scope>test</scope> > </dependency> > <dependency> > - <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > </dependency> > <dependency> > <groupId>org.codehaus.plexus</groupId> > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-compat/pom.xml > ---------------------------------------------------------------------- > diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml > index 3bdb1aa..e098fad 100644 > --- a/maven-compat/pom.xml > +++ b/maven-compat/pom.xml > @@ -54,8 +54,8 @@ > <artifactId>plexus-interpolation</artifactId> > </dependency> > <dependency> > - <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > </dependency> > <dependency> > <groupId>org.codehaus.plexus</groupId> > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-core/pom.xml > ---------------------------------------------------------------------- > diff --git a/maven-core/pom.xml b/maven-core/pom.xml > index dcc2699..7dbde4a 100644 > --- a/maven-core/pom.xml > +++ b/maven-core/pom.xml > @@ -72,8 +72,8 @@ > </dependency> > <!-- Plexus --> > <dependency> > - <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > </dependency> > <dependency> > <groupId>org.codehaus.plexus</groupId> > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java > ---------------------------------------------------------------------- > diff --git > a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java > b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java > index 9d772f7..7676834 100644 > --- > a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java > +++ > b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java > @@ -58,6 +58,7 @@ public class DefaultArtifactFilterManager > artifacts.add( "plexus:plexus-container-default" ); > artifacts.add( "org.sonatype.spice:spice-inject-plexus" ); > artifacts.add( "org.sonatype.sisu:sisu-inject-plexus" ); > + artifacts.add( "org.eclipse.sisu:org.eclipse.sisu.plexus" ); > artifacts.add( "org.apache.maven:maven-artifact" ); > artifacts.add( "org.apache.maven:maven-aether-provider" ); > artifacts.add( "org.apache.maven:maven-artifact-manager" ); > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java > ---------------------------------------------------------------------- > diff --git > a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java > > b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java > index 0db5b4b..3cc027e 100644 > --- > a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java > +++ > b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java > @@ -199,11 +199,10 @@ public class DefaultClassRealmManager > imports.put( "org.codehaus.plexus.logging", coreRealm ); > imports.put( "org.codehaus.plexus.personality", coreRealm ); > > - // javax.inject, sisu-inject (JSR-330) > + // javax.inject (JSR-330) > imports.put( "javax.inject.*", coreRealm ); > imports.put( "javax.enterprise.inject.*", coreRealm ); > - imports.put( "org.sonatype.inject.*", coreRealm ); > - > + > // com.google > // > // We may potentially want to export these, but right now I'm not > sure that anything Guice specific needs > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-embedder/pom.xml > ---------------------------------------------------------------------- > diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml > index 49a7b57..aaa6ff6 100644 > --- a/maven-embedder/pom.xml > +++ b/maven-embedder/pom.xml > @@ -55,8 +55,8 @@ > <artifactId>plexus-classworlds</artifactId> > </dependency> > <dependency> > - <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > </dependency> > <dependency> > <groupId>org.codehaus.plexus</groupId> > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-model-builder/pom.xml > ---------------------------------------------------------------------- > diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml > index a5b1aa1..c8d95c6 100644 > --- a/maven-model-builder/pom.xml > +++ b/maven-model-builder/pom.xml > @@ -43,8 +43,8 @@ > </dependency> > > <dependency> > - <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > <scope>test</scope> > </dependency> > <dependency> > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/maven-plugin-api/pom.xml > ---------------------------------------------------------------------- > diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml > index 227f574..5b33f77 100644 > --- a/maven-plugin-api/pom.xml > +++ b/maven-plugin-api/pom.xml > @@ -49,8 +49,8 @@ under the License. > </exclusions> > </dependency> > <dependency> > - <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > </dependency> > </dependencies> > > > http://git-wip-us.apache.org/repos/asf/maven/blob/2c2bf6e6/pom.xml > ---------------------------------------------------------------------- > diff --git a/pom.xml b/pom.xml > index ed97675..2049e9f 100644 > --- a/pom.xml > +++ b/pom.xml > @@ -49,7 +49,10 @@ > <plexusVersion>1.5.5</plexusVersion> > <plexusInterpolationVersion>1.16</plexusInterpolationVersion> > <plexusUtilsVersion>3.0.10</plexusUtilsVersion> > - <sisuInjectVersion>2.3.0</sisuInjectVersion> > + <!-- last Java5 release of Guava --> > + <guavaVersion>11.0.2</guavaVersion> > + <guiceVersion>3.1.3</guiceVersion> > + <sisuInjectVersion>0.0.0.M2</sisuInjectVersion> > <wagonVersion>2.4</wagonVersion> > <securityDispatcherVersion>1.3</securityDispatcherVersion> > <cipherVersion>1.7</cipherVersion> > @@ -176,16 +179,25 @@ > <version>${plexusUtilsVersion}</version> > </dependency> > <dependency> > + <groupId>com.google.guava</groupId> > + <artifactId>guava</artifactId> > + <version>${guavaVersion}</version> > + </dependency> > + <dependency> > <groupId>org.sonatype.sisu</groupId> > - <artifactId>sisu-inject-plexus</artifactId> > + <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> > + </dependency> > + <dependency> > + <groupId>org.eclipse.sisu</groupId> > + <artifactId>org.eclipse.sisu.plexus</artifactId> > <version>${sisuInjectVersion}</version> > - <exclusions> > - <exclusion> > - <!-- Decouple build from MNG-3443 and ensure optional/unused > dependency from sisu-guice stays out --> > - <groupId>org.sonatype.sisu.inject</groupId> > - <artifactId>cglib</artifactId> > - </exclusion> > - </exclusions> > </dependency> > <dependency> > <groupId>org.codehaus.plexus</groupId> > @@ -278,6 +290,10 @@ > <groupId>org.codehaus.plexus</groupId> > <artifactId>plexus-container-default</artifactId> > </exclusion> > + <exclusion> > + <groupId>org.sonatype.sisu</groupId> > + <artifactId>sisu-inject-plexus</artifactId> > + </exclusion> > </exclusions> > </dependency> > <!-- Commons --> >
-- Olivier Lamy Talend: http://coders.talend.com http://twitter.com/olamy | http://linkedin.com/in/olamy --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
