Reuse plexus-utils instead of maven-shared-utils to be able to release.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1401842 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 03579c8..a34cbd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,10 +53,17 @@
<dependencies>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.8</version>
+ </dependency>
+ <!--
+ <dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
+ -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
diff --git a/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java b/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java
index be32842..817e905 100644
--- a/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java
+++ b/src/main/java/org/apache/maven/shared/invoker/DefaultInvocationResult.java
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineException;
/**
* Describes the result of a Maven invocation.
diff --git a/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java b/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
index 6f34b6f..65c6a87 100644
--- a/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
+++ b/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
@@ -22,9 +22,9 @@
import java.io.File;
import java.io.InputStream;
-import org.apache.maven.shared.utils.cli.CommandLineException;
-import org.apache.maven.shared.utils.cli.CommandLineUtils;
-import org.apache.maven.shared.utils.cli.Commandline;
+import org.codehaus.plexus.util.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
/**
* Class intended to be used by clients who wish to invoke a forked Maven process from their applications
diff --git a/src/main/java/org/apache/maven/shared/invoker/InvocationOutputHandler.java b/src/main/java/org/apache/maven/shared/invoker/InvocationOutputHandler.java
index f1eed27..cd15122 100644
--- a/src/main/java/org/apache/maven/shared/invoker/InvocationOutputHandler.java
+++ b/src/main/java/org/apache/maven/shared/invoker/InvocationOutputHandler.java
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.shared.utils.cli.StreamConsumer;
+import org.codehaus.plexus.util.cli.StreamConsumer;
/**
* Receives the standard/error output from a Maven invocation.
diff --git a/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java b/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
index fbb5f39..0f0985e 100644
--- a/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
+++ b/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
@@ -19,7 +19,7 @@
* under the License.
*/
-import org.apache.maven.shared.utils.cli.CommandLineException;
+import org.codehaus.plexus.util.cli.CommandLineException;
/**
* Describes the result of a Maven invocation.
diff --git a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
index a32aa47..f34aa3d 100644
--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
@@ -26,10 +26,10 @@
import java.util.Map;
import java.util.Properties;
-import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.cli.CommandLineUtils;
-import org.apache.maven.shared.utils.cli.Commandline;
+import org.codehaus.plexus.util.Os;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.Commandline;
/**
* @version $Id$
diff --git a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
index f8eb6b7..eb03c23 100644
--- a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
@@ -30,8 +30,8 @@
import junit.framework.TestCase;
-import org.apache.maven.shared.utils.StringUtils;
-import org.apache.maven.shared.utils.cli.CommandLineUtils;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
public class DefaultInvokerTest
extends TestCase
diff --git a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
index e972e02..73b8818 100644
--- a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
@@ -32,10 +32,10 @@
import junit.framework.TestCase;
-import org.apache.maven.shared.utils.Os;
-import org.apache.maven.shared.utils.cli.Commandline;
-import org.apache.maven.shared.utils.io.FileUtils;
-import org.apache.maven.shared.utils.io.IOUtil;
+import org.codehaus.plexus.util.Os;
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
public class MavenCommandLineBuilderTest
extends TestCase
