diff options
| author | Brett Porter <brett@apache.org> | 2008-04-14 04:58:17 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2008-04-14 04:58:17 +0000 |
| commit | db51c1b5909b8aebd63e1d7c26271687826c3036 (patch) | |
| tree | 2dcf565069c45893fa84651e2d08c6daa196c1a6 /archiva-modules/archiva-base/archiva-artifact-converter | |
| parent | 0594ef58bedee0ef7cd7309a10e0c3c7fc6dcdc6 (diff) | |
| download | archiva-db51c1b5909b8aebd63e1d7c26271687826c3036.tar.gz archiva-db51c1b5909b8aebd63e1d7c26271687826c3036.zip | |
remove all traces of the Plexus container
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@647663 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-base/archiva-artifact-converter')
2 files changed, 19 insertions, 4 deletions
diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml index dde049a77..083f08773 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml @@ -31,7 +31,11 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-repository-metadata</artifactId> - <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-spring</artifactId> + <scope>test</scope> </dependency> <dependency> <groupId>commons-io</groupId> @@ -40,7 +44,12 @@ <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-artifact-manager</artifactId> - <version>2.0.4</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.archiva</groupId> @@ -50,6 +59,12 @@ <groupId>org.apache.maven.shared</groupId> <artifactId>maven-model-converter</artifactId> <version>2.1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> <build> diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java index 205650187..cbbf6289c 100644 --- a/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java +++ b/archiva-modules/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java @@ -28,7 +28,7 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryFactory; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.io.File; import java.io.IOException; @@ -48,7 +48,7 @@ import java.util.regex.Matcher; * @version $Id$ */ public class LegacyToDefaultConverterTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private ArtifactRepository sourceRepository; |