Author: khmarbaise
Date: Wed Nov 12 01:15:09 2014
New Revision: 1638681
URL: http://svn.apache.org/r1638681
Log:
[MACR-18] Upgrade to maven-plugins version 25 to 26
- Fixed checkstyle reported issues.
Modified:
maven/plugins/trunk/maven-acr-plugin/pom.xml
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
Modified: maven/plugins/trunk/maven-acr-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/pom.xml?rev=1638681&r1=1638680&r2=1638681&view=diff
==============================================================================
--- maven/plugins/trunk/maven-acr-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-acr-plugin/pom.xml Wed Nov 12 01:15:09 2014
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugins</artifactId>
- <version>25</version>
+ <version>26</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
Modified:
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java?rev=1638681&r1=1638680&r2=1638681&view=diff
==============================================================================
---
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
(original)
+++
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
Wed Nov 12 01:15:09 2014
@@ -54,7 +54,9 @@ import org.codehaus.plexus.util.FileUtil
* @author <a href="[email protected]">Stephane Nicoll</a>
* @version $Id:
*/
+// CHECKSTYLE_OFF: LineLength
@Mojo( name = "acr", requiresDependencyResolution = ResolutionScope.RUNTIME,
threadSafe = true, defaultPhase = LifecyclePhase.PACKAGE )
+// CHECKSTYLE_ON: LineLength
public class AcrMojo
extends AbstractMojo
{
@@ -191,7 +193,9 @@ public class AcrMojo
}
else
{
+ // CHECKSTYLE_OFF: LineLength
getLog().info( "JAR will only contain the
META-INF/application-client.xml as no content was marked for inclusion" );
+ // CHECKSTYLE_ON: LineLength
}
if ( deploymentDescriptor.exists() )
@@ -218,6 +222,7 @@ public class AcrMojo
// create archive
archiver.createArchive( session, project, archive );
+ // CHECKSTYLE_OFF: LineLength
}
catch ( ArchiverException e )
{
@@ -250,6 +255,7 @@ public class AcrMojo
project.getArtifact().setFile( jarFile );
+ // CHECKSTYLE_ON: LineLength
}
/**
