You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 22:14:03 UTC
svn commit: r1517969 [2/2] - in /maven/plugins/trunk: maven-ant-plugin/
maven-ant-plugin/src/it/clean-custom-files/ maven-ant-plugin/src/it/clean/
maven-ant-plugin/src/it/ear-it/ maven-ant-plugin/src/it/ear-it/ear/
maven-ant-plugin/src/it/ear-it/ejbs/ ...
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=1517969&r1=1517968&r2=1517969&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 Tue Aug 27 20:14:02 2013
@@ -19,19 +19,6 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.ReportPlugin;
@@ -45,12 +32,25 @@ import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
/**
* Utility class for the <code>AntBuildWriter</code> class.
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
+@SuppressWarnings( "JavaDoc" )
public class AntBuildWriterUtil
{
/**
@@ -63,10 +63,12 @@ public class AntBuildWriterUtil
if ( compileSourceRoots != null )
{
// copy as I may be modifying it
- for (Object compileSourceRoot : compileSourceRoots) {
+ for ( Object compileSourceRoot : compileSourceRoots )
+ {
String srcDir = (String) compileSourceRoot;
- if (new File(srcDir).exists()) {
- newCompileSourceRootsList.add(srcDir);
+ if ( new File( srcDir ).exists() )
+ {
+ newCompileSourceRootsList.add( srcDir );
}
}
}
@@ -77,7 +79,7 @@ public class AntBuildWriterUtil
/**
* Convenience method to write <code><include/></code> and <code><exclude/></code>
*
- * @param writer not null
+ * @param writer not null
* @param includes
* @param excludes
*/
@@ -85,19 +87,21 @@ public class AntBuildWriterUtil
{
if ( includes != null )
{
- for (Object include1 : includes) {
+ for ( Object include1 : includes )
+ {
String include = (String) include1;
- writer.startElement("include");
- writer.addAttribute("name", include);
+ writer.startElement( "include" );
+ writer.addAttribute( "name", include );
writer.endElement(); // include
}
}
if ( excludes != null )
{
- for (Object exclude1 : excludes) {
+ for ( Object exclude1 : excludes )
+ {
String exclude = (String) exclude1;
- writer.startElement("exclude");
- writer.addAttribute("name", exclude);
+ writer.startElement( "exclude" );
+ writer.addAttribute( "name", exclude );
writer.endElement(); // exclude
}
}
@@ -113,15 +117,16 @@ public class AntBuildWriterUtil
writeAntVersionHeader( writer );
XmlWriterUtil.writeCommentLineBreak( writer );
- XmlWriterUtil.writeComment( writer, StringUtils.repeat( "=", 21 ) + " - DO NOT EDIT THIS FILE! - "
- + StringUtils.repeat( "=", 21 ) );
+ XmlWriterUtil.writeComment( writer,
+ StringUtils.repeat( "=", 21 ) + " - DO NOT EDIT THIS FILE! - " + StringUtils.repeat(
+ "=", 21 ) );
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 );
@@ -132,7 +137,7 @@ public class AntBuildWriterUtil
/**
* Write comment for the Ant supported version
*
- * @param writer
+ * @param writer the writer
*/
public static void writeAntVersionHeader( XMLWriter writer )
{
@@ -142,10 +147,10 @@ public class AntBuildWriterUtil
/**
* Convenience method to write XML ant task
*
- * @param writer not null
- * @param project not null
+ * @param writer not null
+ * @param project not null
* @param moduleSubPath not null
- * @param tasks not null
+ * @param tasks not null
*/
public static void writeAntTask( XMLWriter writer, MavenProject project, String moduleSubPath, String tasks )
{
@@ -159,7 +164,7 @@ public class AntBuildWriterUtil
/**
* Convenience method to write XML Ant javadoc task
*
- * @param writer not null
+ * @param writer not null
* @param project not null
* @param wrapper not null
* @throws IOException if any
@@ -167,12 +172,14 @@ public class AntBuildWriterUtil
public static void writeJavadocTask( XMLWriter writer, MavenProject project, ArtifactResolverWrapper wrapper )
throws IOException
{
- List sources = new ArrayList();
- for (Object o : project.getCompileSourceRoots()) {
+ List<String> sources = new ArrayList<String>();
+ for ( Object o : project.getCompileSourceRoots() )
+ {
String source = (String) o;
- if (new File(source).exists()) {
- sources.add(source);
+ if ( new File( source ).exists() )
+ {
+ sources.add( source );
}
}
@@ -187,7 +194,7 @@ public class AntBuildWriterUtil
if ( sourcepath == null )
{
StringBuilder sb = new StringBuilder();
- String[] compileSourceRoots = (String[]) sources.toArray(new String[sources.size()]);
+ String[] compileSourceRoots = sources.toArray( new String[sources.size()] );
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
sb.append( "${maven.build.srcDir." ).append( i ).append( "}" );
@@ -204,68 +211,67 @@ public class AntBuildWriterUtil
{
writer.addAttribute( "sourcepath", sourcepath );
}
- addWrapAttribute( writer, "javadoc", "destdir",
- getMavenJavadocPluginBasicOption( project, "destdir",
- "${maven.reporting.outputDirectory}/apidocs" ), 3 );
- addWrapAttribute( writer, "javadoc", "extdirs", getMavenJavadocPluginBasicOption( project, "extdirs", null ), 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 );
addWrapAttribute( writer, "javadoc", "version", getMavenJavadocPluginBasicOption( project, "version", "true" ),
3 );
addWrapAttribute( writer, "javadoc", "use", getMavenJavadocPluginBasicOption( project, "use", "true" ), 3 );
- addWrapAttribute( writer, "javadoc", "author", getMavenJavadocPluginBasicOption( project, "author", "true" ), 3 );
- addWrapAttribute( writer, "javadoc", "splitindex", getMavenJavadocPluginBasicOption( project, "splitindex",
- "false" ), 3 );
- addWrapAttribute( writer, "javadoc", "windowtitle", getMavenJavadocPluginBasicOption( project, "windowtitle",
- null ), 3 );
- addWrapAttribute( writer, "javadoc", "nodeprecated", getMavenJavadocPluginBasicOption( project, "nodeprecated",
- "false" ), 3 );
- addWrapAttribute( writer, "javadoc", "nodeprecatedlist", getMavenJavadocPluginBasicOption( project,
- "nodeprecatedlist",
- "false" ), 3 );
+ addWrapAttribute( writer, "javadoc", "author", getMavenJavadocPluginBasicOption( project, "author", "true" ),
+ 3 );
+ addWrapAttribute( writer, "javadoc", "splitindex",
+ getMavenJavadocPluginBasicOption( project, "splitindex", "false" ), 3 );
+ addWrapAttribute( writer, "javadoc", "windowtitle",
+ getMavenJavadocPluginBasicOption( project, "windowtitle", null ), 3 );
+ addWrapAttribute( writer, "javadoc", "nodeprecated",
+ getMavenJavadocPluginBasicOption( project, "nodeprecated", "false" ), 3 );
+ addWrapAttribute( writer, "javadoc", "nodeprecatedlist",
+ 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",
getMavenJavadocPluginBasicOption( project, "nonavbar", "false" ), 3 );
- addWrapAttribute( writer, "javadoc", "serialwarn", getMavenJavadocPluginBasicOption( project, "serialwarn",
- "false" ), 3 );
+ addWrapAttribute( writer, "javadoc", "serialwarn",
+ getMavenJavadocPluginBasicOption( project, "serialwarn", "false" ), 3 );
addWrapAttribute( writer, "javadoc", "helpfile", getMavenJavadocPluginBasicOption( project, "helpfile", null ),
3 );
addWrapAttribute( writer, "javadoc", "stylesheetfile",
getMavenJavadocPluginBasicOption( project, "stylesheetfile", null ), 3 );
- addWrapAttribute( writer, "javadoc", "charset", getMavenJavadocPluginBasicOption( project, "charset",
- "ISO-8859-1" ), 3 );
- addWrapAttribute( writer, "javadoc", "docencoding", getMavenJavadocPluginBasicOption( project, "docencoding",
- null ), 3 );
+ addWrapAttribute( writer, "javadoc", "charset",
+ getMavenJavadocPluginBasicOption( project, "charset", "ISO-8859-1" ), 3 );
+ addWrapAttribute( writer, "javadoc", "docencoding",
+ getMavenJavadocPluginBasicOption( project, "docencoding", null ), 3 );
addWrapAttribute( writer, "javadoc", "excludepackagenames",
getMavenJavadocPluginBasicOption( project, "excludepackagenames", null ), 3 );
addWrapAttribute( writer, "javadoc", "source", getMavenJavadocPluginBasicOption( project, "source", null ), 3 );
- addWrapAttribute( writer, "javadoc", "linksource", getMavenJavadocPluginBasicOption( project, "linksource",
- "false" ), 3 );
- addWrapAttribute( writer, "javadoc", "breakiterator", getMavenJavadocPluginBasicOption( project,
- "breakiterator",
- "false" ), 3 );
- addWrapAttribute( writer, "javadoc", "noqualifier", getMavenJavadocPluginBasicOption( project, "noqualifier",
- null ), 3 );
+ addWrapAttribute( writer, "javadoc", "linksource",
+ getMavenJavadocPluginBasicOption( project, "linksource", "false" ), 3 );
+ addWrapAttribute( writer, "javadoc", "breakiterator",
+ getMavenJavadocPluginBasicOption( project, "breakiterator", "false" ), 3 );
+ addWrapAttribute( writer, "javadoc", "noqualifier",
+ getMavenJavadocPluginBasicOption( project, "noqualifier", null ), 3 );
// miscellaneous
addWrapAttribute( writer, "javadoc", "maxmemory",
getMavenJavadocPluginBasicOption( project, "maxmemory", null ), 3 );
- addWrapAttribute( writer, "javadoc", "additionalparam", getMavenJavadocPluginBasicOption( project,
- "additionalparam",
- null ), 3 );
+ addWrapAttribute( writer, "javadoc", "additionalparam",
+ getMavenJavadocPluginBasicOption( project, "additionalparam", null ), 3 );
// Nested arg
String doctitle = getMavenJavadocPluginBasicOption( project, "doctitle", null );
@@ -300,9 +306,10 @@ public class AntBuildWriterUtil
Map[] links = getMavenJavadocPluginOptions( project, "links", null );
if ( links != null )
{
- for (Map link : links) {
- writer.startElement("link");
- writer.addAttribute("href", (String) link.get("link"));
+ for ( Map link : links )
+ {
+ writer.startElement( "link" );
+ writer.addAttribute( "href", (String) link.get( "link" ) );
writer.endElement(); // link
}
}
@@ -310,10 +317,11 @@ public class AntBuildWriterUtil
Map[] offlineLinks = getMavenJavadocPluginOptions( project, "offlineLinks", null );
if ( offlineLinks != null )
{
- for (Map offlineLink : offlineLinks) {
- writer.startElement("link");
- writer.addAttribute("href", (String) offlineLink.get("url"));
- addWrapAttribute(writer, "javadoc", "offline", "true", 4);
+ for ( Map offlineLink : offlineLinks )
+ {
+ writer.startElement( "link" );
+ writer.addAttribute( "href", (String) offlineLink.get( "url" ) );
+ addWrapAttribute( writer, "javadoc", "offline", "true", 4 );
writer.endElement(); // link
}
}
@@ -321,11 +329,12 @@ public class AntBuildWriterUtil
Map[] groups = getMavenJavadocPluginOptions( project, "groups", null );
if ( groups != null )
{
- for (Map group1 : groups) {
- Map group = (Map) group1.get("group");
- writer.startElement("group");
- writer.addAttribute("title", (String) group.get("title"));
- addWrapAttribute(writer, "javadoc", "package", (String) group.get("package"), 4);
+ for ( Map group1 : groups )
+ {
+ Map group = (Map) group1.get( "group" );
+ writer.startElement( "group" );
+ writer.addAttribute( "title", (String) group.get( "title" ) );
+ addWrapAttribute( writer, "javadoc", "package", (String) group.get( "package" ), 4 );
writer.endElement(); // group
}
}
@@ -387,12 +396,13 @@ public class AntBuildWriterUtil
Map[] tags = getMavenJavadocPluginOptions( project, "tags", null );
if ( tags != null )
{
- for (Map tag : tags) {
- Map props = (Map) tag.get("tag");
- writer.startElement("tag");
- writer.addAttribute("name", (String) props.get("name"));
- addWrapAttribute(writer, "javadoc", "scope", (String) props.get("placement"), 4);
- addWrapAttribute(writer, "javadoc", "description", (String) props.get("head"), 4);
+ for ( Map tag : tags )
+ {
+ Map props = (Map) tag.get( "tag" );
+ writer.startElement( "tag" );
+ writer.addAttribute( "name", (String) props.get( "name" ) );
+ addWrapAttribute( writer, "javadoc", "scope", (String) props.get( "placement" ), 4 );
+ addWrapAttribute( writer, "javadoc", "description", (String) props.get( "head" ), 4 );
writer.endElement(); // tag
}
}
@@ -403,7 +413,7 @@ public class AntBuildWriterUtil
/**
* Convenience method to write XML Ant jar task
*
- * @param writer not null
+ * @param writer not null
* @param project not null
* @throws IOException if any
*/
@@ -414,12 +424,12 @@ public class AntBuildWriterUtil
writer.addAttribute( "jarfile", "${maven.build.dir}/${maven.build.finalName}.jar" );
addWrapAttribute( writer, "jar", "compress",
getMavenJarPluginBasicOption( project, "archive//compress", "true" ), 3 );
- addWrapAttribute( writer, "jar", "index", getMavenJarPluginBasicOption( project, "archive//index", "false" ), 3 );
+ addWrapAttribute( writer, "jar", "index", getMavenJarPluginBasicOption( project, "archive//index", "false" ),
+ 3 );
if ( getMavenJarPluginBasicOption( project, "archive//manifestFile", null ) != null )
{
- addWrapAttribute( writer, "jar", "manifest", getMavenJarPluginBasicOption( project,
- "archive//manifestFile", null ),
- 3 );
+ addWrapAttribute( writer, "jar", "manifest",
+ getMavenJarPluginBasicOption( project, "archive//manifestFile", null ), 3 );
}
addWrapAttribute( writer, "jar", "basedir", "${maven.build.outputDir}", 3 );
addWrapAttribute( writer, "jar", "excludes", "**/package.html", 3 );
@@ -439,8 +449,8 @@ public class AntBuildWriterUtil
/**
* Convenience method to write XML Ant ear task
*
- * @param writer not null
- * @param project not null
+ * @param writer not null
+ * @param project not null
* @param artifactResolverWrapper not null
* @throws IOException if any
*/
@@ -478,8 +488,8 @@ public class AntBuildWriterUtil
/**
* Convenience method to write XML Ant war task
*
- * @param writer not null
- * @param project not null
+ * @param writer not null
+ * @param project not null
* @param artifactResolverWrapper not null
* @throws IOException if any
*/
@@ -487,14 +497,14 @@ public class AntBuildWriterUtil
ArtifactResolverWrapper artifactResolverWrapper )
throws IOException
{
- String webXml =
- getMavenWarPluginBasicOption( project, "webXml", "${basedir}/src/main/webapp/WEB-INF/web.xml" );
+ String webXml = getMavenWarPluginBasicOption( project, "webXml", "${basedir}/src/main/webapp/WEB-INF/web.xml" );
if ( webXml.startsWith( "${basedir}/" ) )
{
webXml = webXml.substring( "${basedir}/".length() );
}
-
- writeCopyLib( writer, project, artifactResolverWrapper, "${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib" );
+
+ writeCopyLib( writer, project, artifactResolverWrapper,
+ "${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib" );
writer.startElement( "war" );
writer.addAttribute( "destfile", "${maven.build.dir}/${maven.build.finalName}.war" );
@@ -523,9 +533,9 @@ public class AntBuildWriterUtil
* Convenience method to wrap long element tags for a given attribute.
*
* @param writer not null
- * @param tag not null
- * @param name not null
- * @param value not null
+ * @param tag not null
+ * @param name not null
+ * @param value not null
* @param indent positive value
*/
public static void addWrapAttribute( XMLWriter writer, String tag, String name, String value, int indent )
@@ -541,9 +551,8 @@ public class AntBuildWriterUtil
}
else
{
- writer.addAttribute( "\n"
- + StringUtils.repeat( " ", ( StringUtils.isEmpty( tag ) ? 0 : tag.length() ) + indent
- * XmlWriterUtil.DEFAULT_INDENTATION_SIZE ) + name, value );
+ writer.addAttribute( "\n" + StringUtils.repeat( " ", ( StringUtils.isEmpty( tag ) ? 0 : tag.length() )
+ + indent * XmlWriterUtil.DEFAULT_INDENTATION_SIZE ) + name, value );
}
}
@@ -558,17 +567,14 @@ public class AntBuildWriterUtil
/**
* @param mavenProject
- * @return true if project packaging equals one of several packaging types
+ * @return true if project packaging equals one of several packaging types
* including <code>jar</code>, <code>maven-plugin</code>, <code>ejb</code>, or
* <code>bundle</code>
*/
public static boolean isJarPackaging( MavenProject mavenProject )
{
- return "jar".equals( mavenProject.getPackaging() )
- || isEjbPackaging( mavenProject )
- || isMavenPluginPackaging( mavenProject )
- || isBundlePackaging( mavenProject )
- ;
+ return "jar".equals( mavenProject.getPackaging() ) || isEjbPackaging( mavenProject ) || isMavenPluginPackaging(
+ mavenProject ) || isBundlePackaging( mavenProject );
}
/**
@@ -619,13 +625,14 @@ public class AntBuildWriterUtil
/**
* Return the <code>optionName</code> value defined in a project for the "maven-compiler-plugin" plugin.
*
- * @param project not null
- * @param optionName the option name wanted
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the value for the option name or the default value. Could be null if not found.
* @throws IOException if any
*/
- public static String getMavenCompilerPluginBasicOption( MavenProject project, String optionName, String defaultValue )
+ public static String getMavenCompilerPluginBasicOption( MavenProject project, String optionName,
+ String defaultValue )
throws IOException
{
return getMavenPluginBasicOption( project, "maven-compiler-plugin", optionName, defaultValue );
@@ -634,8 +641,8 @@ public class AntBuildWriterUtil
/**
* Return the 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
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the map for the option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -649,8 +656,8 @@ public class AntBuildWriterUtil
/**
* 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
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the array of option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -664,13 +671,14 @@ public class AntBuildWriterUtil
/**
* Return the <code>optionName</code> value defined in a project for the "maven-surefire-plugin" plugin.
*
- * @param project not null
- * @param optionName the option name wanted
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the value for the option name or the default value. Could be null if not found.
* @throws IOException if any
*/
- public static String getMavenSurefirePluginBasicOption( MavenProject project, String optionName, String defaultValue )
+ public static String getMavenSurefirePluginBasicOption( MavenProject project, String optionName,
+ String defaultValue )
throws IOException
{
return getMavenPluginBasicOption( project, "maven-surefire-plugin", optionName, defaultValue );
@@ -679,8 +687,8 @@ public class AntBuildWriterUtil
/**
* Return the 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
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the map for the option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -694,8 +702,8 @@ public class AntBuildWriterUtil
/**
* 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
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the array of option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -709,13 +717,14 @@ public class AntBuildWriterUtil
/**
* Return the <code>optionName</code> value defined in a project for the "maven-javadoc-plugin" plugin.
*
- * @param project not null
- * @param optionName the option name wanted
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the value for the option name or the default value. Could be null if not found.
* @throws IOException if any
*/
- public static String getMavenJavadocPluginBasicOption( MavenProject project, String optionName, String defaultValue )
+ public static String getMavenJavadocPluginBasicOption( MavenProject project, String optionName,
+ String defaultValue )
throws IOException
{
return getMavenPluginBasicOption( project, "maven-javadoc-plugin", optionName, defaultValue );
@@ -724,8 +733,8 @@ public class AntBuildWriterUtil
/**
* Return a 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
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the map for the option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -739,8 +748,8 @@ public class AntBuildWriterUtil
/**
* 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
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return an array of option name. Could be null if not found.
* @throws IOException if any
@@ -754,8 +763,8 @@ public class AntBuildWriterUtil
/**
* Return the <code>optionName</code> value defined in a project for the "maven-jar-plugin" plugin.
*
- * @param project not null
- * @param optionName the option name wanted
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the value for the option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -769,8 +778,8 @@ public class AntBuildWriterUtil
/**
* Return the <code>optionName</code> value defined in a project for the "maven-ear-plugin" plugin.
*
- * @param project not null
- * @param optionName the option name wanted
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the value for the option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -784,8 +793,8 @@ public class AntBuildWriterUtil
/**
* Return the <code>optionName</code> value defined in a project for the "maven-war-plugin" plugin.
*
- * @param project not null
- * @param optionName the option name wanted
+ * @param project not null
+ * @param optionName the option name wanted
* @param defaultValue a default value
* @return the value for the option name or the default value. Could be null if not found.
* @throws IOException if any
@@ -806,29 +815,29 @@ public class AntBuildWriterUtil
* <br/>
* Example:
* <table>
- * <tr>
- * <td>Configuration</td>
- * <td>Result</td>
- * </tr>
- * <tr>
- * <td><pre><option>value</option></pre></td>
- * <td><pre>value</pre></td>
- * </tr>
+ * <tr>
+ * <td>Configuration</td>
+ * <td>Result</td>
+ * </tr>
+ * <tr>
+ * <td><pre><option>value</option></pre></td>
+ * <td><pre>value</pre></td>
+ * </tr>
* </table>
*
- * @param project not null
+ * @param project not null
* @param pluginArtifactId not null
- * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
- * @param defaultValue could be null
+ * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
+ * @param defaultValue could be null
* @return the value for the option name or null if not found
* @throws IOException if any
*/
private static String getMavenPluginBasicOption( MavenProject project, String pluginArtifactId, String optionName,
- String defaultValue )
+ String defaultValue )
throws IOException
{
- return (String) getMavenPluginConfigurationsImpl( project, pluginArtifactId, optionName, defaultValue )
- .get( optionName );
+ return (String) getMavenPluginConfigurationsImpl( project, pluginArtifactId, optionName, defaultValue ).get(
+ optionName );
}
/**
@@ -837,34 +846,34 @@ public class AntBuildWriterUtil
* <br/>
* Example:
* <table>
- * <tr>
- * <td>Configuration</td>
- * <td>Result</td>
- * </tr>
- * <tr>
- * <td><pre>
+ * <tr>
+ * <td>Configuration</td>
+ * <td>Result</td>
+ * </tr>
+ * <tr>
+ * <td><pre>
* <option>
* <param1>value1</param1>
* <param2>value2</param2>
* </option>
* </pre></td>
- * <td><pre>{param1=value1, param2=value2}<pre></td>
+ * <td><pre>{param1=value1, param2=value2}<pre></td>
* </tr>
* </table>
*
- * @param project not null
+ * @param project not null
* @param pluginArtifactId not null
- * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
- * @param defaultValue could be null
+ * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
+ * @param defaultValue could be null
* @return the value for the option name or null if not found
* @throws IOException if any
*/
private static Map getMavenPluginOption( MavenProject project, String pluginArtifactId, String optionName,
- String defaultValue )
+ String defaultValue )
throws IOException
{
- return (Map) getMavenPluginConfigurationsImpl( project, pluginArtifactId, optionName, defaultValue )
- .get( optionName );
+ return (Map) getMavenPluginConfigurationsImpl( project, pluginArtifactId, optionName, defaultValue ).get(
+ optionName );
}
/**
@@ -873,12 +882,12 @@ public class AntBuildWriterUtil
* <br/>
* Example:
* <table>
- * <tr>
- * <td>Configuration</td>
- * <td>Result</td>
- * </tr>
- * <tr>
- * <td><pre>
+ * <tr>
+ * <td>Configuration</td>
+ * <td>Result</td>
+ * </tr>
+ * <tr>
+ * <td><pre>
* <options>
* <option>
* <param1>value1</param1>
@@ -890,23 +899,23 @@ public class AntBuildWriterUtil
* </option>
* </options>
* </pre></td>
- * <td><pre>[{option=[{param1=value1, param2=value2}]}, {option=[{param1=value1, param2=value2}]<pre></td>
+ * <td><pre>[{option=[{param1=value1, param2=value2}]}, {option=[{param1=value1, param2=value2}]<pre></td>
* </tr>
* </table>
*
- * @param project not null
+ * @param project not null
* @param pluginArtifactId not null
- * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
- * @param defaultValue could be null
+ * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
+ * @param defaultValue could be null
* @return the value for the option name or null if not found
* @throws IOException if any
*/
private static Map[] getMavenPluginOptions( MavenProject project, String pluginArtifactId, String optionName,
- String defaultValue )
+ String defaultValue )
throws IOException
{
- return (Map[]) getMavenPluginConfigurationsImpl( project, pluginArtifactId, optionName, defaultValue )
- .get( optionName );
+ return (Map[]) getMavenPluginConfigurationsImpl( project, pluginArtifactId, optionName, defaultValue ).get(
+ optionName );
}
/**
@@ -915,22 +924,22 @@ public class AntBuildWriterUtil
* <br/>
* Example:
* <table>
- * <tr>
- * <td>Configuration</td>
- * <td>Result</td>
- * </tr>
- * <tr>
- * <td><pre><option>value</option></pre></td>
- * <td><pre>{option=value}</pre></td>
- * </tr>
- * <tr>
- * <td><pre>
+ * <tr>
+ * <td>Configuration</td>
+ * <td>Result</td>
+ * </tr>
+ * <tr>
+ * <td><pre><option>value</option></pre></td>
+ * <td><pre>{option=value}</pre></td>
+ * </tr>
+ * <tr>
+ * <td><pre>
* <option>
* <param1>value1</param1>
* <param2>value2</param2>
* </option>
* </pre></td>
- * <td><pre>{option={param1=value1, param2=value2}}<pre></td>
+ * <td><pre>{option={param1=value1, param2=value2}}<pre></td>
* </tr>
* <tr>
* <td><pre>
@@ -949,71 +958,83 @@ public class AntBuildWriterUtil
* </tr>
* </table>
*
- * @param project not null
+ * @param project not null
* @param pluginArtifactId not null
- * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
- * @param defaultValue could be null
+ * @param optionName an <code>Xpath</code> expression from the plugin <code><configuration/></code>
+ * @param defaultValue could be null
* @return a map with the options found
* @throws IOException if any
*/
private static Map getMavenPluginConfigurationsImpl( MavenProject project, String pluginArtifactId,
- String optionName, String defaultValue )
+ String optionName, String defaultValue )
throws IOException
{
List plugins = new ArrayList();
- for (ReportPlugin reportPlugin1 : project.getModel().getReporting().getPlugins()) {
- plugins.add(reportPlugin1);
+ for ( ReportPlugin reportPlugin1 : project.getModel().getReporting().getPlugins() )
+ {
+ plugins.add( reportPlugin1 );
}
- for (Plugin plugin1 : project.getModel().getBuild().getPlugins()) {
- plugins.add(plugin1);
+ for ( Plugin plugin1 : project.getModel().getBuild().getPlugins() )
+ {
+ plugins.add( plugin1 );
}
if ( project.getBuild().getPluginManagement() != null )
{
- for (Plugin plugin : project.getBuild().getPluginManagement().getPlugins()) {
- plugins.add(plugin);
+ for ( Plugin plugin : project.getBuild().getPluginManagement().getPlugins() )
+ {
+ plugins.add( plugin );
}
}
- for (Object next : plugins) {
+ for ( Object next : plugins )
+ {
Object pluginConf = null;
- if (next instanceof Plugin) {
+ if ( next instanceof Plugin )
+ {
Plugin plugin = (Plugin) next;
// using out-of-box Maven plugins
- if (!((plugin.getGroupId().equals("org.apache.maven.plugins")) && (plugin.getArtifactId()
- .equals(pluginArtifactId)))) {
+ if ( !( ( plugin.getGroupId().equals( "org.apache.maven.plugins" ) ) && ( plugin.getArtifactId().equals(
+ pluginArtifactId ) ) ) )
+ {
continue;
}
pluginConf = plugin.getConfiguration();
}
- if (next instanceof ReportPlugin) {
+ if ( next instanceof ReportPlugin )
+ {
ReportPlugin reportPlugin = (ReportPlugin) next;
// using out-of-box Maven plugins
- if (!((reportPlugin.getGroupId().equals("org.apache.maven.plugins")) && (reportPlugin
- .getArtifactId().equals(pluginArtifactId)))) {
+ if ( !( ( reportPlugin.getGroupId().equals( "org.apache.maven.plugins" ) )
+ && ( reportPlugin.getArtifactId().equals( pluginArtifactId ) ) ) )
+ {
continue;
}
pluginConf = reportPlugin.getConfiguration();
}
- if (pluginConf == null) {
+ if ( pluginConf == null )
+ {
continue;
}
- try {
- Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder()
- .parse(new ByteArrayInputStream(pluginConf.toString().getBytes("UTF-8")));
-
- NodeList nodeList = XPathAPI.eval(doc, "//configuration/" + optionName).nodelist();
- if (nodeList.getLength() > 0) {
- Node optionNode = nodeList.item(0);
+ try
+ {
+ Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(
+ new ByteArrayInputStream( pluginConf.toString().getBytes( "UTF-8" ) ) );
+
+ NodeList nodeList = XPathAPI.eval( doc, "//configuration/" + optionName ).nodelist();
+ if ( nodeList.getLength() > 0 )
+ {
+ Node optionNode = nodeList.item( 0 );
- if (isList(optionNode)) {
+ if ( isList( optionNode ) )
+ {
/*
* <optionNames>
* <optionName>
@@ -1026,37 +1047,46 @@ public class AntBuildWriterUtil
List optionNames = new ArrayList();
NodeList childs = optionNode.getChildNodes();
- for (int i = 0; i < childs.getLength(); i++) {
- Node child = childs.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- Map option = new HashMap();
-
- if (isElementContent(child)) {
- Map properties = new HashMap();
+ for ( int i = 0; i < childs.getLength(); i++ )
+ {
+ Node child = childs.item( i );
+ if ( child.getNodeType() == Node.ELEMENT_NODE )
+ {
+ Map<String, Object> option = new HashMap<String, Object>();
+
+ if ( isElementContent( child ) )
+ {
+ Map<String,String> properties = new HashMap<String,String>();
NodeList childs2 = child.getChildNodes();
- if (childs2.getLength() > 0) {
- for (int j = 0; j < childs2.getLength(); j++) {
- Node child2 = childs2.item(j);
- if (child2.getNodeType() == Node.ELEMENT_NODE) {
- properties.put(child2.getNodeName(), getTextContent(child2));
+ if ( childs2.getLength() > 0 )
+ {
+ for ( int j = 0; j < childs2.getLength(); j++ )
+ {
+ Node child2 = childs2.item( j );
+ if ( child2.getNodeType() == Node.ELEMENT_NODE )
+ {
+ properties.put( child2.getNodeName(), getTextContent( child2 ) );
}
}
- option.put(child.getNodeName(), properties);
+ option.put( child.getNodeName(), properties );
}
- } else {
- option.put(child.getNodeName(), getTextContent(child));
+ }
+ else
+ {
+ option.put( child.getNodeName(), getTextContent( child ) );
}
- optionNames.add(option);
+ optionNames.add( option );
}
}
- options.put(optionName, optionNames.toArray(new Map[optionNames.size()]));
+ options.put( optionName, optionNames.toArray( new Map[optionNames.size()] ) );
return options;
}
- if (isElementContent(optionNode)) {
+ if ( isElementContent( optionNode ) )
+ {
/*
* <optionName>
* <param1>value1</param1>
@@ -1066,33 +1096,40 @@ public class AntBuildWriterUtil
Map option = new HashMap();
NodeList childs = optionNode.getChildNodes();
- if (childs.getLength() > 1) {
+ if ( childs.getLength() > 1 )
+ {
Map parameters = new HashMap();
- for (int i = 0; i < childs.getLength(); i++) {
- Node child = childs.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- parameters.put(child.getNodeName(), getTextContent(child));
+ for ( int i = 0; i < childs.getLength(); i++ )
+ {
+ Node child = childs.item( i );
+ if ( child.getNodeType() == Node.ELEMENT_NODE )
+ {
+ parameters.put( child.getNodeName(), getTextContent( child ) );
}
}
- option.put(optionName, parameters);
+ option.put( optionName, parameters );
}
return option;
- } else {
+ }
+ else
+ {
/*
* <optionName>value1</optionName>
*/
Map option = new HashMap();
- option.put(optionName, getTextContent(optionNode));
+ option.put( optionName, getTextContent( optionNode ) );
return option;
}
}
- } catch (Exception e) {
- throw new IOException("Exception occured: " + e.getMessage());
+ }
+ catch ( Exception e )
+ {
+ throw new IOException( "Exception occured: " + e.getMessage() );
}
}
@@ -1106,10 +1143,10 @@ public class AntBuildWriterUtil
* Write copy tasks in an outputDir for EAR and WAR targets for project depencies without
* <code>provided</code> or <code>test</code> as scope
*
- * @param writer not null
- * @param project not null
+ * @param writer not null
+ * @param project not null
* @param artifactResolverWrapper not null
- * @param outputDir not null
+ * @param outputDir not null
*/
private static void writeCopyLib( XMLWriter writer, MavenProject project,
ArtifactResolverWrapper artifactResolverWrapper, String outputDir )
@@ -1120,19 +1157,22 @@ public class AntBuildWriterUtil
if ( project.getArtifacts() != null )
{
- for (Object o : project.getArtifacts()) {
+ for ( Object o : project.getArtifacts() )
+ {
Artifact artifact = (Artifact) o;
- if (Artifact.SCOPE_COMPILE.equals(artifact.getScope())
- || Artifact.SCOPE_RUNTIME.equals(artifact.getScope())) {
- String path = artifactResolverWrapper.getLocalArtifactPath(artifact);
- if (!new File(path).isAbsolute()) {
+ if ( Artifact.SCOPE_COMPILE.equals( artifact.getScope() ) || Artifact.SCOPE_RUNTIME.equals(
+ artifact.getScope() ) )
+ {
+ String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
+ if ( !new File( path ).isAbsolute() )
+ {
path = "${maven.repo.local}/" + path;
}
- writer.startElement("copy");
- writer.addAttribute("file", path);
- addWrapAttribute(writer, "copy", "todir", outputDir, 3);
+ writer.startElement( "copy" );
+ writer.addAttribute( "file", path );
+ addWrapAttribute( writer, "copy", "todir", outputDir, 3 );
writer.endElement(); // copy
}
}
@@ -1143,7 +1183,7 @@ public class AntBuildWriterUtil
* Check if a given <code>node</code> is a list of nodes or not.
* <br/>
* For instance, the node <code>options</code> is a list of <code>option</code> in the following case:
- *<pre>
+ * <pre>
* <options>
* <option>
* <param1>value1</param1>
@@ -1237,7 +1277,7 @@ public class AntBuildWriterUtil
/**
* Gets the singular form of the specified (English) plural form. For example:
- *
+ * <p/>
* <pre>
* properties -> property
* branches -> branch
@@ -1307,9 +1347,9 @@ public class AntBuildWriterUtil
* </table>
* The returned path will always use the forward slash ('/') as the file separator regardless of the current
* platform. Also, the result path will have a trailing slash if the input path has a trailing file separator.
- *
+ *
* @param basedir The base directory to relativize the path against, must not be <code>null</code>.
- * @param path The path to relativize, must not be <code>null</code>.
+ * @param path The path to relativize, must not be <code>null</code>.
* @return The relativized path, never <code>null</code>.
*/
static String toRelative( File basedir, String path )
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=1517969&r1=1517968&r2=1517969&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 Tue Aug 27 20:14:02 2013
@@ -34,7 +34,7 @@ import java.io.File;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
-@Mojo( name = "clean" )
+@Mojo(name = "clean")
public class AntCleanMojo
extends AbstractMojo
{
@@ -57,7 +57,7 @@ public class AntCleanMojo
*
* @since 2.2
*/
- @Parameter( property = "deleteCustomFiles", defaultValue = "false" )
+ @Parameter(property = "deleteCustomFiles", defaultValue = "false")
private boolean deleteCustomFiles;
/**
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=1517969&r1=1517968&r2=1517969&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 Tue Aug 27 20:14:02 2013
@@ -43,7 +43,7 @@ import java.util.Properties;
* @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;
/**
@@ -103,13 +103,14 @@ public class AntMojo
@Component
private MavenSession session;
- /** {@inheritDoc} */
+ /**
+ * {@inheritDoc}
+ */
public void execute()
throws MojoExecutionException
{
- ArtifactResolverWrapper artifactResolverWrapper = ArtifactResolverWrapper.getInstance( resolver, factory,
- localRepository,
- remoteRepositories );
+ ArtifactResolverWrapper artifactResolverWrapper =
+ ArtifactResolverWrapper.getInstance( resolver, factory, localRepository, remoteRepositories );
Properties executionProperties = ( session != null ) ? session.getExecutionProperties() : null;
@@ -127,7 +128,6 @@ public class AntMojo
}
getLog().info(
- "Wrote Ant project for " + project.getArtifactId() + " to "
- + project.getBasedir().getAbsolutePath() );
+ "Wrote Ant project for " + project.getArtifactId() + " to " + project.getBasedir().getAbsolutePath() );
}
}
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/ArtifactResolverWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/ArtifactResolverWrapper.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/ArtifactResolverWrapper.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/ArtifactResolverWrapper.java Tue Aug 27 20:14:02 2013
@@ -19,9 +19,6 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
-import java.io.IOException;
-import java.util.List;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.repository.ArtifactRepository;
@@ -29,12 +26,16 @@ import org.apache.maven.artifact.resolve
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.resolver.ArtifactResolver;
+import java.io.IOException;
+import java.util.List;
+
/**
* Wrapper object to resolve artifact.
*
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
+@SuppressWarnings( "JavaDoc" )
public class ArtifactResolverWrapper
{
/**
@@ -64,7 +65,7 @@ public class ArtifactResolverWrapper
* @param remoteRepositories
*/
private ArtifactResolverWrapper( ArtifactResolver resolver, ArtifactFactory factory,
- ArtifactRepository localRepository, List remoteRepositories )
+ ArtifactRepository localRepository, List remoteRepositories )
{
this.resolver = resolver;
this.factory = factory;
@@ -80,7 +81,7 @@ public class ArtifactResolverWrapper
* @return an instance of ArtifactResolverWrapper
*/
public static ArtifactResolverWrapper getInstance( ArtifactResolver resolver, ArtifactFactory factory,
- ArtifactRepository localRepository, List remoteRepositories )
+ ArtifactRepository localRepository, List remoteRepositories )
{
return new ArtifactResolverWrapper( resolver, factory, localRepository, remoteRepositories );
}
@@ -159,7 +160,7 @@ public class ArtifactResolverWrapper
* Gets the path to the specified artifact relative to the local repository's base directory. Note that this method
* does not actually resolve the artifact, it merely calculates the path at which the artifact is or would be stored
* in the local repository.
- *
+ *
* @param artifact The artifact whose path should be determined, must not be <code>null</code>.
* @return The path to the artifact, never <code>null</code>.
*/
Modified: maven/plugins/trunk/maven-ant-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/site/site.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/site/site.xml Tue Aug 27 20:14:02 2013
@@ -20,8 +20,8 @@ under the License.
-->
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<body>
<links>
<item name="Ant" href="http://ant.apache.org/"/>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java Tue Aug 27 20:14:02 2013
@@ -19,13 +19,13 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
-import java.io.File;
-
import junit.framework.TestCase;
+import java.io.File;
+
/**
* Tests <code>AntBuildWriter</code>.
- *
+ *
* @author Benjamin Bentmann
* @version $Id$
*/
@@ -52,8 +52,8 @@ public class AntBuildWriterTest
// not so strict URLs
assertEquals( "", AntBuildWriter.getProjectRepoDirectory( "file://" + basedir, basedir ) );
assertEquals( "dir", AntBuildWriter.getProjectRepoDirectory( "file://" + basedir + "/dir", basedir ) );
- assertEquals( "dir/subdir", AntBuildWriter.getProjectRepoDirectory( "file://" + basedir + "/dir/subdir",
- basedir ) );
+ assertEquals( "dir/subdir",
+ AntBuildWriter.getProjectRepoDirectory( "file://" + basedir + "/dir/subdir", basedir ) );
// URLs with encoded characters
assertEquals( "some dir",
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java Tue Aug 27 20:14:02 2013
@@ -19,14 +19,14 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
-import java.io.File;
-import java.util.Map;
-
import org.apache.maven.embedder.MavenEmbedder;
import org.apache.maven.embedder.MavenEmbedderConsoleLogger;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.PlexusTestCase;
+import java.io.File;
+import java.util.Map;
+
/**
* Test cases for 'org.apache.maven.plugin.ant.AntBuildWriterUtil'
*
@@ -85,8 +85,8 @@ public class AntBuildWriterUtilTest
MavenProject project = maven.readProject( testPom );
assertEquals( AntBuildWriterUtil.getMavenWarPluginBasicOption( project, "warName", null ), "mywebapp" );
- assertTrue( AntBuildWriterUtil.getMavenWarPluginBasicOption( project, "webXml", null )
- .endsWith( "/src/main/webapp/WEB-INF/web.xml" ) );
+ assertTrue( AntBuildWriterUtil.getMavenWarPluginBasicOption( project, "webXml", null ).endsWith(
+ "/src/main/webapp/WEB-INF/web.xml" ) );
maven.stop();
}
@@ -110,7 +110,8 @@ public class AntBuildWriterUtilTest
MavenProject project = maven.readProject( testPom );
- assertEquals( AntBuildWriterUtil.getMavenJavadocPluginBasicOption( project, "doclet", null ), "gr.spinellis.umlgraph.doclet.UmlGraphDoc" );
+ assertEquals( AntBuildWriterUtil.getMavenJavadocPluginBasicOption( project, "doclet", null ),
+ "gr.spinellis.umlgraph.doclet.UmlGraphDoc" );
assertNotNull( AntBuildWriterUtil.getMavenJavadocPluginOptions( project, "links", null ) );
assertEquals( AntBuildWriterUtil.getMavenJavadocPluginOptions( project, "links", null ).length, 2 );
@@ -148,24 +149,25 @@ public class AntBuildWriterUtilTest
/**
* Test method for <code>AntBuildWriterUtil.toRelative(File, String)</code>.
- *
+ *
* @throws Exception
*/
public static void testToRelative()
throws Exception
{
assertEquals( "relative", AntBuildWriterUtil.toRelative( new File( "/home" ), "relative" ) );
- assertEquals( "dir", AntBuildWriterUtil.toRelative( new File( "home" ),
- new File( "home/dir" ).getAbsolutePath() ) );
- assertEquals( "dir", AntBuildWriterUtil.toRelative( new File( "/home" ),
- new File( "/home/dir" ).getAbsolutePath() ) );
+ assertEquals( "dir",
+ AntBuildWriterUtil.toRelative( new File( "home" ), new File( "home/dir" ).getAbsolutePath() ) );
+ assertEquals( "dir",
+ AntBuildWriterUtil.toRelative( new File( "/home" ), new File( "/home/dir" ).getAbsolutePath() ) );
assertEquals( "dir/", AntBuildWriterUtil.toRelative( new File( "/home" ),
new File( "/home/dir" ).getAbsolutePath() + "/" ) );
assertEquals( "dir/sub", AntBuildWriterUtil.toRelative( new File( "/home" ),
new File( "/home/dir/sub" ).getAbsolutePath() ) );
- assertEquals( ".", AntBuildWriterUtil.toRelative( new File( "/home" ), new File( "/home" ).getAbsolutePath() ) );
- assertEquals( "./", AntBuildWriterUtil.toRelative( new File( "/home" ), new File( "/home" ).getAbsolutePath()
- + "/" ) );
+ assertEquals( ".",
+ AntBuildWriterUtil.toRelative( new File( "/home" ), new File( "/home" ).getAbsolutePath() ) );
+ assertEquals( "./", AntBuildWriterUtil.toRelative( new File( "/home" ),
+ new File( "/home" ).getAbsolutePath() + "/" ) );
}
}
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java Tue Aug 27 20:14:02 2013
@@ -19,13 +19,13 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.project.MavenProject;
+
import java.io.File;
import java.io.FileInputStream;
import java.util.Properties;
-import org.apache.maven.plugin.testing.AbstractMojoTestCase;
-import org.apache.maven.project.MavenProject;
-
/**
* Class to test Ant plugin
*
@@ -121,11 +121,12 @@ public class AntMojoTest
{
assertTrue( new File( antBasedir, "target" ).exists() );
assertTrue( new File( antBasedir, "target/classes" ).exists() );
- assertTrue( new File( antBasedir, "target/" + currentProject.getBuild().getFinalName() + ".jar" ).exists() );
+ assertTrue(
+ new File( antBasedir, "target/" + currentProject.getBuild().getFinalName() + ".jar" ).exists() );
Properties properties = new Properties();
- properties
- .load( new FileInputStream( new File( antBasedir, AntBuildWriter.DEFAULT_MAVEN_PROPERTIES_FILENAME ) ) );
+ properties.load(
+ new FileInputStream( new File( antBasedir, AntBuildWriter.DEFAULT_MAVEN_PROPERTIES_FILENAME ) ) );
String repo = properties.getProperty( "maven.repo.local" );
assertTrue( repo.equals( new File( getBasedir(), "target/local-repo" ).getAbsolutePath() ) );
}
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java Tue Aug 27 20:14:02 2013
@@ -19,18 +19,18 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.Properties;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.ExitException;
import org.apache.tools.ant.Main;
import org.apache.tools.ant.util.optional.NoExitSecurityManager;
import org.codehaus.plexus.util.StringUtils;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.Properties;
+
/**
* Wrap <code>Ant</code> call.
*
@@ -44,7 +44,7 @@ public class AntWrapper
*
* @param antBuild an <code>Ant build</code> file
* @throws IllegalArgumentException if any
- * @throws BuildException if any
+ * @throws BuildException if any
*/
public static void invoke( File antBuild )
throws BuildException, IllegalArgumentException
@@ -90,14 +90,14 @@ public class AntWrapper
try
{
- Main.main( new String[] { "-f", antBuild.getAbsolutePath() } );
+ Main.main( new String[]{ "-f", antBuild.getAbsolutePath() } );
}
catch ( ExitException e )
{
if ( StringUtils.isNotEmpty( errOS.toString() ) )
{
- throw new BuildException( "Error in the Ant build file. \n= Ant output =\n" + outOS.toString() + "\n"
- + errOS.toString() );
+ throw new BuildException(
+ "Error in the Ant build file. \n= Ant output =\n" + outOS.toString() + "\n" + errOS.toString() );
}
}
finally
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java Tue Aug 27 20:14:02 2013
@@ -19,13 +19,6 @@ package org.apache.maven.plugin.ant.stub
* under the License.
*/
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
import org.apache.maven.artifact.handler.DefaultArtifactHandler;
@@ -39,6 +32,13 @@ import org.apache.maven.model.io.xpp3.Ma
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.codehaus.plexus.PlexusTestCase;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
@@ -120,6 +120,7 @@ public abstract class AbstractAntTestMav
if ( !basedir.exists() )
{
+ //noinspection ResultOfMethodCallIgnored
basedir.mkdirs();
}
@@ -131,7 +132,8 @@ public abstract class AbstractAntTestMav
*/
public List getCompileSourceRoots()
{
- File src = new File( PlexusTestCase.getBasedir() + "/src/test/resources/unit/" + getProjetPath() + "src/main/java" );
+ File src =
+ new File( PlexusTestCase.getBasedir() + "/src/test/resources/unit/" + getProjetPath() + "src/main/java" );
return Collections.singletonList( src.getAbsolutePath() );
}
@@ -140,7 +142,8 @@ public abstract class AbstractAntTestMav
*/
public List getTestCompileSourceRoots()
{
- File test = new File( PlexusTestCase.getBasedir() + "/src/test/resources/unit/" + getProjetPath() + "src/test/java" );
+ File test =
+ new File( PlexusTestCase.getBasedir() + "/src/test/resources/unit/" + getProjetPath() + "src/test/java" );
return Collections.singletonList( test.getAbsolutePath() );
}
@@ -149,9 +152,9 @@ public abstract class AbstractAntTestMav
*/
public List getCompileArtifacts()
{
- Artifact junit = new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.2" ),
- Artifact.SCOPE_TEST, "jar", null, new DefaultArtifactHandler( "jar" ),
- false );
+ Artifact junit =
+ new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.2" ), Artifact.SCOPE_TEST,
+ "jar", null, new DefaultArtifactHandler( "jar" ), false );
junit.setFile( new File( "junit/junit/3.8.2/junit-3.8.2.jar" ) );
return Collections.singletonList( junit );
@@ -162,9 +165,9 @@ public abstract class AbstractAntTestMav
*/
public List getTestArtifacts()
{
- Artifact junit = new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.2" ),
- Artifact.SCOPE_TEST, "jar", null, new DefaultArtifactHandler( "jar" ),
- false );
+ Artifact junit =
+ new DefaultArtifact( "junit", "junit", VersionRange.createFromVersion( "3.8.2" ), Artifact.SCOPE_TEST,
+ "jar", null, new DefaultArtifactHandler( "jar" ), false );
junit.setFile( new File( "junit/junit/3.8.2/junit-3.8.2.jar" ) );
return Collections.singletonList( junit );
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml Tue Aug 27 20:14:02 2013
@@ -20,8 +20,8 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-ant-plugin.unit</groupId>
<artifactId>ant-compiler-config-test</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml Tue Aug 27 20:14:02 2013
@@ -20,8 +20,8 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-ant-plugin.unit</groupId>
<artifactId>ant-test</artifactId>
@@ -59,9 +59,9 @@ under the License.
</links>
<doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
<docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.5</version>
+ <groupId>gr.spinellis</groupId>
+ <artifactId>UmlGraph</artifactId>
+ <version>4.5</version>
</docletArtifact>
<docletArtifacts>
@@ -83,7 +83,7 @@ under the License.
</build>
<reporting>
- <plugins>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
@@ -94,9 +94,9 @@ under the License.
</links>
<doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
<docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.5</version>
+ <groupId>gr.spinellis</groupId>
+ <artifactId>UmlGraph</artifactId>
+ <version>4.5</version>
</docletArtifact>
<docletArtifacts>
@@ -120,6 +120,6 @@ under the License.
</tags>
</configuration>
</plugin>
- </plugins>
+ </plugins>
</reporting>
</project>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/src/main/java/org/apache/maven/plugins/ant/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/src/main/java/org/apache/maven/plugins/ant/test/App.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/src/main/java/org/apache/maven/plugins/ant/test/App.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/src/main/java/org/apache/maven/plugins/ant/test/App.java Tue Aug 27 20:14:02 2013
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.ant.tes
/**
* Hello world!
- *
*/
public class App
{
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/pom.xml Tue Aug 27 20:14:02 2013
@@ -20,8 +20,8 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-ant-plugin.unit</groupId>
<artifactId>ant-nodep-test</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/src/main/java/org/apache/maven/plugins/ant/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/src/main/java/org/apache/maven/plugins/ant/test/App.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/src/main/java/org/apache/maven/plugins/ant/test/App.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/src/main/java/org/apache/maven/plugins/ant/test/App.java Tue Aug 27 20:14:02 2013
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.ant.tes
/**
* Hello world!
- *
*/
public class App
{
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml Tue Aug 27 20:14:02 2013
@@ -20,8 +20,8 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-ant-plugin.unit</groupId>
<artifactId>ant-test</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/src/main/java/org/apache/maven/plugins/ant/test/App.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/src/main/java/org/apache/maven/plugins/ant/test/App.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/src/main/java/org/apache/maven/plugins/ant/test/App.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/src/main/java/org/apache/maven/plugins/ant/test/App.java Tue Aug 27 20:14:02 2013
@@ -21,7 +21,6 @@ package org.apache.maven.plugins.ant.tes
/**
* Hello world!
- *
*/
public class App
{
Modified: maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml Tue Aug 27 20:14:02 2013
@@ -20,8 +20,8 @@ under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.maven-ant-plugin.unit</groupId>
<artifactId>ant-war-config-test</artifactId>
Modified: maven/plugins/trunk/maven-javadoc-plugin/javadoc-options-javadoc-resources.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/javadoc-options-javadoc-resources.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/javadoc-options-javadoc-resources.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/javadoc-options-javadoc-resources.xml Tue Aug 27 20:14:02 2013
@@ -1,4 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<javadocOptions>
- <javadocResourcesDirectory>src/main/javadoc</javadocResourcesDirectory>
-</javadocOptions>
+<javadocOptions />