MSHARED-239 replace plexus-utils with maven-shared-utils
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1379502 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index ed41d87..b208398 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,12 @@
<version>2.0.8</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-container-default</artifactId>
<version>1.5.5</version>
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
index 0f98b2f..50eb121 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
@@ -26,7 +26,7 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* This is the common base class of ClassifierFilter and TypeFilter
@@ -54,7 +54,7 @@
/**
* This function determines if filtering needs to be performed. Includes are processed before Excludes.
*
- * @param dependencies the set of dependencies to filter.
+ * @param artifacts the set of dependencies to filter.
* @return a Set of filtered dependencies.
*/
public Set filter( Set artifacts )
@@ -77,8 +77,8 @@
/**
* Processes the dependencies list and includes the dependencies that match a filter in the list.
*
- * @param depends List of dependencies.
- * @param includes List of types or classifiers to include.
+ * @param artifacts List of dependencies.
+ * @param theIncludes List of types or classifiers to include.
* @return a set of filtered artifacts.
*/
private Set filterIncludes( Set artifacts, List theIncludes )
diff --git a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
index d33e0e1..8f00191 100644
--- a/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
+++ b/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
@@ -25,7 +25,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.codehaus.plexus.util.StringUtils;
+import org.apache.maven.shared.utils.StringUtils;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
diff --git a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
index 9ad6391..bf50e99 100644
--- a/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
+++ b/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
@@ -31,7 +31,7 @@
import junit.framework.TestCase;
import org.apache.maven.plugin.testing.ArtifactStubFactory;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.maven.shared.utils.io.FileUtils;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
