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:31:01 UTC
svn commit: r1517972 - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-antrun-plugin/ maven-antrun-plugin/src/it/ant-1.7-features/
maven-antrun-plugin/src/it/antrun-default-test/
maven-antrun-plugin/src/it/att...
Author: krosenvold
Date: Tue Aug 27 20:31:00 2013
New Revision: 1517972
URL: http://svn.apache.org/r1517972
Log:
Reformatted to code style, modernized
Modified:
maven/plugins/trunk/maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/AcrMojo.java
maven/plugins/trunk/maven-antrun-plugin/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java
maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/src/main/java/TestTask.java
maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/src/main/java/Test.java
maven/plugins/trunk/maven-antrun-plugin/src/it/local-repo-prop-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/src/main/java/Test.java
maven/plugins/trunk/maven-antrun-plugin/src/it/task-encoding-test/pom.xml
maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/pom.xml
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/ant/tasks/DependencyFilesetsTask.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntRunMojo.java
maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java
maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml
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=1517972&r1=1517971&r2=1517972&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 Tue Aug 27 20:31:00 2013
@@ -202,7 +202,7 @@ public class AcrMojo
getLog().debug( "Filtering deployment descriptor." );
MavenResourcesExecution mavenResourcesExecution = new MavenResourcesExecution();
mavenResourcesExecution.setEscapeString( escapeString );
- List<org.codehaus.plexus.util.FileUtils.FilterWrapper> filterWrappers =
+ List<FileUtils.FilterWrapper> filterWrappers =
mavenFileFilter.getDefaultFilterWrappers( project, filters, escapeBackslashesInFilePath,
this.session, mavenResourcesExecution );
Modified: maven/plugins/trunk/maven-antrun-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/pom.xml Tue Aug 27 20:31:00 2013
@@ -80,7 +80,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>2.0.5</version>
+ <version>3.0.15</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/ant-1.7-features/pom.xml Tue Aug 27 20:31:00 2013
@@ -19,7 +19,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">
+<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.antrun</groupId>
<artifactId>antrun-plugin-test</artifactId>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/antrun-default-test/pom.xml Tue Aug 27 20:31:00 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>antrun-plugin.test</groupId>
<artifactId>antrun-plugin-test</artifactId>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/attach-artifact-test/pom.xml Tue Aug 27 20:31:00 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>antrun-plugin.test</groupId>
<artifactId>antrun-plugin-attach-artifact-test</artifactId>
@@ -48,7 +48,7 @@ under the License.
<zip destfile="junk.zip"
basedir="."
includes="*.xml"
- />
+ />
<attachartifact file="junk.zip" classifier="foo" type="zip"/>
<attachartifact file="junk.zip" type="zip"/>
</tasks>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/build.xml Tue Aug 27 20:31:00 2013
@@ -21,12 +21,12 @@ under the License.
<project name="test1">
- <target name="test">
+ <target name="test">
- <java failonerror="true" classname="Test" fork="true" newenvironment="true">
- <classpath refid="classpath"/>
- </java>
+ <java failonerror="true" classname="Test" fork="true" newenvironment="true">
+ <classpath refid="classpath"/>
+ </java>
- </target>
+ </target>
</project>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,16 +20,16 @@ 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.antrun</groupId>
<artifactId>test-classpaths</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test for compile and plugin classpath references</name>
<description>Ensure that maven.compile.classpath and maven.plugin.classpath referencies are set</description>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-ref-test/src/main/java/Test.java Tue Aug 27 20:31:00 2013
@@ -17,10 +17,12 @@
* under the License.
*/
-public class Test {
+public class Test
+{
- public static void main(String args[]) {
- System.out.println("done");
+ public static void main( String args[] )
+ {
+ System.out.println( "done" );
}
}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/classpath-test-scope-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,10 +20,10 @@ 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.antrun</groupId>
<artifactId>classpath-test-scope</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/copy-fail-test/pom.xml Tue Aug 27 20:31:00 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>antrun-plugin.test</groupId>
<artifactId>antrun-plugin-test</artifactId>
@@ -38,15 +38,17 @@ under the License.
<version>@pom.version@</version>
<configuration>
<tasks>
-
- <copy file="${basedir}/pom.xml" tofile="${project.build.directory}/pom-copy.xml" overwrite="true" verbose="true" failonerror="true" />
- <copy file="${project.build.directory}/junk.xml" tofile="${project.build.directory}/junk.xml" overwrite="true" verbose="true" failonerror="false" />
-
+
+ <copy file="${basedir}/pom.xml" tofile="${project.build.directory}/pom-copy.xml" overwrite="true"
+ verbose="true" failonerror="true"/>
+ <copy file="${project.build.directory}/junk.xml" tofile="${project.build.directory}/junk.xml"
+ overwrite="true" verbose="true" failonerror="false"/>
+
<copy todir="${project.build.directory}/">
<fileset dir="${basedir}/stuff"/>
</copy>
<copy file="${basedir}/pom.xml" tofile="${project.build.directory}/pom-copy2.xml"/>
-
+
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/build.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/build.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/build.xml Tue Aug 27 20:31:00 2013
@@ -21,31 +21,31 @@ under the License.
<project name="test1">
- <target name="test">
+ <target name="test">
- <property name="property1" value="value"/>
- <property name="property2" value="${property1}"/>
- <property name="property3" value="prefix ${property1}"/>
- <echo>P1: ${property1}</echo>
- <echo>P2: ${property2}</echo>
- <echo>P3: ${property3}</echo>
- <echo message="P1: ${property1}"/>
- <echo message="P2: ${property2}"/>
- <echo message="P3: ${property3}"/>
- <echo message="${property1}"/>
- <echo message="${property2}"/>
- <echo message="${property3}"/>
-
- <fail message="Some property contains null in build.xml">
- <condition>
- <or>
- <contains string="${property1}" substring="null" casesensitive="no"/>
- <contains string="${property2}" substring="null" casesensitive="no"/>
- <contains string="${property3}" substring="null" casesensitive="no"/>
- </or>
- </condition>
- </fail>
+ <property name="property1" value="value"/>
+ <property name="property2" value="${property1}"/>
+ <property name="property3" value="prefix ${property1}"/>
+ <echo>P1: ${property1}</echo>
+ <echo>P2: ${property2}</echo>
+ <echo>P3: ${property3}</echo>
+ <echo message="P1: ${property1}"/>
+ <echo message="P2: ${property2}"/>
+ <echo message="P3: ${property3}"/>
+ <echo message="${property1}"/>
+ <echo message="${property2}"/>
+ <echo message="${property3}"/>
+
+ <fail message="Some property contains null in build.xml">
+ <condition>
+ <or>
+ <contains string="${property1}" substring="null" casesensitive="no"/>
+ <contains string="${property2}" substring="null" casesensitive="no"/>
+ <contains string="${property3}" substring="null" casesensitive="no"/>
+ </or>
+ </condition>
+ </fail>
- </target>
+ </target>
</project>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,10 +20,10 @@ 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.antrun</groupId>
<artifactId>custom-task-test</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -37,7 +37,7 @@ under the License.
<version>1.6.5</version>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -49,11 +49,11 @@ under the License.
<configuration>
<tasks>
- <echo message="basedir:${basedir}" />
- <echo message="sourceDirectory:${project.build.sourceDirectory}" />
- <echo message="model.sourceDirectory:${project.model.build.sourceDirectory}" />
+ <echo message="basedir:${basedir}"/>
+ <echo message="sourceDirectory:${project.build.sourceDirectory}"/>
+ <echo message="model.sourceDirectory:${project.model.build.sourceDirectory}"/>
<echo message="pom.build.directory=${project.build.directory}"/>
- <echo message="pom.model.build.directory=${project.model.build.directory}"/>
+ <echo message="pom.model.build.directory=${project.model.build.directory}"/>
<taskdef name="test" classname="TestTask">
<classpath refid="maven.compile.classpath"/>
</taskdef>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/src/main/java/TestTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/src/main/java/TestTask.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/src/main/java/TestTask.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/custom-task-test/src/main/java/TestTask.java Tue Aug 27 20:31:00 2013
@@ -21,13 +21,17 @@ import org.apache.tools.ant.BuildExcepti
import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
-public class TestTask extends Task {
+public class TestTask
+ extends Task
+{
- public void execute() throws BuildException {
+ public void execute()
+ throws BuildException
+ {
Project p = this.getProject();
- System.out.println("sourceDirectory:" + p.getProperty("project.build.sourceDirectory"));
- System.out.println("project.cmdline:" + p.getProperty("project.cmdline"));
- System.out.println("basedir:" + p.getProperty("basedir"));
+ System.out.println( "sourceDirectory:" + p.getProperty( "project.build.sourceDirectory" ) );
+ System.out.println( "project.cmdline:" + p.getProperty( "project.cmdline" ) );
+ System.out.println( "basedir:" + p.getProperty( "basedir" ) );
}
}
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/build.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/build.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/build.xml Tue Aug 27 20:31:00 2013
@@ -21,17 +21,17 @@ under the License.
<project name="test1">
- <target name="test">
+ <target name="test">
- <echo>user.home = ${user.home}</echo>
- <fail message="user.home is not set">
- <condition>
- <not>
- <isset property="user.home"/>
- </not>
- </condition>
- </fail>
+ <echo>user.home = ${user.home}</echo>
+ <fail message="user.home is not set">
+ <condition>
+ <not>
+ <isset property="user.home"/>
+ </not>
+ </condition>
+ </fail>
- </target>
+ </target>
</project>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/env-var-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,10 +20,10 @@ 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.antrun</groupId>
<artifactId>env-var-test</artifactId>
<version>1.0-SNAPSHOT</version>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,16 +20,16 @@ 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.antrun</groupId>
<artifactId>properties-test</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test for passing properties to the ant build</name>
<description>Test for passing properties to the ant build</description>
-
+
<build>
<plugins>
<plugin>
@@ -52,7 +52,7 @@ under the License.
<fileset refid="test.junit:junit:jar"/>
<fileset refid="test.org.apache.ant:ant:jar"/>
</copy>
-
+
<mkdir dir="target/dependencies2"/>
<copy todir="target/dependencies2" flatten="true">
<fileset refid="test.maven.project.dependencies"/>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/src/main/java/Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/src/main/java/Test.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/src/main/java/Test.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/filesets-test/src/main/java/Test.java Tue Aug 27 20:31:00 2013
@@ -17,10 +17,12 @@
* under the License.
*/
-public class Test {
+public class Test
+{
- public static void main(String args[]) {
- System.out.println("done");
+ public static void main( String args[] )
+ {
+ System.out.println( "done" );
}
}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/local-repo-prop-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/local-repo-prop-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/local-repo-prop-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/local-repo-prop-test/pom.xml Tue Aug 27 20:31:00 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>antrun-plugin.test</groupId>
<artifactId>antrun-plugin-test</artifactId>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/multiple-phase-test/pom.xml Tue Aug 27 20:31:00 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>antrun-plugin.test</groupId>
<artifactId>antrun-plugin-test</artifactId>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/never-fail-test/pom.xml Tue Aug 27 20:31:00 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>antrun-plugin.test</groupId>
<artifactId>antrun-plugin-never-fail-test</artifactId>
@@ -37,9 +37,9 @@ under the License.
<artifactId>maven-antrun-plugin</artifactId>
<version>@pom.version@</version>
<configuration>
- <failOnError>false</failOnError>
+ <failOnError>false</failOnError>
<tasks>
- <fail>This is a failure</fail>
+ <fail>This is a failure</fail>
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/build.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/build.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/build.xml Tue Aug 27 20:31:00 2013
@@ -21,15 +21,15 @@ under the License.
<project name="test6">
- <target name="test">
+ <target name="test">
- <!-- <taskdef name="antlr" classname="org.apache.tools.ant.taskdefs.optional.ANTLR"/> -->
+ <!-- <taskdef name="antlr" classname="org.apache.tools.ant.taskdefs.optional.ANTLR"/> -->
- <mkdir dir="target" />
- <antlr target="calc.g" outputdirectory="target">
- <classpath refid="maven.plugin.classpath"/>
- </antlr>
+ <mkdir dir="target"/>
+ <antlr target="calc.g" outputdirectory="target">
+ <classpath refid="maven.plugin.classpath"/>
+ </antlr>
- </target>
+ </target>
</project>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/plugin-classpath-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,19 +20,19 @@ 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.antrun</groupId>
<artifactId>plugin-classpath-test</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test for plugin classpath references and optional ant tasks</name>
<description>Ensure that maven.plugin.classpath reference is set and optional tasks work</description>
-
+
<dependencies>
</dependencies>
-
+
<build>
<plugins>
<plugin>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/build.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/build.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/build.xml Tue Aug 27 20:31:00 2013
@@ -21,31 +21,31 @@ under the License.
<project name="test1">
- <target name="test">
+ <target name="test">
- <property name="property1" value="value"/>
- <property name="property2" value="${property1}"/>
- <property name="property3" value="prefix ${property1}"/>
- <echo>P1: ${property1}</echo>
- <echo>P2: ${property2}</echo>
- <echo>P3: ${property3}</echo>
- <echo message="P1: ${property1}"/>
- <echo message="P2: ${property2}"/>
- <echo message="P3: ${property3}"/>
- <echo message="${property1}"/>
- <echo message="${property2}"/>
- <echo message="${property3}"/>
-
- <fail message="Some property contains null in build.xml">
- <condition>
- <or>
- <contains string="${property1}" substring="null" casesensitive="no"/>
- <contains string="${property2}" substring="null" casesensitive="no"/>
- <contains string="${property3}" substring="null" casesensitive="no"/>
- </or>
- </condition>
- </fail>
+ <property name="property1" value="value"/>
+ <property name="property2" value="${property1}"/>
+ <property name="property3" value="prefix ${property1}"/>
+ <echo>P1: ${property1}</echo>
+ <echo>P2: ${property2}</echo>
+ <echo>P3: ${property3}</echo>
+ <echo message="P1: ${property1}"/>
+ <echo message="P2: ${property2}"/>
+ <echo message="P3: ${property3}"/>
+ <echo message="${property1}"/>
+ <echo message="${property2}"/>
+ <echo message="${property3}"/>
+
+ <fail message="Some property contains null in build.xml">
+ <condition>
+ <or>
+ <contains string="${property1}" substring="null" casesensitive="no"/>
+ <contains string="${property2}" substring="null" casesensitive="no"/>
+ <contains string="${property3}" substring="null" casesensitive="no"/>
+ </or>
+ </condition>
+ </fail>
- </target>
+ </target>
</project>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/properties-attributes-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,10 +20,10 @@ 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.antrun</groupId>
<artifactId>properties-attributes-test</artifactId>
<version>1.0-SNAPSHOT</version>
@@ -32,7 +32,7 @@ under the License.
<dependencies>
</dependencies>
-
+
<properties>
<mavenProperty>xyz</mavenProperty>
</properties>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/build.xml Tue Aug 27 20:31:00 2013
@@ -23,29 +23,30 @@ under the License.
<target name="test">
- <!-- Check basic pom component properties -->
+ <!-- Check basic pom component properties -->
<echo message="project.artifactId : ${project.artifactId}"/>
<fail unless="project.artifactId" message="Property not set \${project.artifactId}"/>
-
- <!-- Properties defined in the pom <properties> -->
+
+ <!-- Properties defined in the pom <properties> -->
<echo message="testProp1 : ${testProp1}"/>
<fail unless="testProp1" message="Property not set \${testProp1}"/>
-
- <!-- Properties defined in an active profile -->
- <echo message="profileProp : ${profileProp}"/>
- <fail unless="profileProp" message="Profile property not set \${profileProp}"/>
-
- <!-- System properties -->
+
+ <!-- Properties defined in an active profile -->
+ <echo message="profileProp : ${profileProp}"/>
+ <fail unless="profileProp" message="Profile property not set \${profileProp}"/>
+
+ <!-- System properties -->
<echo message="line.separator : ${line.separator}"/>
<fail unless="line.separator" message="Property not set \${line.separator}"/>
-
- <!-- Dependency artifact properties -->
+
+ <!-- Dependency artifact properties -->
<echo message="junit:junit:jar : ${junit:junit:jar}"/>
- <fail unless="junit:junit:jar" message="Property not set \${junit:junit:jar}"/>
+ <fail unless="junit:junit:jar" message="Property not set \${junit:junit:jar}"/>
<echo message="maven.dependency.junit.junit.jar.path : ${maven.dependency.junit.junit.jar.path}"/>
- <fail unless="maven.dependency.junit.junit.jar.path" message="Property not set \${maven.dependency.junit.junit.jar.path}"/>
-
- <!-- Check that the build output dir is pointing to the correct location -->
+ <fail unless="maven.dependency.junit.junit.jar.path"
+ message="Property not set \${maven.dependency.junit.junit.jar.path}"/>
+
+ <!-- Check that the build output dir is pointing to the correct location -->
<property name="outputDir" location="./target/classes"/>
<echo message="outputDir: ${outputDir}"/>
<property name="outputDirProp" location="${project.build.outputDirectory}"/>
@@ -57,8 +58,8 @@ under the License.
</not>
</condition>
</fail>
-
- <!-- Check that the non-default test output dir is pointing to the correct location -->
+
+ <!-- Check that the non-default test output dir is pointing to the correct location -->
<property name="testOutputDir" location="./target/test-stuff"/>
<echo message="testOutputDir ${testOutputDir}"/>
<property name="testOutputDirProp" location="${project.build.testOutputDirectory}"/>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,16 +20,16 @@ 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.antrun</groupId>
<artifactId>properties-test</artifactId>
<version>1.0-SNAPSHOT</version>
<name>Test for passing properties to the ant build</name>
<description>Test for passing properties to the ant build</description>
-
+
<dependencies>
<dependency>
<groupId>junit</groupId>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/src/main/java/Test.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/src/main/java/Test.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/src/main/java/Test.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/properties-test/src/main/java/Test.java Tue Aug 27 20:31:00 2013
@@ -17,10 +17,12 @@
* under the License.
*/
-public class Test {
+public class Test
+{
- public static void main(String args[]) {
- System.out.println("done");
+ public static void main( String args[] )
+ {
+ System.out.println( "done" );
}
}
\ No newline at end of file
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/task-encoding-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/task-encoding-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/task-encoding-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/task-encoding-test/pom.xml Tue Aug 27 20:31:00 2013
@@ -20,7 +20,7 @@ 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/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.plugins.antrun</groupId>
@@ -50,7 +50,7 @@ under the License.
<configuration>
<tasks>
<!-- non-ASCII chars: Ã
ÃÃ -->
- <echo message="non-ASCII chars: Ã
ÃÃ" />
+ <echo message="non-ASCII chars: Ã
ÃÃ"/>
<!-- escaped characters -->
<echo message="Some "strange and mysterious" result"/>
</tasks>
Modified: maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/pom.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/pom.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/it/tasksattributes-test/pom.xml Tue Aug 27 20:31:00 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>antrun-plugin.test</groupId>
<artifactId>antrun-plugin-test</artifactId>
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=1517972&r1=1517971&r2=1517972&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 Tue Aug 27 20:31:00 2013
@@ -19,8 +19,6 @@ package org.apache.maven.ant.tasks;
* under the License.
*/
-import java.io.File;
-
import org.apache.maven.plugin.antrun.AntRunMojo;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
@@ -29,6 +27,8 @@ import org.apache.tools.ant.Project;
import org.apache.tools.ant.Task;
import org.codehaus.plexus.util.FileUtils;
+import java.io.File;
+
public class AttachArtifactTask
extends Task
{
@@ -47,29 +47,29 @@ public class AttachArtifactTask
* The file to attach.
*/
private File file;
-
+
/**
* The classifier of the artifact to attach
*/
private String classifier;
-
+
/**
* The type of the artifact to attach. Defaults to file extension.
*/
private String type;
-
+
public void execute()
{
if ( file == null )
{
throw new BuildException( "File is a required parameter." );
}
-
+
if ( !file.exists() )
{
throw new BuildException( "File does not exist: " + file );
}
-
+
if ( this.getProject().getReference( mavenProjectRefId ) == null )
{
throw new BuildException( "Maven project reference not found: " + mavenProjectRefId );
@@ -79,7 +79,7 @@ public class AttachArtifactTask
{
type = FileUtils.getExtension( file.getName() );
}
-
+
MavenProject mavenProject = (MavenProject) this.getProject().getReference( mavenProjectRefId );
if ( this.getProject().getReference( mavenProjectHelperRefId ) == null )
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/DependencyFilesetsTask.java Tue Aug 27 20:31:00 2013
@@ -19,10 +19,6 @@ package org.apache.maven.ant.tasks;
* under the License.
*/
-import java.io.File;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
import org.apache.maven.ant.tasks.support.SpecificScopesArtifactFilter;
import org.apache.maven.ant.tasks.support.TypesArtifactFilter;
import org.apache.maven.artifact.Artifact;
@@ -34,10 +30,14 @@ import org.apache.tools.ant.BuildExcepti
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;
+import java.io.File;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
/**
- * Ant task which create a fileset for each dependency in a Maven project, and a
+ * Ant task which create a fileset for each dependency in a Maven project, and a
* fileset containing all selected dependencies.
- *
+ *
* @author pgier
*/
public class DependencyFilesetsTask
@@ -96,8 +96,7 @@ public class DependencyFilesetsTask
MavenProject mavenProject = (MavenProject) this.getProject().getReference( "maven.project" );
// Add filesets for depenedency artifacts
- @SuppressWarnings( "unchecked" )
- Set<Artifact> depArtifacts = filterArtifacts( mavenProject.getArtifacts() );
+ @SuppressWarnings("unchecked") Set<Artifact> depArtifacts = filterArtifacts( mavenProject.getArtifacts() );
FileSet dependenciesFileSet = new FileSet();
dependenciesFileSet.setProject( getProject() );
@@ -169,7 +168,7 @@ public class DependencyFilesetsTask
/**
* Filter a set of artifacts using the scopes and type filters.
- *
+ *
* @param artifacts
* @return
*/
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/SpecificScopesArtifactFilter.java Tue Aug 27 20:31:00 2013
@@ -44,23 +44,33 @@ public class SpecificScopesArtifactFilte
/**
* Takes a comma separated list of scopes to include.
- *
+ *
* @param scopes A comma separated list of scopes
*/
public SpecificScopesArtifactFilter( String scopes )
{
- String [] scopeList = scopes.split( "," );
+ String[] scopeList = scopes.split( "," );
- for (String aScopeList : scopeList) {
- if (aScopeList.trim().equals(DefaultArtifact.SCOPE_COMPILE)) {
+ for ( String aScopeList : scopeList )
+ {
+ if ( aScopeList.trim().equals( DefaultArtifact.SCOPE_COMPILE ) )
+ {
compileScope = true;
- } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_PROVIDED)) {
+ }
+ else if ( aScopeList.trim().equals( DefaultArtifact.SCOPE_PROVIDED ) )
+ {
providedScope = true;
- } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_RUNTIME)) {
+ }
+ else if ( aScopeList.trim().equals( DefaultArtifact.SCOPE_RUNTIME ) )
+ {
runtimeScope = true;
- } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_SYSTEM)) {
+ }
+ else if ( aScopeList.trim().equals( DefaultArtifact.SCOPE_SYSTEM ) )
+ {
systemScope = true;
- } else if (aScopeList.trim().equals(DefaultArtifact.SCOPE_TEST)) {
+ }
+ else if ( aScopeList.trim().equals( DefaultArtifact.SCOPE_TEST ) )
+ {
testScope = true;
}
}
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/TypesArtifactFilter.java Tue Aug 27 20:31:00 2013
@@ -27,16 +27,15 @@ import java.util.List;
/**
* Artifact Filter which filters on artifact types.
- *
*/
public class TypesArtifactFilter
implements ArtifactFilter
{
private List<String> types = new ArrayList<String>();
- /**
+ /**
* Accepts a comma separated list of types
- *
+ *
* @param types
*/
public TypesArtifactFilter( String types )
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/ant/tasks/support/VersionMapper.java Tue Aug 27 20:31:00 2013
@@ -19,14 +19,14 @@ package org.apache.maven.ant.tasks.suppo
* under the License.
*/
+import org.apache.tools.ant.util.FileNameMapper;
+import org.codehaus.plexus.util.StringUtils;
+
import java.io.File;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import org.apache.tools.ant.util.FileNameMapper;
-import org.codehaus.plexus.util.StringUtils;
-
/**
* Ant filename mapper to remove version info from filename when copying dependencies.
*
@@ -56,10 +56,10 @@ public class VersionMapper
{
path = "";
}
- return new String[] { path + baseFilename + extension };
+ return new String[]{ path + baseFilename + extension };
}
}
- return new String[] { sourceFileName };
+ return new String[]{ sourceFileName };
}
/**
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=1517972&r1=1517971&r2=1517972&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 Tue Aug 27 20:31:00 2013
@@ -64,7 +64,8 @@ import java.util.Set;
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
*/
-@Mojo ( name = "run", threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST )
+@SuppressWarnings( "JavaDoc" )
+@Mojo(name = "run", threadSafe = true, requiresDependencyResolution = ResolutionScope.TEST)
public class AntRunMojo
extends AbstractMojo
{
@@ -118,13 +119,13 @@ public class AntRunMojo
/**
* The plugin dependencies.
*/
- @Parameter ( property = "plugin.artifacts", required = true, readonly = true )
+ @Parameter(property = "plugin.artifacts", required = true, readonly = true)
private List<Artifact> pluginArtifacts;
/**
* The local Maven repository
*/
- @Parameter ( property = "localRepository", readonly = true )
+ @Parameter(property = "localRepository", readonly = true)
protected ArtifactRepository localRepository;
/**
@@ -132,7 +133,7 @@ public class AntRunMojo
*
* @since 1.4
*/
- @Parameter ( defaultValue = "" )
+ @Parameter(defaultValue = "")
private String propertyPrefix;
/**
@@ -142,14 +143,14 @@ public class AntRunMojo
*
* @since 1.5
*/
- @Parameter ( defaultValue = "" )
+ @Parameter(defaultValue = "")
private String customTaskPrefix = "";
/**
* The name of a property containing the list of all dependency versions. This is used for the removing the versions
* from the filenames.
*/
- @Parameter ( defaultValue = "maven.project.dependencies.versions" )
+ @Parameter(defaultValue = "maven.project.dependencies.versions")
private String versionsPropertyName;
/**
@@ -176,7 +177,7 @@ public class AntRunMojo
*
* @deprecated Use the build-helper-maven-plugin to bind source directories
*/
- @Parameter ( property = "sourceRoot" )
+ @Parameter(property = "sourceRoot")
private File sourceRoot;
/**
@@ -185,7 +186,7 @@ public class AntRunMojo
*
* @deprecated Use the build-helper-maven-plugin to bind test source directories
*/
- @Parameter ( property = "testSourceRoot" )
+ @Parameter(property = "testSourceRoot")
private File testSourceRoot;
/**
@@ -193,7 +194,7 @@ public class AntRunMojo
*
* @since 1.7
*/
- @Parameter ( property = "maven.antrun.skip", defaultValue = "false" )
+ @Parameter(property = "maven.antrun.skip", defaultValue = "false")
private boolean skip;
/**
@@ -201,7 +202,7 @@ public class AntRunMojo
*
* @since 1.7
*/
- @Parameter ( defaultValue = "false" )
+ @Parameter(defaultValue = "false")
private boolean exportAntProperties;
/**
@@ -211,7 +212,7 @@ public class AntRunMojo
*
* @since 1.7
*/
- @Parameter ( defaultValue = "true" )
+ @Parameter(defaultValue = "true")
private boolean failOnError;
/**
@@ -328,7 +329,7 @@ public class AntRunMojo
catch ( BuildException e )
{
StringBuilder sb = new StringBuilder();
- sb.append("An Ant BuildException has occured: ").append(e.getMessage());
+ sb.append( "An Ant BuildException has occured: " ).append( e.getMessage() );
String fragment = findFragment( e );
if ( fragment != null )
{
@@ -436,7 +437,7 @@ public class AntRunMojo
antProject.setProperty( ( propertyPrefix + "settings.localRepository" ), localRepository.getBasedir() );
// Add properties for depenedency artifacts
- @SuppressWarnings ( "unchecked" ) Set<Artifact> depArtifacts = mavenProject.getArtifacts();
+ @SuppressWarnings("unchecked") Set<Artifact> depArtifacts = mavenProject.getArtifacts();
for ( Artifact artifact : depArtifacts )
{
String propName = artifact.getDependencyConflictId();
@@ -448,7 +449,7 @@ public class AntRunMojo
StringBuilder versionsBuffer = new StringBuilder();
for ( Artifact artifact : depArtifacts )
{
- versionsBuffer.append(artifact.getVersion()).append(File.pathSeparator);
+ versionsBuffer.append( artifact.getVersion() ).append( File.pathSeparator );
}
antProject.setProperty( versionsPropertyName, versionsBuffer.toString() );
@@ -510,10 +511,9 @@ public class AntRunMojo
*/
public static String getDependencyArtifactPropertyName( Artifact artifact )
{
- String key = DEPENDENCY_PREFIX + artifact.getGroupId() + "." + artifact.getArtifactId() + (
+ return DEPENDENCY_PREFIX + artifact.getGroupId() + "." + artifact.getArtifactId() + (
artifact.getClassifier() != null ? "." + artifact.getClassifier() : "" ) + ( artifact.getType() != null ?
"." + artifact.getType() : "" ) + ".path";
- return key;
}
/**
@@ -586,6 +586,7 @@ public class AntRunMojo
String fileName = "build-" + antTargetName + ".xml";
File buildFile = new File( project.getBuild().getDirectory(), "/antrun/" + fileName );
+ //noinspection ResultOfMethodCallIgnored
buildFile.getParentFile().mkdirs();
FileUtils.fileWrite( buildFile.getAbsolutePath(), UTF_8, antProjectConfig.toString() );
return buildFile;
Modified: maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/main/java/org/apache/maven/plugin/antrun/AntrunXmlPlexusConfigurationWriter.java Tue Aug 27 20:31:00 2013
@@ -30,7 +30,6 @@ import java.io.Writer;
* Write a plexus configuration to a stream
* Note: This class was originally copied from plexus-container-default. It is duplicated here
* to maintain compatibility with both Maven 2.x and Maven 3.x.
- *
*/
public class AntrunXmlPlexusConfigurationWriter
{
@@ -64,7 +63,7 @@ public class AntrunXmlPlexusConfiguratio
write( child, w, depth + 1 );
}
-
+
w.endElement();
}
}
@@ -73,9 +72,9 @@ public class AntrunXmlPlexusConfiguratio
throws IOException
{
w.startElement( c.getName() );
-
+
writeAttributes( c, w );
-
+
String value = c.getValue( null );
if ( value != null )
{
@@ -90,8 +89,9 @@ public class AntrunXmlPlexusConfiguratio
{
String[] names = c.getAttributeNames();
- for (String name : names) {
- w.addAttribute(name, c.getAttribute(name, null));
+ for ( String name : names )
+ {
+ w.addAttribute( name, c.getAttribute( name, null ) );
}
}
Modified: maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml?rev=1517972&r1=1517971&r2=1517972&view=diff
==============================================================================
--- maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml (original)
+++ maven/plugins/trunk/maven-antrun-plugin/src/site/site.xml Tue Aug 27 20:31:00 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/"/>