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 | |
| 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
48 files changed, 252 insertions, 266 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; diff --git a/archiva-modules/archiva-base/archiva-common/pom.xml b/archiva-modules/archiva-base/archiva-common/pom.xml index ba19641c0..5498bd36e 100644 --- a/archiva-modules/archiva-base/archiva-common/pom.xml +++ b/archiva-modules/archiva-base/archiva-common/pom.xml @@ -49,6 +49,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -58,6 +64,12 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-spring</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>xalan</groupId> diff --git a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java index aaad6b4d4..5cbe361aa 100644 --- a/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java +++ b/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/ChecksumsTest.java @@ -20,7 +20,7 @@ package org.apache.maven.archiva.common.utils; */ import org.apache.commons.io.FileUtils; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.io.BufferedReader; import java.io.File; @@ -33,7 +33,7 @@ import java.io.FileReader; * @version $Id$ */ public class ChecksumsTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private static final String GOOD = "good"; diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml index 09d3d8f7b..f5bb1c9f7 100644 --- a/archiva-modules/archiva-base/archiva-configuration/pom.xml +++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml @@ -36,6 +36,12 @@ <dependency> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.registry</groupId> @@ -44,6 +50,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-expression-evaluator</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-io</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml index bde81f60f..6669b06d0 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml @@ -51,6 +51,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-digest</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml index 12bc44c7c..fc67729e2 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-dependency-tree-consumer/pom.xml @@ -27,6 +27,12 @@ <groupId>org.apache.maven.shared</groupId> <artifactId>maven-dependency-tree</artifactId> <version>1.1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml index c4fb15f6d..62b97c766 100644 --- a/archiva-modules/archiva-base/archiva-converter/pom.xml +++ b/archiva-modules/archiva-base/archiva-converter/pom.xml @@ -43,6 +43,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml index dda33ffe2..415d7ef2e 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml +++ b/archiva-modules/archiva-base/archiva-dependency-graph/pom.xml @@ -29,6 +29,11 @@ <name>Archiva Base :: Dependency Graph</name> <dependencies> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </dependency> diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java index 26aa0ef6f..d35373495 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java +++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/AbstractDependencyGraphFactoryTestCase.java @@ -33,7 +33,7 @@ import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.ArtifactReference; import org.apache.maven.archiva.model.Dependency; import org.apache.maven.archiva.model.VersionedReference; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.util.ArrayList; import java.util.Collection; @@ -47,7 +47,7 @@ import java.util.List; * @version $Id$ */ public abstract class AbstractDependencyGraphFactoryTestCase - extends PlexusTestCase + extends PlexusInSpringTestCase { public class ExpectedEdge { diff --git a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java index 2a277394c..e33a867ea 100644 --- a/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java +++ b/archiva-modules/archiva-base/archiva-dependency-graph/src/test/java/org/apache/maven/archiva/dependency/graph/GraphvizDotTool.java @@ -19,13 +19,13 @@ package org.apache.maven.archiva.dependency.graph; * under the License. */ +import junit.framework.Assert; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.dependency.DependencyGraphFactory; import org.apache.maven.archiva.model.DependencyScope; import org.apache.maven.archiva.model.VersionedReference; -import org.codehaus.plexus.PlexusTestCase; import java.io.File; import java.io.FileWriter; @@ -41,7 +41,6 @@ import java.util.List; * @version $Id$ */ public class GraphvizDotTool - extends PlexusTestCase implements GraphListener { private int phaseNumber = 0; @@ -49,7 +48,7 @@ public class GraphvizDotTool protected VersionedReference toVersionedReference( String key ) { String parts[] = StringUtils.splitPreserveAllTokens( key, ':' ); - assertEquals( "Versioned Reference [" + key + "] part count.", 3, parts.length ); + Assert.assertEquals( "Versioned Reference [" + key + "] part count.", 3, parts.length ); VersionedReference ref = new VersionedReference(); ref.setGroupId( parts[0] ); @@ -78,7 +77,7 @@ public class GraphvizDotTool DependencyGraph graph = factory.getGraph( rootRef ); // Test the results. - assertNotNull( "Graph shouldn't be null.", graph ); + Assert.assertNotNull( "Graph shouldn't be null.", graph ); return graph; } diff --git a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaArtifactTest.java b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaArtifactTest.java index 80f53030f..a3564207c 100644 --- a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaArtifactTest.java +++ b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaArtifactTest.java @@ -21,7 +21,6 @@ package org.apache.maven.archiva.model; import java.util.Date; -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.spring.PlexusInSpringTestCase; /** diff --git a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaModelClonerTest.java b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaModelClonerTest.java index 4f1af59da..79225aa97 100644 --- a/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaModelClonerTest.java +++ b/archiva-modules/archiva-base/archiva-model/src/test/java/org/apache/maven/archiva/model/ArchivaModelClonerTest.java @@ -19,7 +19,6 @@ package org.apache.maven.archiva.model; * under the License. */ -import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.spring.PlexusInSpringTestCase; /** diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml index b49a6ab7b..97ccbb8b7 100644 --- a/archiva-modules/archiva-base/archiva-policies/pom.xml +++ b/archiva-modules/archiva-base/archiva-policies/pom.xml @@ -44,6 +44,12 @@ <dependency> <groupId>org.codehaus.plexus.cache</groupId> <artifactId>plexus-cache-ehcache</artifactId> + <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-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml index 189e39673..4ee0cf3fe 100644 --- a/archiva-modules/archiva-base/archiva-proxy/pom.xml +++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml @@ -77,11 +77,6 @@ <artifactId>xmlunit</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-slf4j-logging</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml index 848a73057..70fec59ff 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/CacheFailuresTransferTest.xml @@ -105,11 +105,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml index 9d90e2250..5e48717e4 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ChecksumTransferTest.xml @@ -103,11 +103,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml index 508b58bfc..b1ada8f02 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ErrorHandlingTest.xml @@ -108,11 +108,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> -</component-set>
\ No newline at end of file +</component-set> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml index 9d90e2250..5e48717e4 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedDefaultTransferTest.xml @@ -103,11 +103,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml index 9d90e2250..5e48717e4 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/ManagedLegacyTransferTest.xml @@ -103,11 +103,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml index e7b75187c..7218f8998 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/MetadataTransferTest.xml @@ -126,11 +126,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml index 9d90e2250..5e48717e4 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/RelocateTransferTest.xml @@ -103,11 +103,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml index 9d90e2250..5e48717e4 100644 --- a/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml +++ b/archiva-modules/archiva-base/archiva-proxy/src/test/resources/org/apache/maven/archiva/proxy/SnapshotTransferTest.xml @@ -103,11 +103,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java index efda76e8b..aabcc43fe 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataReaderTest.java @@ -20,7 +20,7 @@ package org.apache.maven.archiva.repository.metadata; */ import org.apache.maven.archiva.model.ArchivaRepositoryMetadata; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.io.File; @@ -30,7 +30,7 @@ import java.io.File; * @author <a href="mailto:joakime@apache.org">Joakim Erdfelt</a> * @version $Id$ */ -public class RepositoryMetadataReaderTest extends PlexusTestCase +public class RepositoryMetadataReaderTest extends PlexusInSpringTestCase { public void testLoadSimple() throws RepositoryMetadataException { diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java index fc157f022..9fa2affc3 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/metadata/RepositoryMetadataWriterTest.java @@ -21,7 +21,7 @@ package org.apache.maven.archiva.repository.metadata; import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.model.ArchivaRepositoryMetadata; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.custommonkey.xmlunit.XMLAssert; import java.io.File; @@ -34,7 +34,7 @@ import java.io.StringWriter; * @version $Id$ */ public class RepositoryMetadataWriterTest - extends PlexusTestCase + extends PlexusInSpringTestCase { public void testWriteSimple() throws Exception diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java index ead286346..abb27d9fd 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/filters/ProjectModelExpressionExpanderTest.java @@ -27,7 +27,7 @@ import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.repository.project.ProjectModelWriter; import org.apache.maven.archiva.repository.project.readers.ProjectModel400Reader; import org.apache.maven.archiva.repository.project.writers.ProjectModel400Writer; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.io.File; import java.io.IOException; @@ -43,7 +43,7 @@ import java.util.List; * @version $Id$ */ public class ProjectModelExpressionExpanderTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private static final String DEFAULT_REPOSITORY = "src/test/repositories/default-repository"; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java index ca9724524..89453219f 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel300ReaderTest.java @@ -23,7 +23,7 @@ import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.Dependency; import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.io.File; @@ -34,7 +34,7 @@ import java.io.File; * @version $Id$ */ public class ProjectModel300ReaderTest - extends PlexusTestCase + extends PlexusInSpringTestCase { public void testLoadSimple() throws ProjectModelException diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java index 68682453b..5d6d0c3b7 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/readers/ProjectModel400ReaderTest.java @@ -23,7 +23,7 @@ import org.apache.maven.archiva.model.ArchivaProjectModel; import org.apache.maven.archiva.model.VersionedReference; import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import java.io.File; @@ -34,7 +34,7 @@ import java.io.File; * @version $Id$ */ public class ProjectModel400ReaderTest - extends PlexusTestCase + extends PlexusInSpringTestCase { public void testLoadSimple() throws ProjectModelException diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java index 4ce21b8c8..55b38e70e 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/java/org/apache/maven/archiva/repository/project/writers/ProjectModel400WriterTest.java @@ -25,7 +25,7 @@ import org.apache.maven.archiva.repository.project.ProjectModelException; import org.apache.maven.archiva.repository.project.ProjectModelReader; import org.apache.maven.archiva.repository.project.ProjectModelWriter; import org.apache.maven.archiva.repository.project.readers.ProjectModel400Reader; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.custommonkey.xmlunit.DetailedDiff; import org.custommonkey.xmlunit.Diff; @@ -40,7 +40,7 @@ import java.io.StringWriter; * @version $Id$ */ public class ProjectModel400WriterTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private static final String DEFAULT_REPOSITORY = "src/test/repositories/default-repository"; diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.xml index 99eddface..80d22f51d 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/metadata/MetadataToolsTest.xml @@ -66,11 +66,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> -</component-set>
\ No newline at end of file +</component-set> diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.xml b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.xml index 9f297720d..72b797c20 100644 --- a/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.xml +++ b/archiva-modules/archiva-base/archiva-repository-layer/src/test/resources/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilterTest.xml @@ -46,11 +46,5 @@ <time-to-live-seconds>1800</time-to-live-seconds> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - <lifecycle-handler>basic</lifecycle-handler> - </component> </components> -</component-set>
\ No newline at end of file +</component-set> diff --git a/archiva-modules/archiva-database/pom.xml b/archiva-modules/archiva-database/pom.xml index f8e40f5cc..5ae134fc2 100755 --- a/archiva-modules/archiva-database/pom.xml +++ b/archiva-modules/archiva-database/pom.xml @@ -55,6 +55,10 @@ <artifactId>plexus-jdo2</artifactId> <exclusions> <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + <exclusion> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> </exclusion> diff --git a/archiva-modules/archiva-database/src/test/resources/META-INF/plexus/components.xml b/archiva-modules/archiva-database/src/test/resources/META-INF/plexus/components.xml index c7d80f05e..6c3e13e95 100644 --- a/archiva-modules/archiva-database/src/test/resources/META-INF/plexus/components.xml +++ b/archiva-modules/archiva-database/src/test/resources/META-INF/plexus/components.xml @@ -26,11 +26,6 @@ <role-hint>test-db-unprocessed</role-hint> <implementation>org.apache.maven.archiva.database.updater.TestDatabaseUnprocessedConsumer</implementation> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - </component> </components> </component-set> diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml index 66d0b2991..a236dbc20 100755 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/pom.xml @@ -59,10 +59,5 @@ <artifactId>hsqldb</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-slf4j-logging</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/META-INF/plexus/components.xml b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/META-INF/plexus/components.xml index a8dbacca4..a780793c7 100644 --- a/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/META-INF/plexus/components.xml +++ b/archiva-modules/archiva-reporting/archiva-artifact-reports/src/test/resources/META-INF/plexus/components.xml @@ -33,11 +33,6 @@ </properties> </configuration> </component> - - <component> - <role>org.codehaus.plexus.logging.LoggerManager</role> - <implementation>org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager</implementation> - </component> </components> <lifecycle-handler-manager implementation="org.codehaus.plexus.lifecycle.DefaultLifecycleHandlerManager"> diff --git a/archiva-modules/archiva-scheduled/pom.xml b/archiva-modules/archiva-scheduled/pom.xml index 5650801a9..00a85ebbe 100644 --- a/archiva-modules/archiva-scheduled/pom.xml +++ b/archiva-modules/archiva-scheduled/pom.xml @@ -48,6 +48,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-quartz</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -65,6 +71,12 @@ <dependency> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Test Dependencies --> <dependency> @@ -82,11 +94,6 @@ <artifactId>plexus-registry-commons</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-slf4j-logging</artifactId> - <scope>test</scope> - </dependency> </dependencies> <build> <plugins> diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml index c7909fb43..ff9afbf66 100644 --- a/archiva-modules/archiva-web/archiva-rss/pom.xml +++ b/archiva-modules/archiva-web/archiva-rss/pom.xml @@ -10,6 +10,11 @@ <url>http://maven.apache.org</url> <dependencies> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-spring</artifactId> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.archiva</groupId> <artifactId>archiva-model</artifactId> </dependency> diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java index 74a5189f0..388f24f5b 100644 --- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java +++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/RssFeedGeneratorTest.java @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.FileUtils; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.custommonkey.xmlunit.XMLAssert; /** @@ -32,7 +32,7 @@ import org.custommonkey.xmlunit.XMLAssert; * @version */ public class RssFeedGeneratorTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private RssFeedGenerator generator; diff --git a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java index c25432666..f665109c9 100644 --- a/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java +++ b/archiva-modules/archiva-web/archiva-rss/src/test/java/org/apache/archiva/rss/processor/NewArtifactsRssFeedProcessorTest.java @@ -25,14 +25,14 @@ import java.util.List; import org.apache.archiva.rss.RssFeedGenerator; import org.apache.maven.archiva.model.ArchivaArtifact; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; /** * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a> * @version */ public class NewArtifactsRssFeedProcessorTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private RssFeedProcessor newArtifactsProcessor; diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml index c835aa105..53536b883 100644 --- a/archiva-modules/archiva-web/archiva-security/pom.xml +++ b/archiva-modules/archiva-web/archiva-security/pom.xml @@ -40,35 +40,77 @@ <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-system</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-model</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-role-manager</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Test Scoped --> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-authorization-rbac</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-keys-memory</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-users-memory</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-memory</artifactId> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> </dependencies> </project> diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.java index d99aea220..ceb0a357c 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/DefaultUserRepositoriesTest.java @@ -26,7 +26,7 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.codehaus.plexus.redback.rbac.RBACManager; import org.codehaus.plexus.redback.role.RoleManager; import org.codehaus.plexus.redback.system.SecuritySystem; @@ -40,7 +40,7 @@ import org.codehaus.plexus.redback.users.UserManager; * @version $Id$ */ public class DefaultUserRepositoriesTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private static final String USER_GUEST = "guest"; diff --git a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/RoleManagerTest.java b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/RoleManagerTest.java index 6f195a537..f2a4474c4 100644 --- a/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/RoleManagerTest.java +++ b/archiva-modules/archiva-web/archiva-security/src/test/java/org/apache/maven/archiva/security/RoleManagerTest.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.security; * under the License. */ -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import org.codehaus.plexus.redback.role.RoleManager; /** @@ -29,7 +29,7 @@ import org.codehaus.plexus.redback.role.RoleManager; * @version $Id: RoleManagerTest.java 4330 2007-05-10 17:28:56Z jmcconnell $ */ public class RoleManagerTest - extends PlexusTestCase + extends PlexusInSpringTestCase { /** * @plexus.requirement role-hint="default" diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index 843eed85e..b19f67052 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -109,11 +109,23 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-app-configuration-web</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-slf4j-logging</artifactId> <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -141,6 +153,12 @@ <dependency> <groupId>org.codehaus.plexus.registry</groupId> <artifactId>plexus-registry-api</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.registry</groupId> @@ -149,12 +167,16 @@ <dependency> <groupId>org.codehaus.plexus.cache</groupId> <artifactId>plexus-cache-api</artifactId> - <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.cache</groupId> <artifactId>plexus-cache-ehcache</artifactId> - <scope>compile</scope> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -170,10 +192,22 @@ <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-xwork-integration</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-taglib</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Other dependencies --> <dependency> @@ -181,10 +215,6 @@ <artifactId>archiva-webdav</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-xwork-integration</artifactId> - </dependency> - <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> <version>2.5.1</version> @@ -224,6 +254,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-quartz</artifactId> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -234,18 +270,36 @@ <artifactId>redback-keys-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-rbac-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus.redback</groupId> <artifactId>redback-users-memory</artifactId> <version>${redback.version}</version> <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>commons-fileupload</groupId> diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleWebdavServer.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleWebdavServer.java index 7cec7d7af..33ae965c5 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleWebdavServer.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/simple/SimpleWebdavServer.java @@ -35,7 +35,6 @@ public class SimpleWebdavServer try { SimpleWebdavServer server = new SimpleWebdavServer(); - server.init(); server.startServer(); } catch ( Exception e ) diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractWebdavServer.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractWebdavServer.java index 066659098..9c846520a 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractWebdavServer.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/test/AbstractWebdavServer.java @@ -21,11 +21,10 @@ package org.apache.maven.archiva.webdav.test; import org.apache.maven.archiva.webdav.DavServerManager; import org.apache.maven.archiva.webdav.servlet.basic.BasicWebDavServlet; -import org.codehaus.plexus.DefaultPlexusContainer; import org.codehaus.plexus.PlexusConstants; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.PlexusContainerException; -import org.codehaus.plexus.context.DefaultContext; +import org.codehaus.plexus.spring.PlexusContainerAdapter; import org.codehaus.plexus.util.FileUtils; import org.mortbay.jetty.Server; import org.mortbay.jetty.servlet.Context; @@ -53,18 +52,11 @@ public abstract class AbstractWebdavServer protected String basedir; - protected Map context; - /** the jetty server */ protected Server server; private DavServerManager manager; - public void init() - { - context = new HashMap(); - } - public String getBasedir() { if ( basedir != null ) @@ -91,86 +83,7 @@ public abstract class AbstractWebdavServer public void startServer() throws Exception { - basedir = getBasedir(); - - // ---------------------------------------------------------------------------- - // Context Setup - // ---------------------------------------------------------------------------- - - context = new HashMap(); - - context.put( "basedir", getBasedir() ); - - customizeContext( new DefaultContext( context ) ); - - boolean hasPlexusHome = context.containsKey( "plexus.home" ); - - if ( !hasPlexusHome ) - { - File f = getTestFile( "target/plexus-home" ); - - if ( !f.isDirectory() ) - { - f.mkdir(); - } - - context.put( "plexus.home", f.getAbsolutePath() ); - } - - // ---------------------------------------------------------------------------- - // Configuration - // ---------------------------------------------------------------------------- - - String config = getCustomConfigurationName(); - InputStream is; - - if ( config != null ) - { - is = getClass().getClassLoader().getResourceAsStream( config ); - - if ( is == null ) - { - try - { - File configFile = new File( config ); - - if ( configFile.exists() ) - { - is = new FileInputStream( configFile ); - } - } - catch ( IOException e ) - { - throw new Exception( "The custom configuration specified is null: " + config ); - } - } - - } - else - { - config = getConfigurationName( null ); - - is = getClass().getClassLoader().getResourceAsStream( config ); - } - - // Look for a configuration associated with this test but return null if we - // can't find one so the container doesn't look for a configuration that we - // know doesn't exist. Not all tests have an associated Foo.xml for testing. - - if ( is == null ) - { - config = null; - } - else - { - is.close(); - } - - // ---------------------------------------------------------------------------- - // Create the container - // ---------------------------------------------------------------------------- - - container = createContainerInstance( context, config ); + container = createContainerInstance(); // ---------------------------------------------------------------------------- // Create the DavServerManager @@ -222,27 +135,10 @@ public abstract class AbstractWebdavServer server.start(); } - protected PlexusContainer createContainerInstance( Map context, String configuration ) + protected PlexusContainer createContainerInstance() throws PlexusContainerException { - return new DefaultPlexusContainer( "test", context, configuration ); - } - - protected void customizeContext( DefaultContext ctx ) - { - /* override to specify more */ - } - - protected String getCustomConfigurationName() - { - /* override to specify */ - return null; - } - - protected String getConfigurationName( String subname ) - throws Exception - { - return getClass().getName().replace( '.', '/' ) + ".xml"; + return new PlexusContainerAdapter(); } public void stopServer() diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/MimeTypesTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/MimeTypesTest.java index 9bdbf94f6..4f8328bbf 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/MimeTypesTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/MimeTypesTest.java @@ -19,7 +19,7 @@ package org.apache.maven.archiva.webdav.util; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; /** * MimeTypesTest @@ -27,7 +27,7 @@ import org.codehaus.plexus.PlexusTestCase; * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a> * @version $Id: MimeTypesTest.java 6556 2007-06-20 20:44:46Z joakime $ */ -public class MimeTypesTest extends PlexusTestCase +public class MimeTypesTest extends PlexusInSpringTestCase { public void testGetMimeType() throws Exception { diff --git a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/WrappedRepositoryRequestTest.java b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/WrappedRepositoryRequestTest.java index a0b665735..a8f4a96c3 100644 --- a/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/WrappedRepositoryRequestTest.java +++ b/archiva-modules/archiva-web/archiva-webdav/src/test/java/org/apache/maven/archiva/webdav/util/WrappedRepositoryRequestTest.java @@ -20,7 +20,7 @@ package org.apache.maven.archiva.webdav.util; import org.apache.maven.archiva.webdav.TestableHttpServletRequest; -import org.codehaus.plexus.PlexusTestCase; +import org.codehaus.plexus.spring.PlexusInSpringTestCase; import javax.servlet.http.HttpServletRequest; import java.net.MalformedURLException; @@ -32,7 +32,7 @@ import java.net.MalformedURLException; * @version $Id: WrappedRepositoryRequestTest.java 6940 2007-10-16 01:02:02Z joakime $ */ public class WrappedRepositoryRequestTest - extends PlexusTestCase + extends PlexusInSpringTestCase { private HttpServletRequest createHttpServletGetRequest( String url ) throws MalformedURLException @@ -60,26 +60,25 @@ </execution> </executions> </plugin> - <!-- Doesn't work on Mac with Java 6 yet - <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-java</id> - <goals> - <goal>enforce-once</goal> - </goals> - <configuration> - <rules> - <requireJavaVersion> - <version>1.5.0</version> - </requireJavaVersion> - </rules> - </configuration> - </execution> - </executions> - </plugin> - --> + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <bannedDependencies> + <excludes> + <exclude>org.codehaus.plexus:plexus-container-default</exclude> + </excludes> + </bannedDependencies> + </rules> + </configuration> + </execution> + </executions> + </plugin> <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> @@ -186,11 +185,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-slf4j-logging</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> |