diff options
| author | unknown <duns@.(none)> | 2009-10-19 14:10:30 +0200 |
|---|---|---|
| committer | unknown <duns@.(none)> | 2009-10-19 14:10:30 +0200 |
| commit | 33d0dd6643183d1f49e7e7a893305f0e136f249e (patch) | |
| tree | fdba168ff43bdb77040b2ab3f0c897c646a09cc7 | |
| parent | 022eb158aa10fa06e3eba7a1d49ab58a6d06163d (diff) | |
| download | maven-nar-plugin-33d0dd6643183d1f49e7e7a893305f0e136f249e.tar.gz maven-nar-plugin-33d0dd6643183d1f49e7e7a893305f0e136f249e.tar.bz2 maven-nar-plugin-33d0dd6643183d1f49e7e7a893305f0e136f249e.tar.xz maven-nar-plugin-33d0dd6643183d1f49e7e7a893305f0e136f249e.zip | |
Upgraded plexus-utils to 2.0.0; Fixed NarUtil.runCommand; Fixed NAR-25 on Windows; Removed ArchiverManager from GnuProcess
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarGnuProcess.java | 9 | ||||
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarUtil.java | 5 |
3 files changed, 4 insertions, 12 deletions
@@ -94,7 +94,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.4.1</version> + <version>2.0.0</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> 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 |