diff options
| author | Olivier Lamy <olamy@apache.org> | 2011-05-26 20:52:13 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2011-05-26 20:52:13 +0000 |
| commit | 1788eb54c492ac4a0f3efd6d4d504fd8fc55d26c (patch) | |
| tree | 6f6ff2e608639c0ff425ade6c7516a7858f30507 /archiva-modules/archiva-web | |
| parent | 16714e5e4dc72fa81589ebe23a4cbe49f57be462 (diff) | |
| download | archiva-1788eb54c492ac4a0f3efd6d4d504fd8fc55d26c.tar.gz archiva-1788eb54c492ac4a0f3efd6d4d504fd8fc55d26c.zip | |
[MRM-1473] remove use of plexus-spring
remove all dependencies to plexus-container
use of sisu-inject-plexus (version 2.2.2 with ASL license) for components using maven api components.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1128075 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
5 files changed, 12 insertions, 25 deletions
diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index 29ed58c6a..a5827b2fc 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -29,11 +29,6 @@ <name>Archiva Web :: RSS</name> <dependencies> <dependency> - <groupId>org.codehaus.redback.components</groupId> - <artifactId>plexus-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.archiva</groupId> <artifactId>metadata-repository-api</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 30ca4fa82..d05f6eb55 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -140,6 +140,12 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-slf4j-logging</artifactId> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -191,10 +197,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-api</artifactId> - </dependency> <!-- Plexus Security Dependencies --> <dependency> <groupId>org.codehaus.redback</groupId> @@ -241,6 +243,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-quartz</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.redback.components</groupId> diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml index 4cab22d8c..0fe5f7858 100644 --- a/archiva-modules/archiva-web/archiva-webdav/pom.xml +++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml @@ -81,10 +81,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.redback.components</groupId> - <artifactId>plexus-spring</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-model</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml index 6ac1dcb23..1faa656d3 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-security/pom.xml @@ -51,17 +51,10 @@ <artifactId>spring-context</artifactId> </dependency> <dependency> - <groupId>org.codehaus.redback.components</groupId> - <artifactId>plexus-spring</artifactId> - <scope>test</scope> - </dependency> - <!-- use spring for the unit tests? - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> <scope>test</scope> </dependency> - --> <dependency> <groupId>org.codehaus.redback</groupId> <artifactId>redback-authorization-rbac</artifactId> diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml index 3385f3952..4669f3104 100644 --- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml +++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/pom.xml @@ -80,11 +80,6 @@ <artifactId>commons-validator</artifactId> </dependency> <dependency> - <groupId>org.codehaus.redback.components</groupId> - <artifactId>plexus-spring</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <scope>test</scope> |