You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/10/27 21:31:50 UTC
svn commit: r1634678 - in /maven/plugins/trunk/maven-antrun-plugin/src:
main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
site/apt/usage.apt.vm
Author: michaelo
Date: Mon Oct 27 20:31:50 2014
New Revision: 1634678
URL: http://svn.apache.org/r1634678
Log:
Correct spelling of Maven and Ant.
Modified:
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java?rev=1634678&r1=1634677&r2=1634678&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/AttachArtifactTask.java Mon Oct 27 20:31:50 2014
@@ -34,12 +34,12 @@ public class AttachArtifactTask
{
/**
- * The refId of the maven project.
+ * The refId of the Maven project.
*/
private String mavenProjectRefId = AntRunMojo.DEFAULT_MAVEN_PROJECT_REFID;
/**
- * The refId of the maven project helper component.
+ * The refId of the Maven project helper component.
*/
private String mavenProjectHelperRefId = AntRunMojo.DEFAULT_MAVEN_PROJECT_HELPER_REFID;
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java?rev=1634678&r1=1634677&r2=1634678&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java Mon Oct 27 20:31:50 2014
@@ -56,7 +56,7 @@ import org.codehaus.plexus.util.StringUt
/**
* Maven AntRun Mojo. <br/>
- * This plugin provides the capability of calling Ant tasks from a POM by running the nested ant tasks inside the
+ * This plugin provides the capability of calling Ant tasks from a POM by running the nested Ant tasks inside the
* <tasks/> parameter. It is encouraged to move the actual tasks to a separate build.xml file and call that file
* with an <ant/> task.
*
@@ -89,7 +89,7 @@ public class AntRunMojo
public final static String UTF_8 = "UTF-8";
/**
- * The name used for the ant target
+ * The name used for the Ant target
*/
private String antTargetName;
@@ -171,7 +171,7 @@ public class AntRunMojo
private PlexusConfiguration target;
/**
- * This folder is added to the list of those folders containing source to be compiled. Use this if your ant script
+ * This folder is added to the list of those folders containing source to be compiled. Use this if your Ant script
* generates source code.
*
* @deprecated Use the build-helper-maven-plugin to bind source directories
@@ -181,7 +181,7 @@ public class AntRunMojo
/**
* This folder is added to the list of those folders containing source to be compiled for testing. Use this if your
- * ant script generates test source code.
+ * Ant script generates test source code.
*
* @deprecated Use the build-helper-maven-plugin to bind test source directories
*/
@@ -236,7 +236,7 @@ public class AntRunMojo
if ( target == null )
{
- getLog().info( "No ant target defined - SKIPPED" );
+ getLog().info( "No Ant target defined - SKIPPED" );
return;
}
@@ -303,7 +303,7 @@ public class AntRunMojo
antProject.addReference( "maven.local.repository", localRepository );
initMavenTasks( antProject );
- // The ant project needs actual properties vs. using expression evaluator when calling an external build
+ // The Ant project needs actual properties vs. using expression evaluator when calling an external build
// file.
copyProperties( mavenProject, antProject );
@@ -346,7 +346,7 @@ public class AntRunMojo
}
catch ( Throwable e )
{
- throw new MojoExecutionException( "Error executing ant tasks: " + e.getMessage(), e );
+ throw new MojoExecutionException( "Error executing Ant tasks: " + e.getMessage(), e );
}
if ( sourceRoot != null )
@@ -395,7 +395,7 @@ public class AntRunMojo
}
/**
- * Copy properties from the maven project to the ant project.
+ * Copy properties from the Maven project to the Ant project.
*
* @param mavenProject
* @param antProject
@@ -411,7 +411,7 @@ public class AntRunMojo
// Set the POM file as the ant.file for the tasks run directly in Maven.
antProject.setProperty( "ant.file", mavenProject.getFile().getAbsolutePath() );
- // Add some of the common maven properties
+ // Add some of the common Maven properties
getLog().debug( "Setting properties with prefix: " + propertyPrefix );
antProject.setProperty( ( propertyPrefix + "project.groupId" ), mavenProject.getGroupId() );
antProject.setProperty( ( propertyPrefix + "project.artifactId" ), mavenProject.getArtifactId() );
@@ -463,7 +463,7 @@ public class AntRunMojo
}
/**
- * Copy properties from the ant project to the maven project.
+ * Copy properties from the Ant project to the Maven project.
*
* @param antProject not null
* @param mavenProject not null
@@ -539,7 +539,7 @@ public class AntRunMojo
}
/**
- * Write the ant target and surrounding tags to a temporary file
+ * Write the Ant target and surrounding tags to a temporary file
*
* @throws PlexusConfigurationException
*/
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm?rev=1634678&r1=1634677&r2=1634678&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/apt/usage.apt.vm Mon Oct 27 20:31:50 2014
@@ -99,14 +99,14 @@ Usage
* Additional source directories
- If your ant tasks generate additional source code that needs to be added
+ If your Ant tasks generate additional source code that needs to be added
to the build, you can use the
{{{http://mojo.codehaus.org/build-helper-maven-plugin/}build-helper-maven-plugin}}.
The sourceRoot and testSourceRoot options of the antrun plugin have been deprecated.
-* Using maven properties
+* Using Maven properties
- All of the properties available to maven are also available in the target
+ All of the properties available to Maven are also available in the target
configuration. However, you may want to call an external Ant build script
using the <ant> task. To avoid name conflicts, only a subset of the properties
are passed to the external Ant build. These include all properties defined in
@@ -120,7 +120,7 @@ Usage
etc.
------
- If the maven property you want to use is not available in an external file, you
+ If the Maven property you want to use is not available in an external file, you
will have to redefine the property before calling <ant>.
------