Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use Eclipse/Sisu 0.0.0.M2 milestone 

Signed-off-by: Jason van Zyl <jason@tesla.io>
This commit is contained in:
Stuart McCulloch 2013-03-13 01:11:34 +00:00 committed by Jason van Zyl
parent 41a292d9a2
commit 2c2bf6e6e5
10 changed files with 42 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apache-maven/pom.xml
View File

@ -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>

4
maven-aether-provider/pom.xml
View File

@ -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>

4
maven-compat/pom.xml
View File

@ -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>

4
maven-core/pom.xml
View File

@ -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>

1
maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
View File

@ -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" );

5
maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
View File

@ -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

4
maven-embedder/pom.xml
View File

@ -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>

4
maven-model-builder/pom.xml
View File

@ -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>

4
maven-plugin-api/pom.xml
View File

@ -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>

34
pom.xml
View File

@ -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>
@ -175,17 +178,26 @@
<artifactId>plexus-utils</artifactId>
<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 -->