Author: olamy
Date: Sun Apr 28 10:25:03 2013
New Revision: 1476750
URL: http://svn.apache.org/r1476750
Log:
not possible as it need some classes only available in the fork
Modified:
archiva/redback/redback-components/trunk/spring-utils/pom.xml
archiva/redback/redback-components/trunk/spring-utils/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java
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=1476750&r1=1476749&r2=1476750&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:25:03 2013
@@ -87,9 +87,10 @@
</dependency>
<dependency>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- <version>3.0</version>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ <version>3.1.4</version>
+ <scope>provided</scope>
</dependency>
@@ -125,6 +126,43 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.indexer</groupId>
+ <artifactId>indexer-core</artifactId>
+ <version>5.1.1</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>velocity</groupId>
+ <artifactId>velocity-dep</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-registry</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.atinject</groupId>
+ <artifactId>atinject</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
<build>
@@ -159,7 +197,6 @@
<rules>
<bannedDependencies>
<excludes>
- <exclude>org.sonatype.sisu:sisu-guice</exclude>
<exclude>org.sonatype.sisu:sisu-guava</exclude>
</excludes>
</bannedDependencies>
Modified:
archiva/redback/redback-components/trunk/spring-utils/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java
URL:
http://svn.apache.org/viewvc/archiva/redback/redback-components/trunk/spring-utils/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java?rev=1476750&r1=1476749&r2=1476750&view=diff
==============================================================================
---
archiva/redback/redback-components/trunk/spring-utils/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java
(original)
+++
archiva/redback/redback-components/trunk/spring-utils/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java
Sun Apr 28 10:25:03 2013
@@ -26,7 +26,9 @@ import org.codehaus.plexus.PlexusContain
import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import java.net.URL;
import java.util.List;
@@ -37,6 +39,7 @@ import java.util.List;
*
* @author Olivier Lamy
*/
+@Service
public class PlexusShimComponent
{
@@ -50,7 +53,7 @@ public class PlexusShimComponent
private DefaultPlexusContainer plexusContainer;
-
+ @PostConstruct
public void initialize()
throws PlexusContainerException
{
