From 153a5d32f8996cf9e4f887eea5531ec7f7ce2d26 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Sun, 24 Feb 2008 05:18:02 +0000 Subject: [PATCH] MRM-709: Use commons-io instead of Plexus Utils * Changing to FileUtils in commons-io. git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@630592 13f79535-47bb-0310-9956-ffa450edef68 --- .../converter/artifact/LegacyToDefaultConverterTest.java | 2 +- .../archiva/consumers/database/AbstractDatabaseCleanupTest.java | 2 +- .../apache/maven/archiva/indexer/AbstractIndexerTestCase.java | 2 +- .../indexer/search/DefaultCrossRepositorySearchTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java b/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java index 4a47c78e4..db4ab1855 100644 --- a/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java +++ b/archiva-base/archiva-artifact-converter/src/test/java/org/apache/maven/archiva/converter/artifact/LegacyToDefaultConverterTest.java @@ -19,6 +19,7 @@ package org.apache.maven.archiva.converter.artifact; * under the License. */ +import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.converter.artifact.ArtifactConversionException; import org.apache.maven.archiva.converter.artifact.ArtifactConverter; import org.apache.maven.archiva.converter.artifact.Messages; @@ -31,7 +32,6 @@ 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.util.FileUtils; import java.io.File; import java.io.IOException; diff --git a/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java b/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java index 33f4a62a0..098e8a0a6 100644 --- a/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java +++ b/archiva-base/archiva-consumers/archiva-database-consumers/src/test/java/org/apache/maven/archiva/consumers/database/AbstractDatabaseCleanupTest.java @@ -20,7 +20,7 @@ package org.apache.maven.archiva.consumers.database; */ import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.util.FileUtils; +import org.apache.commons.io.FileUtils; import org.apache.maven.archiva.configuration.ArchivaConfiguration; import org.apache.maven.archiva.configuration.Configuration; import org.apache.maven.archiva.configuration.ManagedRepositoryConfiguration; diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java index 3aaec0272..56d6d60ec 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/AbstractIndexerTestCase.java @@ -19,6 +19,7 @@ package org.apache.maven.archiva.indexer; * under the License. */ +import org.apache.commons.io.FileUtils; import org.apache.lucene.document.Document; import org.apache.lucene.index.IndexWriter; import org.apache.maven.archiva.configuration.ArchivaConfiguration; @@ -27,7 +28,6 @@ import org.apache.maven.archiva.indexer.lucene.LuceneIndexHandlers; import org.apache.maven.archiva.indexer.lucene.LuceneRepositoryContentRecord; import org.apache.maven.archiva.model.ArchivaArtifact; import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.util.FileUtils; import java.io.File; import java.io.IOException; diff --git a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java index cee75ec0a..099376533 100644 --- a/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java +++ b/archiva-base/archiva-indexer/src/test/java/org/apache/maven/archiva/indexer/search/DefaultCrossRepositorySearchTest.java @@ -19,6 +19,7 @@ package org.apache.maven.archiva.indexer.search; * under the License. */ +import org.apache.commons.io.FileUtils; import org.apache.lucene.search.Hits; import org.apache.lucene.search.MatchAllDocsQuery; import org.apache.lucene.search.Query; @@ -32,7 +33,6 @@ import org.apache.maven.archiva.indexer.bytecode.BytecodeRecord; import org.apache.maven.archiva.indexer.filecontent.FileContentRecord; import org.apache.maven.archiva.indexer.hashcodes.HashcodesRecord; import org.codehaus.plexus.PlexusTestCase; -import org.codehaus.plexus.util.FileUtils; import java.io.File; import java.util.ArrayList; -- 2.39.5