Author: hboutemy
Date: Mon Nov 17 21:20:42 2014
New Revision: 1640228
URL: http://svn.apache.org/r1640228
Log:
updated parent pom and fixed errors reported by Checkstyle
Modified:
maven/plugins/trunk/maven-ant-plugin/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=1640228&r1=1640227&r2=1640228&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/pom.xml Mon Nov 17 21:20:42 2014
@@ -26,7 +26,7 @@ under the License.
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>25</version>
+ <version>27</version>
<relativePath>../maven-plugins/pom.xml</relativePath>
</parent>
@@ -61,7 +61,6 @@ under the License.
<properties>
<mavenVersion>2.2.1</mavenVersion>
<antVersion>1.8.1</antVersion>
- <mavenPluginVersion>3.2</mavenPluginVersion>
</properties>
<contributors>
@@ -105,8 +104,6 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
- <version>${mavenPluginVersion}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
@@ -157,36 +154,6 @@ under the License.
</dependency>
</dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>${mavenPluginVersion}</version>
- <configuration>
- <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <executions>
- <execution>
- <id>mojo-descriptor</id>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<profiles>
<profile>
<id>run-its</id>
@@ -197,15 +164,6 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
<configuration>
- <debug>true</debug>
- <projectsDirectory>src/it</projectsDirectory>
-
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <settingsFile>src/it/settings.xml</settingsFile>
-
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
<goals>
<goal>clean</goal>
<goal>ant:ant</goal>
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=1640228&r1=1640227&r2=1640228&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
Mon Nov 17 21:20:42 2014
@@ -958,6 +958,7 @@ public class AntBuildWriter
AntBuildWriterUtil.addWrapAttribute( writer, "target", "depends",
"test-junit-status", 2 );
AntBuildWriterUtil.addWrapAttribute( writer, "target", "if",
"junit.missing", 2 );
+ // CHECKSTYLE_OFF: MagicNumber
writer.startElement( "echo" );
writer.writeText( StringUtils.repeat( "=", 35 ) + " WARNING " +
StringUtils.repeat( "=", 35 ) );
writer.endElement(); // echo
@@ -970,6 +971,7 @@ public class AntBuildWriter
writer.startElement( "echo" );
writer.writeText( StringUtils.repeat( "=", 79 ) );
writer.endElement(); // echo
+ // CHECKSTYLE_ON: MagicNumber
writer.endElement(); // target
}
@@ -1177,10 +1179,12 @@ public class AntBuildWriter
AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
"optimize",
"false" ), 3 );
+ // CHECKSTYLE_OFF: LineLength
AntBuildWriterUtil.addWrapAttribute( writer, "javac",
"deprecation",
AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
"showDeprecation",
"true" ), 3 );
+ // CHECKSTYLE_ON: LineLength
AntBuildWriterUtil.addWrapAttribute( writer, "javac", "target",
AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
"target",
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java?rev=1640228&r1=1640227&r2=1640228&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
Mon Nov 17 21:20:42 2014
@@ -117,16 +117,18 @@ public class AntBuildWriterUtil
writeAntVersionHeader( writer );
XmlWriterUtil.writeCommentLineBreak( writer );
- XmlWriterUtil.writeComment( writer,
- StringUtils.repeat( "=", 21 ) + " - DO NOT
EDIT THIS FILE! - " + StringUtils.repeat(
- "=", 21 ) );
+ // CHECKSTYLE_OFF: MagicNumber
+ XmlWriterUtil.writeComment( writer, StringUtils.repeat( "=", 21 ) + "
- DO NOT EDIT THIS FILE! - "
+ + StringUtils.repeat( "=", 21 ) );
+ // CHECKSTYLE_ON: MagicNumber
XmlWriterUtil.writeCommentLineBreak( writer );
XmlWriterUtil.writeComment( writer, " " );
XmlWriterUtil.writeComment( writer, "Any modifications will be
overwritten." );
XmlWriterUtil.writeComment( writer, " " );
DateFormat dateFormat = DateFormat.getDateTimeInstance(
DateFormat.SHORT, DateFormat.SHORT, Locale.US );
- XmlWriterUtil.writeComment( writer, "Generated by Maven Ant Plugin on
" + dateFormat.format(
- new Date( System.currentTimeMillis() ) ) );
+ XmlWriterUtil.writeComment( writer,
+ "Generated by Maven Ant Plugin on "
+ + dateFormat.format( new Date(
System.currentTimeMillis() ) ) );
XmlWriterUtil.writeComment( writer, "See:
http://maven.apache.org/plugins/maven-ant-plugin/"; );
XmlWriterUtil.writeComment( writer, " " );
XmlWriterUtil.writeCommentLineBreak( writer );
@@ -211,19 +213,20 @@ public class AntBuildWriterUtil
{
writer.addAttribute( "sourcepath", sourcepath );
}
- addWrapAttribute( writer, "javadoc", "destdir",
getMavenJavadocPluginBasicOption( project, "destdir",
-
"${maven.reporting.outputDirectory}/apidocs" ),
- 3 );
+ addWrapAttribute( writer,
+ "javadoc",
+ "destdir",
+ getMavenJavadocPluginBasicOption( project, "destdir",
+
"${maven.reporting.outputDirectory}/apidocs" ), 3 );
addWrapAttribute( writer, "javadoc", "extdirs",
getMavenJavadocPluginBasicOption( project, "extdirs", null ),
3 );
-
addWrapAttribute( writer, "javadoc", "overview",
getMavenJavadocPluginBasicOption( project, "overview", null ),
3 );
- addWrapAttribute( writer, "javadoc", "access",
getMavenJavadocPluginBasicOption( project, "show", "protected" ),
- 3 );
+ addWrapAttribute( writer, "javadoc", "access",
+ getMavenJavadocPluginBasicOption( project, "show",
"protected" ), 3 );
addWrapAttribute( writer, "javadoc", "old",
getMavenJavadocPluginBasicOption( project, "old", "false" ), 3 );
- addWrapAttribute( writer, "javadoc", "verbose",
getMavenJavadocPluginBasicOption( project, "verbose", "false" ),
- 3 );
+ addWrapAttribute( writer, "javadoc", "verbose",
+ getMavenJavadocPluginBasicOption( project,
"verbose", "false" ), 3 );
addWrapAttribute( writer, "javadoc", "locale",
getMavenJavadocPluginBasicOption( project, "locale", null ), 3 );
addWrapAttribute( writer, "javadoc", "encoding",
getMavenJavadocPluginBasicOption( project, "encoding", null ),
3 );
@@ -242,8 +245,8 @@ public class AntBuildWriterUtil
getMavenJavadocPluginBasicOption( project,
"nodeprecatedlist", "false" ), 3 );
addWrapAttribute( writer, "javadoc", "notree",
getMavenJavadocPluginBasicOption( project, "notree", "false" ),
3 );
- addWrapAttribute( writer, "javadoc", "noindex",
getMavenJavadocPluginBasicOption( project, "noindex", "false" ),
- 3 );
+ addWrapAttribute( writer, "javadoc", "noindex",
+ getMavenJavadocPluginBasicOption( project,
"noindex", "false" ), 3 );
addWrapAttribute( writer, "javadoc", "nohelp",
getMavenJavadocPluginBasicOption( project, "nohelp", "false" ),
3 );
addWrapAttribute( writer, "javadoc", "nonavbar",
@@ -654,7 +657,8 @@ public class AntBuildWriterUtil
}
/**
- * Return an array of map of <code>optionName</code> value defined in a
project for the "maven-compiler-plugin" plugin.
+ * Return an array of map of <code>optionName</code> value defined in a
project for the "maven-compiler-plugin"
+ * plugin.
*
* @param project not null
* @param optionName the option name wanted
@@ -700,7 +704,8 @@ public class AntBuildWriterUtil
}
/**
- * Return an array of map of <code>optionName</code> value defined in a
project for the "maven-surefire-plugin" plugin.
+ * Return an array of map of <code>optionName</code> value defined in a
project for the "maven-surefire-plugin"
+ * plugin.
*
* @param project not null
* @param optionName the option name wanted
@@ -746,7 +751,8 @@ public class AntBuildWriterUtil
}
/**
- * Return an array of map of <code>optionName</code> value defined in a
project for the "maven-javadoc-plugin" plugin.
+ * Return an array of map of <code>optionName</code> value defined in a
project for the "maven-javadoc-plugin"
+ * plugin.
*
* @param project not null
* @param optionName the option name wanted
@@ -954,7 +960,8 @@ public class AntBuildWriterUtil
* </option>
* </options>
* </pre></td>
- * <td><pre>{options=[{option=[{param1=value1, param2=value2}]},
{option=[{param1=value1, param2=value2}]}]<pre></td>
+ * <td><pre>{options=[{option=[{param1=value1, param2=value2}]},
{option=[{param1=value1, param2=value2}]}]<pre>
+ * </td>
* </tr>
* </table>
*
@@ -1056,7 +1063,7 @@ public class AntBuildWriterUtil
if ( isElementContent( child ) )
{
- Map<String,String> properties = new
HashMap<String,String>();
+ Map<String, String> properties = new
HashMap<String, String>();
NodeList childs2 = child.getChildNodes();
if ( childs2.getLength() > 0 )
{
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java?rev=1640228&r1=1640227&r2=1640228&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
Mon Nov 17 21:20:42 2014
@@ -33,7 +33,7 @@ import org.apache.maven.project.MavenPro
* @author <a href="mailto:[email protected]";>Vincent Siveton</a>
* @version $Id$
*/
-@Mojo(name = "clean")
+@Mojo( name = "clean" )
public class AntCleanMojo
extends AbstractMojo
{
@@ -56,7 +56,7 @@ public class AntCleanMojo
*
* @since 2.2
*/
- @Parameter(property = "deleteCustomFiles", defaultValue = "false")
+ @Parameter( property = "deleteCustomFiles", defaultValue = "false" )
private boolean deleteCustomFiles;
/**
@@ -77,8 +77,8 @@ public class AntCleanMojo
}
else if ( getLog().isInfoEnabled() )
{
- getLog().info( "Not deleting custom " + buildXml.getName() +
- ", use -DdeleteCustomFiles=true to force
its deletion" );
+ getLog().info( "Not deleting custom " + buildXml.getName()
+ + ", use -DdeleteCustomFiles=true to force
its deletion" );
}
}
@@ -94,8 +94,8 @@ public class AntCleanMojo
throw new MojoExecutionException( "Cannot delete " +
mavenBuildProperties.getAbsolutePath() );
}
- getLog().info( "Deleted Ant build files for project " +
project.getArtifactId() + " in " +
- project.getBasedir().getAbsolutePath() );
+ getLog().info( "Deleted Ant build files for project " +
project.getArtifactId() + " in "
+ + project.getBasedir().getAbsolutePath() );
}
}
Modified:
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java?rev=1640228&r1=1640227&r2=1640228&view=diff
==============================================================================
---
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
(original)
+++
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
Mon Nov 17 21:20:42 2014
@@ -43,7 +43,7 @@ import org.apache.maven.settings.Setting
* @version $Id$
* @todo change this to use the artifact ant tasks instead of :get
*/
-@Mojo(name = "ant", requiresDependencyResolution = ResolutionScope.TEST)
+@Mojo( name = "ant", requiresDependencyResolution = ResolutionScope.TEST )
public class AntMojo
extends AbstractMojo
{
@@ -76,13 +76,13 @@ public class AntMojo
/**
* The local repository where the artifacts are located.
*/
- @Parameter(defaultValue = "${localRepository}", required = true, readonly
= true)
+ @Parameter( defaultValue = "${localRepository}", required = true, readonly
= true )
private ArtifactRepository localRepository;
/**
* The remote repositories where artifacts are located.
*/
- @Parameter(defaultValue = "${project.remoteArtifactRepositories}",
readonly = true)
+ @Parameter( defaultValue = "${project.remoteArtifactRepositories}",
readonly = true )
private List remoteRepositories;
/**
@@ -94,7 +94,7 @@ public class AntMojo
/**
* Whether or not to overwrite the <code>build.xml</code> file.
*/
- @Parameter(property = "overwrite", defaultValue = "false")
+ @Parameter( property = "overwrite", defaultValue = "false" )
private boolean overwrite;
/**
