This is an automated email from the ASF dual-hosted git repository. martin_s pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/archiva-redback-components-spring-utils.git
commit b78dea8e227dbd59f04ecab07e951c8fdc694c18 Author: Olivier Lamy <[email protected]> AuthorDate: Sun Apr 28 10:25:03 2013 +0000 not possible as it need some classes only available in the fork git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-components/trunk@1476750 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 45 ++++++++++++++++++++-- .../plexusshim/PlexusShimComponent.java | 5 ++- 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index c35825d..b5e30f6 100644 --- a/pom.xml +++ b/pom.xml @@ -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> diff --git a/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java b/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java index c33ee64..b57862d 100644 --- a/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java +++ b/src/main/java/org/apache/archiva/redback/components/springutils/plexusshim/PlexusShimComponent.java @@ -26,7 +26,9 @@ import org.codehaus.plexus.PlexusContainerException; 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 { -- To stop receiving notification emails like this one, please contact [email protected].
