Author: olamy
Date: Sun Apr 28 10:24:38 2013
New Revision: 1476749
URL: http://svn.apache.org/r1476749
Log:
use sisu plexus from eclipse and google guice directly not a fork
Modified:
archiva/redback/redback-components/trunk/spring-utils/pom.xml
Modified: archiva/redback/redback-components/trunk/spring-utils/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-utils/pom.xml?rev=1476749&r1=1476748&r2=1476749&view=diff
==============================================================================
--- archiva/redback/redback-components/trunk/spring-utils/pom.xml (original)
+++ archiva/redback/redback-components/trunk/spring-utils/pom.xml Sun Apr 28
10:24:38 2013
@@ -75,18 +75,24 @@
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-plexus</artifactId>
- <version>2.2.2</version>
- <optional>true</optional>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.plexus</artifactId>
+ <version>0.0.0.M2a</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
+
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- <version>3.0.1</version>
- <optional>true</optional>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>3.0</version>
</dependency>
+
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-classworlds</artifactId>
@@ -141,6 +147,27 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <bannedDependencies>
+ <excludes>
+ <exclude>org.sonatype.sisu:sisu-guice</exclude>
+ <exclude>org.sonatype.sisu:sisu-guava</exclude>
+ </excludes>
+ </bannedDependencies>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
