Author: khmarbaise
Date: Sun Nov 9 00:54:30 2014
New Revision: 1637616
URL: http://svn.apache.org/r1637616
Log:
[MSOURCES-76] Upgrade from maven-plugins version 25 to 26
- Fixed checkstyle reported errors.
Modified:
maven/plugins/trunk/maven-source-plugin/pom.xml
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Modified: maven/plugins/trunk/maven-source-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/pom.xml?rev=1637616&r1=1637615&r2=1637616&view=diff
==============================================================================
--- maven/plugins/trunk/maven-source-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-source-plugin/pom.xml Sun Nov 9 00:54:30 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
Modified:
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java?rev=1637616&r1=1637615&r2=1637616&view=diff
==============================================================================
---
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
(original)
+++
maven/plugins/trunk/maven-source-plugin/src/main/java/org/apache/maven/plugin/source/AbstractSourceJarMojo.java
Sun Nov 9 00:54:30 2014
@@ -51,9 +51,9 @@ import org.codehaus.plexus.util.FileUtil
public abstract class AbstractSourceJarMojo
extends AbstractMojo
{
- private static final String[] DEFAULT_INCLUDES = new String[]{ "**/*" };
+ private static final String[] DEFAULT_INCLUDES = new String[] { "**/*" };
- private static final String[] DEFAULT_EXCLUDES = new String[]{ };
+ private static final String[] DEFAULT_EXCLUDES = new String[] {};
/**
* List of files to include. Specified as fileset patterns which are
relative to the input directory whose contents
@@ -84,9 +84,8 @@ public abstract class AbstractSourceJarM
/**
* The Maven Project Object
- *
*/
- @Parameter(defaultValue = "${project}", readonly = true, required = true)
+ @Parameter( defaultValue = "${project}", readonly = true, required = true )
protected MavenProject project;
/**
@@ -110,8 +109,9 @@ public abstract class AbstractSourceJarM
*
* @since 2.1
*/
- @Parameter( defaultValue =
"${project.build.outputDirectory}/META-INF/MANIFEST.MF", readonly = false,
- required = true )
+ // CHECKSTYLE_OFF: LineLength
+ @Parameter( defaultValue =
"${project.build.outputDirectory}/META-INF/MANIFEST.MF", readonly = false,
required = true )
+ // CHECKSTYLE_ON: LineLength
private File defaultManifestFile;
/**
@@ -173,8 +173,8 @@ public abstract class AbstractSourceJarM
protected List reactorProjects;
/**
- * Whether creating the archive should be forced. If set to true, the jar
will
- * always be created. If set to false, the jar will only be created when
the
+ * Whether creating the archive should be forced. If set to true, the jar
will
+ * always be created. If set to false, the jar will only be created when
the
* sources are newer than the jar.
*
* @since 2.1
@@ -196,7 +196,7 @@ public abstract class AbstractSourceJarM
*/
@Parameter( defaultValue = "${session}", readonly = true, required = true )
private MavenSession session;
-
+
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
@@ -352,7 +352,7 @@ public abstract class AbstractSourceJarM
}
}
- //MAPI: this should be taken from the resources plugin
+ // MAPI: this should be taken from the resources plugin
for ( Resource resource : getResources( p ) )
{
