summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/AbstractDownloadMojo.java3
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/AbstractUnpackMojo.java3
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java4
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarGnuConfigureMojo.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java2
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarTestDownloadMojo.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarTestUnpackMojo.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarVcprojMojo.java1
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/StringTextStream.java3
-rw-r--r--src/test/java/org/apache/maven/plugin/nar/test/TestLinkerVersion.java2
-rw-r--r--src/test/java/org/apache/maven/plugin/nar/test/TestNarFileLayout10.java10
14 files changed, 9 insertions, 25 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractDownloadMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractDownloadMojo.java
index 5315939..f96464e 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractDownloadMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractDownloadMojo.java
@@ -19,12 +19,9 @@ package org.apache.maven.plugin.nar;
* under the License.
*/
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
/**
* Downloads any dependent NAR files. This includes the noarch and aol type NAR files.
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractUnpackMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractUnpackMojo.java
index 9a201ed..40feda9 100644
--- a/src/main/java/org/apache/maven/plugin/nar/AbstractUnpackMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/AbstractUnpackMojo.java
@@ -19,11 +19,8 @@ package org.apache.maven.plugin.nar;
* under the License.
*/
-import java.util.Iterator;
import java.util.List;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
/**
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
index c912743..772b410 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarAssemblyMojo.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.nar;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
index 42e5a33..480481f 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarCompileMojo.java
@@ -38,11 +38,9 @@ import net.sf.antcontrib.cpptasks.types.LibrarySet;
import net.sf.antcontrib.cpptasks.types.LinkerArgument;
import net.sf.antcontrib.cpptasks.types.SystemLibrarySet;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.project.MavenProject;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.codehaus.plexus.util.FileUtils;
@@ -68,7 +66,7 @@ public class NarCompileMojo
* @required
* @readonly
*/
- private MavenSession session;
+ protected MavenSession session;
public final void narExecute()
throws MojoExecutionException, MojoFailureException
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
index 8992665..9149f65 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarDownloadMojo.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.nar;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarGnuConfigureMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarGnuConfigureMojo.java
index e1ecfe1..4ec767b 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarGnuConfigureMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarGnuConfigureMojo.java
@@ -21,7 +21,6 @@ package org.apache.maven.plugin.nar;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
index 259484b..034e3ed 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestCompileMojo.java
@@ -58,7 +58,7 @@ public class NarTestCompileMojo
*
* @parameter expression="${skipNar}" default-value="false"
*/
- private boolean skipNar;
+ protected boolean skipNar;
public final void narExecute()
throws MojoExecutionException, MojoFailureException
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestDownloadMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestDownloadMojo.java
index 988bc88..ff78048 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestDownloadMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestDownloadMojo.java
@@ -22,7 +22,6 @@ package org.apache.maven.plugin.nar;
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarTestUnpackMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarTestUnpackMojo.java
index b74ece1..4baf890 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarTestUnpackMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarTestUnpackMojo.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
/**
* Unpacks NAR files. Unpacking happens in the local repository, and also sets flags on binaries and corrects static
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
index b3e2be7..3e46dbd 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarUnpackMojo.java
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.archiver.manager.ArchiverManager;
/**
* Unpacks NAR files. Unpacking happens in the local repository, and also sets flags on binaries and corrects static
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarVcprojMojo.java b/src/main/java/org/apache/maven/plugin/nar/NarVcprojMojo.java
index 7dbf579..2b106e0 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarVcprojMojo.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarVcprojMojo.java
@@ -13,7 +13,6 @@ import net.sf.antcontrib.cpptasks.LinkerDef;
import net.sf.antcontrib.cpptasks.OutputTypeEnum;
import net.sf.antcontrib.cpptasks.RuntimeType;
import net.sf.antcontrib.cpptasks.SubsystemEnum;
-import net.sf.antcontrib.cpptasks.ide.DependencyDef;
import net.sf.antcontrib.cpptasks.ide.ProjectDef;
import net.sf.antcontrib.cpptasks.ide.ProjectWriterEnum;
import net.sf.antcontrib.cpptasks.types.DefineArgument;
diff --git a/src/main/java/org/apache/maven/plugin/nar/StringTextStream.java b/src/main/java/org/apache/maven/plugin/nar/StringTextStream.java
index 8acf4e0..ac69ef5 100644
--- a/src/main/java/org/apache/maven/plugin/nar/StringTextStream.java
+++ b/src/main/java/org/apache/maven/plugin/nar/StringTextStream.java
@@ -35,8 +35,7 @@ public class StringTextStream
public StringTextStream()
{
sb = new StringBuffer();
- lineSeparator = System.getProperty( "line.separator" );
- assert ( lineSeparator != null );
+ lineSeparator = System.getProperty( "line.separator", "\n" );
}
/*
diff --git a/src/test/java/org/apache/maven/plugin/nar/test/TestLinkerVersion.java b/src/test/java/org/apache/maven/plugin/nar/test/TestLinkerVersion.java
index 021f7de..ee8eede 100644
--- a/src/test/java/org/apache/maven/plugin/nar/test/TestLinkerVersion.java
+++ b/src/test/java/org/apache/maven/plugin/nar/test/TestLinkerVersion.java
@@ -44,7 +44,7 @@ public class TestLinkerVersion
super.setUp();
String architecture = System.getProperty( "os.arch" );
linker = new Linker();
- String name =
+// String name =
linker.getName( NarUtil.getDefaults(), NarUtil.getArchitecture( architecture ) + "." + NarUtil.getOS( null )
+ "." );
}
diff --git a/src/test/java/org/apache/maven/plugin/nar/test/TestNarFileLayout10.java b/src/test/java/org/apache/maven/plugin/nar/test/TestNarFileLayout10.java
index e75736b..342adee 100644
--- a/src/test/java/org/apache/maven/plugin/nar/test/TestNarFileLayout10.java
+++ b/src/test/java/org/apache/maven/plugin/nar/test/TestNarFileLayout10.java
@@ -35,15 +35,15 @@ import junit.framework.TestCase;
public class TestNarFileLayout10
extends TestCase
{
- private NarFileLayout fileLayout;
+ protected NarFileLayout fileLayout;
- private String artifactId;
+ protected String artifactId;
- private String version;
+ protected String version;
- private String aol;
+ protected String aol;
- private String type;
+ protected String type;
/*
* (non-Javadoc)