[MSHARED-625] Refactored to use 'maven-shared-utils' instead of 'plexus-utils'.
git-svn-id: https://svn.apache.org/repos/asf/maven/shared/trunk@1784447 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/pom.xml b/pom.xml
index 1545bab..384ed4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,10 @@
</parent>
<artifactId>maven-invoker</artifactId>
- <version>3.0.1-SNAPSHOT</version>
+ <!--
+ https://issues.apache.org/jira/browse/MSHARED-625
+ -->
+ <version>4.0.0-SNAPSHOT</version>
<name>Apache Maven Invoker</name>
<description>A component to programmatically invoke Maven.</description>
@@ -62,9 +65,17 @@
<dependencies>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.24</version>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-shared-utils</artifactId>
+ <!--
+ https://issues.apache.org/jira/browse/MSHARED-617
+ https://issues.apache.org/jira/browse/MSHARED-618
+ https://issues.apache.org/jira/browse/MSHARED-619
+ https://issues.apache.org/jira/browse/MSHARED-620
+ https://issues.apache.org/jira/browse/MSHARED-621
+ https://issues.apache.org/jira/browse/MSHARED-622
+ -->
+ <version>3.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<!--
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 817e905..be32842 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.codehaus.plexus.util.cli.CommandLineException;
+import org.apache.maven.shared.utils.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 154b55b..39be540 100644
--- a/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
+++ b/src/main/java/org/apache/maven/shared/invoker/DefaultInvoker.java
@@ -22,10 +22,10 @@
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.component.annotations.Component;
-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 cd15122..e653d62 100644
--- a/src/main/java/org/apache/maven/shared/invoker/InvocationOutputHandler.java
+++ b/src/main/java/org/apache/maven/shared/invoker/InvocationOutputHandler.java
@@ -19,11 +19,11 @@
* under the License.
*/
-import org.codehaus.plexus.util.cli.StreamConsumer;
+import org.apache.maven.shared.utils.cli.StreamConsumer;
/**
* Receives the standard/error output from a Maven invocation.
- *
+ *
* @version $Id$
*/
public interface InvocationOutputHandler
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 0f0985e..4d69e01 100644
--- a/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
+++ b/src/main/java/org/apache/maven/shared/invoker/InvocationResult.java
@@ -19,11 +19,11 @@
* under the License.
*/
-import org.codehaus.plexus.util.cli.CommandLineException;
+import org.apache.maven.shared.utils.cli.CommandLineException;
/**
* Describes the result of a Maven invocation.
- *
+ *
* @author jdcasey
* @version $Id$
*/
@@ -32,7 +32,7 @@
/**
* Gets the exception that possibly occurred during the execution of the command line.
- *
+ *
* @return The exception that prevented to invoke Maven or <code>null</code> if the command line was successfully
* processed by the operating system.
*/
@@ -41,7 +41,7 @@
/**
* Gets the exit code from the Maven invocation. A non-zero value indicates a build failure. <strong>Note:</strong>
* This value is undefined if {@link #getExecutionException()} reports an exception.
- *
+ *
* @return The exit code from the Maven invocation.
*/
int getExitCode();
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 147458d..86a7f69 100644
--- a/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
+++ b/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
@@ -29,10 +29,10 @@
import org.apache.maven.shared.invoker.InvocationRequest.CheckSumPolicy;
import org.apache.maven.shared.invoker.InvocationRequest.ReactorFailureBehavior;
-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;
+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;
/**
* @version $Id$
@@ -208,11 +208,6 @@
// proper value
cli.addEnvironment( "M2_HOME", getMavenHome().getAbsolutePath() );
}
- catch ( IOException e )
- {
- throw new CommandLineConfigurationException( "Error reading shell environment variables. Reason: "
- + e.getMessage(), e );
- }
catch ( Exception e )
{
if ( e instanceof RuntimeException )
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 f0924c0..ddce746 100644
--- a/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/DefaultInvokerTest.java
@@ -19,8 +19,6 @@
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -30,10 +28,12 @@
import java.util.List;
import java.util.Properties;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.apache.maven.shared.utils.StringUtils;
+import org.apache.maven.shared.utils.cli.CommandLineUtils;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+
public class DefaultInvokerTest
{
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 613579c..77d2b0f 100644
--- a/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
+++ b/src/test/java/org/apache/maven/shared/invoker/MavenCommandLineBuilderTest.java
@@ -19,11 +19,6 @@
* under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -35,16 +30,21 @@
import java.util.Properties;
import java.util.Set;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.Os;
-import org.codehaus.plexus.util.cli.CommandLineException;
-import org.codehaus.plexus.util.cli.Commandline;
+import org.apache.maven.shared.utils.Os;
+import org.apache.maven.shared.utils.cli.CommandLineException;
+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.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
public class MavenCommandLineBuilderTest
{
