Upgraded plexus-utils to 2.0.0; Fixed NarUtil.runCommand; Fixed NAR-25 on Windows; Removed ArchiverManager from GnuProcess

2 files changed, 3 insertions, 11 deletions

diff --git a/src/main/java/org/apache/maven/plugin/nar/NarGnuProcess.java b/src/main/java/org/apache/maven/plugin/nar/NarGnuProcess.java
index 5f2eb5b..e232895 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarGnuProcess.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarGnuProcess.java
@@ -23,7 +23,6 @@ import java.io.File;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
 
 /**
  * Move the GNU style output in the correct directories for nar-package
@@ -36,14 +35,6 @@ import org.codehaus.plexus.archiver.manager.ArchiverManager;
 public class NarGnuProcess
     extends AbstractGnuMojo
 {
-    /**
-     * To look up Archiver/UnArchiver implementations
-     * 
-     * @component role="org.codehaus.plexus.archiver.manager.ArchiverManager"
-     * @required
-     */
-    private ArchiverManager archiverManager;
-
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUtil.java b/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
index 2470e4e..ea0d8ce 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUtil.java
@@ -468,7 +468,8 @@ public class NarUtil
 
         // NOTE and FIXME: we need to properly put system variables in there
         // mixed (overridden) by our own.
-        public String[] getEnvironmentVariables()
+/*
+    	public String[] getEnvironmentVariables()
             throws CommandLineException
         {
             if ( envVars.size() == 0 )
@@ -503,7 +504,7 @@ public class NarUtil
 
             return systemEnvVars;
         }
-
+*/
     }
 
     static class StreamGobbler