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 [1/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/ ...
Author: krosenvold
Date: Tue Aug 27 20:14:02 2013
New Revision: 1517969
URL: http://svn.apache.org/r1517969
Log:
Reformatted to code style, modernized
Modified:
maven/plugins/trunk/maven-ant-plugin/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/clean-custom-files/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/clean/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ear/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ejbs/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/src/main/java/test/ExtendedLog.java
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/logging/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/servlet/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/src/main/java/org/apache/maven/plugin/ant/it/TestMojo.java
maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config-only/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/relative-path-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/custom-build.xml
maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-compilation-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-execution-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/web.xml
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriterUtil.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntCleanMojo.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntMojo.java
maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/ArtifactResolverWrapper.java
maven/plugins/trunk/maven-ant-plugin/src/site/site.xml
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterTest.java
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntBuildWriterUtilTest.java
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntMojoTest.java
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/AntWrapper.java
maven/plugins/trunk/maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/AbstractAntTestMavenProjectStub.java
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-compiler-config-test/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-javadoc-test/src/main/java/org/apache/maven/plugins/ant/test/App.java
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-nodep-test/src/main/java/org/apache/maven/plugins/ant/test/App.java
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/pom.xml
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-test/src/main/java/org/apache/maven/plugins/ant/test/App.java
maven/plugins/trunk/maven-ant-plugin/src/test/resources/unit/ant-war-config-test/pom.xml
maven/plugins/trunk/maven-javadoc-plugin/javadoc-options-javadoc-resources.xml
Modified: maven/plugins/trunk/maven-ant-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/pom.xml Tue Aug 27 20:14:02 2013
@@ -19,7 +19,8 @@ specific language governing permissions
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">
+<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">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -42,7 +43,8 @@ under the License.
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/</developerConnection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-ant-plugin/
+ </developerConnection>
<url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/</url>
</scm>
<issueManagement>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/clean-custom-files/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/clean-custom-files/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/clean-custom-files/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/clean-custom-files/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/clean/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/clean/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/clean/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/clean/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ear/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ear/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ear/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ear/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.it.ear-it</groupId>
<artifactId>ear</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ejbs/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ejbs/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ejbs/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/ejbs/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.it.ear-it</groupId>
<artifactId>ejbs</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/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.it</groupId>
<artifactId>ear-it</artifactId>
@@ -59,8 +59,8 @@ under the License.
<version>1.1</version>
<configuration>
<tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/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.it.ear-it</groupId>
<artifactId>primary-source</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/src/main/java/test/ExtendedLog.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/src/main/java/test/ExtendedLog.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/src/main/java/test/ExtendedLog.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/primary-source/src/main/java/test/ExtendedLog.java Tue Aug 27 20:14:02 2013
@@ -1,5 +1,6 @@
package test;
-public class ExtendedLog extends Log
+public class ExtendedLog
+ extends Log
{
}
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/logging/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/logging/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/logging/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.it.ear-it.projects</groupId>
<artifactId>logging</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/projects/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.it.ear-it</groupId>
<artifactId>projects</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/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.it.ear-it</groupId>
<artifactId>servlets</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/servlet/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/servlet/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/servlet/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/ear-it/servlets/servlet/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.it.ear-it.servlets</groupId>
<artifactId>servlet</artifactId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/encoding-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -38,9 +38,9 @@
<configuration>
<tasks>
<!-- delete the properties file to prevent fallback, we want only stuff from the XML file -->
- <delete file="${basedir}/maven-build.properties" />
- <property name="maven.repo.local" location="${settings.localRepository}" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <delete file="${basedir}/maven-build.properties"/>
+ <property name="maven.repo.local" location="${settings.localRepository}"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/file-repo-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -37,7 +37,7 @@
<version>1.1</version>
<configuration>
<tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="help" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="help"/>
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/javadoc-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/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.it</groupId>
<artifactId>plugin-it</artifactId>
@@ -55,8 +55,8 @@ under the License.
<version>1.1</version>
<configuration>
<tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/src/main/java/org/apache/maven/plugin/ant/it/TestMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/src/main/java/org/apache/maven/plugin/ant/it/TestMojo.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/src/main/java/org/apache/maven/plugin/ant/it/TestMojo.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/plugin-it/src/main/java/org/apache/maven/plugin/ant/it/TestMojo.java Tue Aug 27 20:14:02 2013
@@ -19,10 +19,9 @@ package org.apache.maven.plugin.ant.it;
import org.apache.maven.plugin.AbstractMojo;
/**
- * @goal test
- *
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
+ * @goal test
*/
public class TestMojo
extends AbstractMojo
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config-only/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config-only/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config-only/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config-only/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.its.ant</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/plugin-mngt-config/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.its.ant</groupId>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/relative-path-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/relative-path-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/relative-path-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/relative-path-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -37,13 +37,13 @@
<version>1.1</version>
<configuration>
<tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
</plugin>
</plugins>
<resources>
- <resource>
+ <resource>
<directory>src/main/resources</directory>
</resource>
<resource>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/single-test-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -38,8 +38,8 @@
<version>1.1</version>
<configuration>
<tasks>
- <property name="test" value="GoodTest" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <property name="test" value="GoodTest"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
<dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/custom-build.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/custom-build.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/custom-build.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/custom-build.xml Tue Aug 27 20:14:02 2013
@@ -3,8 +3,8 @@
<import file="maven-build.xml"/>
- <target name="junit-missing"
- depends="test-junit-status"
+ <target name="junit-missing"
+ depends="test-junit-status"
if="junit.missing">
<echo level="error">Skipping tests should also work if JUnit is not present at all.</echo>
<fail>JUnit not found on class path, cannot run unit tests.</fail>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/skip-missing-junit-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -38,8 +38,8 @@
<version>1.1</version>
<configuration>
<tasks>
- <property name="maven.test.skip" value="true" />
- <ant dir="${basedir}" antfile="${basedir}/custom-build.xml" target="test" />
+ <property name="maven.test.skip" value="true"/>
+ <ant dir="${basedir}" antfile="${basedir}/custom-build.xml" target="test"/>
</tasks>
</configuration>
<dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-compilation-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-compilation-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-compilation-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-compilation-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -38,8 +38,8 @@
<version>1.1</version>
<configuration>
<tasks>
- <property name="maven.test.skip" value="true" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="compile-tests" />
+ <property name="maven.test.skip" value="true"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="compile-tests"/>
</tasks>
</configuration>
<dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-execution-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-execution-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-execution-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/skip-test-execution-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -38,8 +38,8 @@
<version>1.1</version>
<configuration>
<tasks>
- <property name="maven.test.skip" value="true" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="test" />
+ <property name="maven.test.skip" value="true"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="test"/>
</tasks>
</configuration>
<dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/system-scope-dep/pom.xml Tue Aug 27 20:14:02 2013
@@ -24,8 +24,8 @@
<version>1.1</version>
<configuration>
<tasks>
- <property name="lib.dir" location="${lib.dir}" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="compile" />
+ <property name="lib.dir" location="${lib.dir}"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="compile"/>
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/test-custom-selector-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -38,7 +38,7 @@
<version>1.1</version>
<configuration>
<tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
<dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/test-default-selector-it/pom.xml Tue Aug 27 20:14:02 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.it</groupId>
@@ -38,7 +38,7 @@
<version>1.1</version>
<configuration>
<tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
<dependencies>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/pom.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/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.it</groupId>
<artifactId>webapp-it</artifactId>
@@ -74,8 +74,8 @@ under the License.
<version>1.1</version>
<configuration>
<tasks>
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean" />
- <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package" />
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="clean"/>
+ <ant dir="${basedir}" antfile="${basedir}/build.xml" target="package"/>
</tasks>
</configuration>
</plugin>
Modified: maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/web.xml?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/web.xml (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/it/webapp-it/src/main/webapp/WEB-INF/web.xml Tue Aug 27 20:14:02 2013
@@ -18,8 +18,8 @@ under the License.
-->
<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
<web-app>
<display-name>Archetype Created Web Application</display-name>
Modified: maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java?rev=1517969&r1=1517968&r2=1517969&view=diff
==============================================================================
--- maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java (original)
+++ maven/plugins/trunk/maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/AntBuildWriter.java Tue Aug 27 20:14:02 2013
@@ -19,20 +19,6 @@ package org.apache.maven.plugin.ant;
* under the License.
*/
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Profile;
@@ -48,6 +34,19 @@ import org.codehaus.plexus.util.xml.Pret
import org.codehaus.plexus.util.xml.XMLWriter;
import org.codehaus.plexus.util.xml.XmlWriterUtil;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
/**
* Write Ant build files from <code>Maven Project</code> for <a href="http://ant.apache.org">Ant</a> 1.6.2 or above:
* <ul>
@@ -82,17 +81,17 @@ public class AntBuildWriter
*/
protected static final String DEFAULT_MAVEN_PROPERTIES_FILENAME = "maven-build.properties";
- private MavenProject project;
+ private final MavenProject project;
- private ArtifactResolverWrapper artifactResolverWrapper;
+ private final ArtifactResolverWrapper artifactResolverWrapper;
- private File localRepository;
+ private final File localRepository;
- private Settings settings;
+ private final Settings settings;
- private boolean overwrite;
+ private final boolean overwrite;
- private Properties executionProperties;
+ private final Properties executionProperties;
/**
* @param project
@@ -126,8 +125,8 @@ public class AntBuildWriter
/**
* Generate <code>maven-build.properties</code> only for a non-POM project
*
- * @see #DEFAULT_MAVEN_PROPERTIES_FILENAME
* @throws IOException
+ * @see #DEFAULT_MAVEN_PROPERTIES_FILENAME
*/
protected void writeBuildProperties()
throws IOException
@@ -143,67 +142,67 @@ public class AntBuildWriter
// Build properties
// ----------------------------------------------------------------------
- addProperty( properties, "maven.build.finalName", AntBuildWriterUtil.toRelative( project.getBasedir(), project
- .getBuild().getFinalName() ) );
+ addProperty( properties, "maven.build.finalName",
+ AntBuildWriterUtil.toRelative( project.getBasedir(), project.getBuild().getFinalName() ) );
// target
- addProperty( properties, "maven.build.dir", AntBuildWriterUtil.toRelative( project.getBasedir(), project.getBuild()
- .getDirectory() ) );
+ addProperty( properties, "maven.build.dir",
+ AntBuildWriterUtil.toRelative( project.getBasedir(), project.getBuild().getDirectory() ) );
addProperty( properties, "project.build.directory", "${maven.build.dir}" );
// ${maven.build.dir}/classes
- addProperty( properties, "maven.build.outputDir", "${maven.build.dir}/"
- + AntBuildWriterUtil.toRelative( new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
- project.getBuild().getOutputDirectory() ) );
+ addProperty( properties, "maven.build.outputDir", "${maven.build.dir}/" + AntBuildWriterUtil.toRelative(
+ new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
+ project.getBuild().getOutputDirectory() ) );
addProperty( properties, "project.build.outputDirectory", "${maven.build.outputDir}" );
// src/main/java
if ( !project.getCompileSourceRoots().isEmpty() )
{
List var = project.getCompileSourceRoots();
- String[] compileSourceRoots = (String[]) var.toArray(new String[var.size()]);
+ String[] compileSourceRoots = (String[]) var.toArray( new String[var.size()] );
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
- addProperty( properties, "maven.build.srcDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
- compileSourceRoots[i] ) );
+ addProperty( properties, "maven.build.srcDir." + i,
+ AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
}
}
// src/main/resources
if ( project.getBuild().getResources() != null )
{
List<Resource> var = project.getBuild().getResources();
- Resource[] array = var.toArray(new Resource[var.size()]);
+ Resource[] array = var.toArray( new Resource[var.size()] );
for ( int i = 0; i < array.length; i++ )
{
- addProperty( properties, "maven.build.resourceDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
- array[i].getDirectory() ) );
+ addProperty( properties, "maven.build.resourceDir." + i,
+ AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
}
}
// ${maven.build.dir}/test-classes
- addProperty( properties, "maven.build.testOutputDir", "${maven.build.dir}/"
- + AntBuildWriterUtil.toRelative( new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
- project.getBuild().getTestOutputDirectory() ) );
+ addProperty( properties, "maven.build.testOutputDir", "${maven.build.dir}/" + AntBuildWriterUtil.toRelative(
+ new File( project.getBasedir(), properties.getProperty( "maven.build.dir" ) ),
+ project.getBuild().getTestOutputDirectory() ) );
// src/test/java
if ( !project.getTestCompileSourceRoots().isEmpty() )
{
List var = project.getTestCompileSourceRoots();
- String[] compileSourceRoots = (String[]) var.toArray(new String[var.size()]);
+ String[] compileSourceRoots = (String[]) var.toArray( new String[var.size()] );
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
- addProperty( properties, "maven.build.testDir." + i, AntBuildWriterUtil.toRelative( project.getBasedir(),
- compileSourceRoots[i] ) );
+ addProperty( properties, "maven.build.testDir." + i,
+ AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
}
}
// src/test/resources
if ( project.getBuild().getTestResources() != null )
{
List<Resource> var = project.getBuild().getTestResources();
- Resource[] array = var.toArray(new Resource[var.size()]);
+ Resource[] array = var.toArray( new Resource[var.size()] );
for ( int i = 0; i < array.length; i++ )
{
- addProperty( properties, "maven.build.testResourceDir." + i, AntBuildWriterUtil
- .toRelative( project.getBasedir(), array[i].getDirectory() ) );
+ addProperty( properties, "maven.build.testResourceDir." + i,
+ AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
}
}
@@ -225,9 +224,10 @@ public class AntBuildWriter
if ( project.getProperties() != null )
{
- for (Map.Entry<Object, Object> objectObjectEntry : project.getProperties().entrySet()) {
+ for ( Map.Entry<Object, Object> objectObjectEntry : project.getProperties().entrySet() )
+ {
Map.Entry property = (Map.Entry) objectObjectEntry;
- addProperty(properties, property.getKey().toString(), property.getValue().toString());
+ addProperty( properties, property.getKey().toString(), property.getValue().toString() );
}
}
@@ -246,8 +246,8 @@ public class AntBuildWriter
/**
* Generate an <code>maven-build.xml</code>
*
- * @see #DEFAULT_MAVEN_BUILD_FILENAME
* @throws IOException
+ * @see #DEFAULT_MAVEN_BUILD_FILENAME
*/
private void writeGeneratedBuildXml()
throws IOException
@@ -259,8 +259,8 @@ public class AntBuildWriter
OutputStreamWriter w = new OutputStreamWriter( new FileOutputStream( outputFile ), encoding );
- XMLWriter writer = new PrettyPrintXMLWriter( w, StringUtils.repeat( " ", DEFAULT_INDENTATION_SIZE ), encoding,
- null );
+ XMLWriter writer =
+ new PrettyPrintXMLWriter( w, StringUtils.repeat( " ", DEFAULT_INDENTATION_SIZE ), encoding, null );
// ----------------------------------------------------------------------
// <!-- comments -->
@@ -308,8 +308,8 @@ public class AntBuildWriter
// <target name="compile-tests" />
// ----------------------------------------------------------------------
- List testCompileSourceRoots = AntBuildWriterUtil.removeEmptyCompileSourceRoots( project
- .getTestCompileSourceRoots() );
+ List testCompileSourceRoots =
+ AntBuildWriterUtil.removeEmptyCompileSourceRoots( project.getTestCompileSourceRoots() );
writeCompileTestsTarget( writer, testCompileSourceRoots );
// ----------------------------------------------------------------------
@@ -345,8 +345,8 @@ public class AntBuildWriter
/**
* Generate an generic <code>build.xml</code> if not already exist
*
- * @see #DEFAULT_BUILD_FILENAME
* @throws IOException
+ * @see #DEFAULT_BUILD_FILENAME
*/
private void writeBuildXml()
throws IOException
@@ -362,8 +362,8 @@ public class AntBuildWriter
OutputStreamWriter w = new OutputStreamWriter( new FileOutputStream( outputFile ), encoding );
- XMLWriter writer = new PrettyPrintXMLWriter( w, StringUtils.repeat( " ", DEFAULT_INDENTATION_SIZE ), encoding,
- null );
+ XMLWriter writer =
+ new PrettyPrintXMLWriter( w, StringUtils.repeat( " ", DEFAULT_INDENTATION_SIZE ), encoding, null );
// ----------------------------------------------------------------------
// <!-- comments -->
@@ -382,8 +382,8 @@ public class AntBuildWriter
XmlWriterUtil.writeLineBreak( writer );
- XmlWriterUtil.writeCommentText( writer, "Import " + DEFAULT_MAVEN_BUILD_FILENAME
- + " into the current project", 1 );
+ XmlWriterUtil.writeCommentText( writer, "Import " + DEFAULT_MAVEN_BUILD_FILENAME + " into the current project",
+ 1 );
writer.startElement( "import" );
writer.addAttribute( "file", DEFAULT_MAVEN_BUILD_FILENAME );
@@ -452,25 +452,26 @@ public class AntBuildWriter
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.dir" );
- writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), project.getBuild().getDirectory() ) );
+ writer.addAttribute( "value",
+ AntBuildWriterUtil.toRelative( project.getBasedir(), project.getBuild().getDirectory() ) );
writer.endElement(); // property
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.outputDir" );
- writer.addAttribute( "value", "${maven.build.dir}/"
- + AntBuildWriterUtil.toRelative( new File( project.getBuild().getDirectory() ), project.getBuild()
- .getOutputDirectory() ) );
+ writer.addAttribute( "value", "${maven.build.dir}/" + AntBuildWriterUtil.toRelative(
+ new File( project.getBuild().getDirectory() ), project.getBuild().getOutputDirectory() ) );
writer.endElement(); // property
if ( !project.getCompileSourceRoots().isEmpty() )
{
List var = project.getCompileSourceRoots();
- String[] compileSourceRoots = (String[]) var.toArray(new String[var.size()]);
+ String[] compileSourceRoots = (String[]) var.toArray( new String[var.size()] );
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.srcDir." + i );
- writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
+ writer.addAttribute( "value",
+ AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
writer.endElement(); // property
}
}
@@ -478,32 +479,33 @@ public class AntBuildWriter
if ( project.getBuild().getResources() != null )
{
List<Resource> var = project.getBuild().getResources();
- Resource[] array = var.toArray(new Resource[var.size()]);
+ Resource[] array = var.toArray( new Resource[var.size()] );
for ( int i = 0; i < array.length; i++ )
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.resourceDir." + i );
- writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
+ writer.addAttribute( "value",
+ AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
writer.endElement(); // property
}
}
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.testOutputDir" );
- writer.addAttribute( "value", "${maven.build.dir}/"
- + AntBuildWriterUtil.toRelative( new File( project.getBuild().getDirectory() ), project.getBuild()
- .getTestOutputDirectory() ) );
+ writer.addAttribute( "value", "${maven.build.dir}/" + AntBuildWriterUtil.toRelative(
+ new File( project.getBuild().getDirectory() ), project.getBuild().getTestOutputDirectory() ) );
writer.endElement(); // property
if ( !project.getTestCompileSourceRoots().isEmpty() )
{
List var = project.getTestCompileSourceRoots();
- String[] compileSourceRoots = (String[]) var.toArray(new String[var.size()]);
+ String[] compileSourceRoots = (String[]) var.toArray( new String[var.size()] );
for ( int i = 0; i < compileSourceRoots.length; i++ )
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.testDir." + i );
- writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
+ writer.addAttribute( "value",
+ AntBuildWriterUtil.toRelative( project.getBasedir(), compileSourceRoots[i] ) );
writer.endElement(); // property
}
}
@@ -511,12 +513,13 @@ public class AntBuildWriter
if ( project.getBuild().getTestResources() != null )
{
List<Resource> var = project.getBuild().getTestResources();
- Resource[] array = var.toArray(new Resource[var.size()]);
+ Resource[] array = var.toArray( new Resource[var.size()] );
for ( int i = 0; i < array.length; i++ )
{
writer.startElement( "property" );
writer.addAttribute( "name", "maven.build.testResourceDir." + i );
- writer.addAttribute( "value", AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
+ writer.addAttribute( "value",
+ AntBuildWriterUtil.toRelative( project.getBasedir(), array[i].getDirectory() ) );
writer.endElement(); // property
}
}
@@ -534,8 +537,8 @@ public class AntBuildWriter
}
writer.startElement( "property" );
writer.addAttribute( "name", "maven.reporting.outputDirectory" );
- writer.addAttribute( "value", "${maven.build.dir}/"
- + AntBuildWriterUtil.toRelative( new File( project.getBuild().getDirectory() ), reportingOutputDir ) );
+ writer.addAttribute( "value", "${maven.build.dir}/" + AntBuildWriterUtil.toRelative(
+ new File( project.getBuild().getDirectory() ), reportingOutputDir ) );
writer.endElement(); // property
// ----------------------------------------------------------------------
@@ -609,18 +612,22 @@ public class AntBuildWriter
writer.startElement( "path" );
writer.addAttribute( "id", id );
- for (Object artifact1 : artifacts) {
+ for ( Object artifact1 : artifacts )
+ {
Artifact artifact = (Artifact) artifact1;
- writer.startElement("pathelement");
+ writer.startElement( "pathelement" );
String path;
- if (Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) {
- path = getUninterpolatedSystemPath(artifact);
- } else {
- path = "${maven.repo.local}/" + artifactResolverWrapper.getLocalArtifactPath(artifact);
+ if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
+ {
+ path = getUninterpolatedSystemPath( artifact );
+ }
+ else
+ {
+ path = "${maven.repo.local}/" + artifactResolverWrapper.getLocalArtifactPath( artifact );
}
- writer.addAttribute("location", path);
+ writer.addAttribute( "location", path );
writer.endElement(); // pathelement
}
@@ -632,15 +639,20 @@ public class AntBuildWriter
{
String managementKey = artifact.getDependencyConflictId();
- for (Dependency dependency : project.getOriginalModel().getDependencies()) {
- if (managementKey.equals(dependency.getManagementKey())) {
+ for ( Dependency dependency : project.getOriginalModel().getDependencies() )
+ {
+ if ( managementKey.equals( dependency.getManagementKey() ) )
+ {
return dependency.getSystemPath();
}
}
- for (Profile profile : project.getOriginalModel().getProfiles()) {
- for (Dependency dependency : profile.getDependencies()) {
- if (managementKey.equals(dependency.getManagementKey())) {
+ for ( Profile profile : project.getOriginalModel().getProfiles() )
+ {
+ for ( Dependency dependency : profile.getDependencies() )
+ {
+ if ( managementKey.equals( dependency.getManagementKey() ) )
+ {
return dependency.getSystemPath();
}
}
@@ -654,18 +666,20 @@ public class AntBuildWriter
props.remove( "user.dir" );
props.put( "basedir", project.getBasedir().getAbsolutePath() );
- SortedMap candidateProperties = new TreeMap();
- for (Object o : props.keySet()) {
+ SortedMap<String, String> candidateProperties = new TreeMap<String, String>();
+ for ( Object o : props.keySet() )
+ {
String key = (String) o;
- String value = new File(props.getProperty(key)).getPath();
- if (path.startsWith(value) && value.length() > 0) {
- candidateProperties.put(value, key);
+ String value = new File( props.getProperty( key ) ).getPath();
+ if ( path.startsWith( value ) && value.length() > 0 )
+ {
+ candidateProperties.put( value, key );
}
}
if ( !candidateProperties.isEmpty() )
{
- String value = candidateProperties.lastKey().toString();
- String key = candidateProperties.get( value ).toString();
+ String value = candidateProperties.lastKey();
+ String key = candidateProperties.get( value );
path = path.substring( value.length() );
path = path.replace( '\\', '/' );
return "${" + key + "}" + path;
@@ -677,7 +691,7 @@ public class AntBuildWriter
/**
* Write clean target in the writer depending the packaging of the project.
*
- * @param writer
+ * @param writer the writer
*/
private void writeCleanTarget( XMLWriter writer )
{
@@ -691,9 +705,10 @@ public class AntBuildWriter
{
if ( project.getModules() != null )
{
- for (Object o : project.getModules()) {
+ for ( Object o : project.getModules() )
+ {
String moduleSubPath = (String) o;
- AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "clean");
+ AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "clean" );
}
}
}
@@ -728,9 +743,10 @@ public class AntBuildWriter
writer.addAttribute( "description", "Compile the code" );
if ( project.getModules() != null )
{
- for (Object o : project.getModules()) {
+ for ( Object o : project.getModules() )
+ {
String moduleSubPath = (String) o;
- AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "compile");
+ AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "compile" );
}
}
writer.endElement(); // target
@@ -770,9 +786,10 @@ public class AntBuildWriter
writer.addAttribute( "description", "Compile the test code" );
if ( project.getModules() != null )
{
- for (Object o : project.getModules()) {
+ for ( Object o : project.getModules() )
+ {
String moduleSubPath = (String) o;
- AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "compile-tests");
+ AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "compile-tests" );
}
}
writer.endElement(); // target
@@ -812,9 +829,10 @@ public class AntBuildWriter
writer.addAttribute( "description", "Run the test cases" );
if ( project.getModules() != null )
{
- for (Object o : project.getModules()) {
+ for ( Object o : project.getModules() )
+ {
String moduleSubPath = (String) o;
- AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "test");
+ AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "test" );
}
}
writer.endElement(); // target
@@ -881,7 +899,7 @@ public class AntBuildWriter
writer.addAttribute( "todir", "${maven.test.reports}" );
writer.addAttribute( "if", "test" );
- includes = Arrays.asList( new String[] { "**/${test}.java" } );
+ includes = Arrays.asList( "**/${test}.java" );
writeTestFilesets( writer, testCompileSourceRoots, includes, excludes );
@@ -945,7 +963,8 @@ public class AntBuildWriter
writer.endElement(); // echo
writer.startElement( "echo" );
- writer.writeText( " JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed." );
+ writer.writeText(
+ " JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed." );
writer.endElement(); // echo
writer.startElement( "echo" );
@@ -966,10 +985,11 @@ public class AntBuildWriter
private List getTestIncludes()
throws IOException
{
- List includes = getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "includes", null ) );
+ List includes =
+ getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "includes", null ) );
if ( includes == null || includes.isEmpty() )
{
- includes = Arrays.asList( new String[] { "**/Test*.java", "**/*Test.java", "**/*TestCase.java" } );
+ includes = Arrays.asList( "**/Test*.java", "**/*Test.java", "**/*TestCase.java" );
}
return includes;
}
@@ -982,10 +1002,11 @@ public class AntBuildWriter
private List getTestExcludes()
throws IOException
{
- List excludes = getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "excludes", null ) );
+ List excludes =
+ getSelectorList( AntBuildWriterUtil.getMavenSurefirePluginOptions( project, "excludes", null ) );
if ( excludes == null || excludes.isEmpty() )
{
- excludes = Arrays.asList( new String[] { "**/*Abstract*Test.java" } );
+ excludes = Arrays.asList( "**/*Abstract*Test.java" );
}
return excludes;
}
@@ -1029,9 +1050,10 @@ public class AntBuildWriter
{
if ( project.getModules() != null )
{
- for (Object o : project.getModules()) {
+ for ( Object o : project.getModules() )
+ {
String moduleSubPath = (String) o;
- AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "javadoc");
+ AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "javadoc" );
}
}
}
@@ -1070,9 +1092,10 @@ public class AntBuildWriter
{
if ( project.getModules() != null )
{
- for (Object o : project.getModules()) {
+ for ( Object o : project.getModules() )
+ {
String moduleSubPath = (String) o;
- AntBuildWriterUtil.writeAntTask(writer, project, moduleSubPath, "package");
+ AntBuildWriterUtil.writeAntTask( writer, project, moduleSubPath, "package" );
}
}
}
@@ -1096,8 +1119,9 @@ public class AntBuildWriter
else
{
writer.startElement( "echo" );
- writer.addAttribute( "message", "No Ant task exists for the packaging '" + project.getPackaging()
- + "'. " + "You could overrided the Ant package target in your build.xml." );
+ writer.addAttribute( "message",
+ "No Ant task exists for the packaging '" + project.getPackaging() + "'. "
+ + "You could overrided the Ant package target in your build.xml." );
writer.endElement(); // echo
}
}
@@ -1108,8 +1132,8 @@ public class AntBuildWriter
if ( synonym != null )
{
- XmlWriterUtil.writeCommentText( writer,
- "A dummy target for the package named after the type it creates", 1 );
+ XmlWriterUtil.writeCommentText( writer, "A dummy target for the package named after the type it creates",
+ 1 );
writer.startElement( "target" );
writer.addAttribute( "name", synonym );
writer.addAttribute( "depends", "package" );
@@ -1120,8 +1144,8 @@ public class AntBuildWriter
}
}
- private void writeCompileTasks( XMLWriter writer, String outputDirectory, List compileSourceRoots,
- List resources, String additionalClassesDirectory, boolean isTest )
+ private void writeCompileTasks( XMLWriter writer, String outputDirectory, List compileSourceRoots, List resources,
+ String additionalClassesDirectory, boolean isTest )
throws IOException
{
writer.startElement( "mkdir" );
@@ -1133,35 +1157,56 @@ public class AntBuildWriter
writer.startElement( "javac" );
writer.addAttribute( "destdir", outputDirectory );
Map[] includes = AntBuildWriterUtil.getMavenCompilerPluginOptions( project, "includes", null );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "includes", getCommaSeparatedList( includes,
- "include" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "includes",
+ getCommaSeparatedList( includes, "include" ), 3 );
Map[] excludes = AntBuildWriterUtil.getMavenCompilerPluginOptions( project, "excludes", null );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "excludes", getCommaSeparatedList( excludes,
- "exclude" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "encoding", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "encoding", null ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "nowarn", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "showWarnings", "false" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "debug", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "debug", "true" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "optimize", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "optimize", "false" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "deprecation", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "showDeprecation", "true" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "target", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "target", "1.1" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "verbose", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "verbose", "false" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "fork", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "fork", "false" ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "memoryMaximumSize", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "meminitial", null ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "memoryInitialSize", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "maxmem", null ), 3 );
- AntBuildWriterUtil.addWrapAttribute( writer, "javac", "source", AntBuildWriterUtil
- .getMavenCompilerPluginBasicOption( project, "source", "1.3" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "excludes",
+ getCommaSeparatedList( excludes, "exclude" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "encoding",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "encoding",
+ null ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "nowarn",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "showWarnings",
+ "false" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "debug",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project, "debug",
+ "true" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "optimize",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "optimize",
+ "false" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "deprecation",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "showDeprecation",
+ "true" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "target",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "target",
+ "1.1" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "verbose",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "verbose",
+ "false" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "fork",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project, "fork",
+ "false" ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "memoryMaximumSize",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "meminitial",
+ null ), 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "memoryInitialSize",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "maxmem", null ),
+ 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "javac", "source",
+ AntBuildWriterUtil.getMavenCompilerPluginBasicOption( project,
+ "source",
+ "1.3" ), 3 );
- String[] compileSourceRootsArray = (String[]) compileSourceRoots.toArray(new String[compileSourceRoots.size()]);
+ String[] compileSourceRootsArray =
+ (String[]) compileSourceRoots.toArray( new String[compileSourceRoots.size()] );
for ( int i = 0; i < compileSourceRootsArray.length; i++ )
{
writer.startElement( "src" );
@@ -1213,7 +1258,7 @@ public class AntBuildWriter
writer.endElement(); // javac
}
- Resource[] array = (Resource[]) resources.toArray(new Resource[resources.size()]);
+ Resource[] array = (Resource[]) resources.toArray( new Resource[resources.size()] );
for ( int i = 0; i < array.length; i++ )
{
Resource resource = array[i];
@@ -1284,7 +1329,8 @@ public class AntBuildWriter
writer.addAttribute( "name", "get-deps" );
AntBuildWriterUtil.addWrapAttribute( writer, "target", "depends", "test-offline", 2 );
AntBuildWriterUtil.addWrapAttribute( writer, "target", "description", "Download all dependencies", 2 );
- AntBuildWriterUtil.addWrapAttribute( writer, "target", "unless", "maven.mode.offline", 2 ); // TODO: check, and differs from m1
+ AntBuildWriterUtil.addWrapAttribute( writer, "target", "unless", "maven.mode.offline",
+ 2 ); // TODO: check, and differs from m1
writer.startElement( "mkdir" );
writer.addAttribute( "dir", "${maven.repo.local}" );
@@ -1293,45 +1339,55 @@ public class AntBuildWriter
String basedir = project.getBasedir().getAbsolutePath();
// TODO: proxy - probably better to use wagon!
- for (Object o : project.getTestArtifacts()) {
+ for ( Object o : project.getTestArtifacts() )
+ {
Artifact artifact = (Artifact) o;
- if (Artifact.SCOPE_SYSTEM.equals(artifact.getScope())) {
+ if ( Artifact.SCOPE_SYSTEM.equals( artifact.getScope() ) )
+ {
continue;
}
- String path = artifactResolverWrapper.getLocalArtifactPath(artifact);
+ String path = artifactResolverWrapper.getLocalArtifactPath( artifact );
- if (!new File(path).exists()) {
- File parentDirs = new File(path).getParentFile();
- if (parentDirs != null) {
- writer.startElement("mkdir");
+ if ( !new File( path ).exists() )
+ {
+ File parentDirs = new File( path ).getParentFile();
+ if ( parentDirs != null )
+ {
+ writer.startElement( "mkdir" );
// Replace \ with / in the parent dir path
- writer.addAttribute("dir", "${maven.repo.local}/" + parentDirs.getPath().replace('\\', '/'));
+ writer.addAttribute( "dir", "${maven.repo.local}/" + parentDirs.getPath().replace( '\\', '/' ) );
writer.endElement(); // mkdir
}
- for (Object o1 : project.getRepositories()) {
+ for ( Object o1 : project.getRepositories() )
+ {
Repository repository = (Repository) o1;
String url = repository.getUrl();
- String localDir = getProjectRepoDirectory(url, basedir);
- if (localDir != null) {
- if (localDir.length() > 0 && !localDir.endsWith("/")) {
+ String localDir = getProjectRepoDirectory( url, basedir );
+ if ( localDir != null )
+ {
+ if ( localDir.length() > 0 && !localDir.endsWith( "/" ) )
+ {
localDir += '/';
}
- writer.startElement("copy");
- writer.addAttribute("file", localDir + path);
- AntBuildWriterUtil.addWrapAttribute(writer, "copy", "tofile", "${maven.repo.local}/" + path, 3);
- AntBuildWriterUtil.addWrapAttribute(writer, "copy", "failonerror", "false", 3);
+ writer.startElement( "copy" );
+ writer.addAttribute( "file", localDir + path );
+ AntBuildWriterUtil.addWrapAttribute( writer, "copy", "tofile", "${maven.repo.local}/" + path,
+ 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "copy", "failonerror", "false", 3 );
writer.endElement(); // copy
- } else {
- writer.startElement("get");
- writer.addAttribute("src", url + '/' + path);
- AntBuildWriterUtil.addWrapAttribute(writer, "get", "dest", "${maven.repo.local}/" + path, 3);
- AntBuildWriterUtil.addWrapAttribute(writer, "get", "usetimestamp", "false", 3);
- AntBuildWriterUtil.addWrapAttribute(writer, "get", "ignoreerrors", "true", 3);
+ }
+ else
+ {
+ writer.startElement( "get" );
+ writer.addAttribute( "src", url + '/' + path );
+ AntBuildWriterUtil.addWrapAttribute( writer, "get", "dest", "${maven.repo.local}/" + path, 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "get", "usetimestamp", "false", 3 );
+ AntBuildWriterUtil.addWrapAttribute( writer, "get", "ignoreerrors", "true", 3 );
writer.endElement(); // get
}
}
@@ -1347,8 +1403,8 @@ public class AntBuildWriter
* Gets the relative path to a repository that is rooted in the project. The returned path (if any) will always use
* the forward slash ('/') as the directory separator. For example, the path "target/it-repo" will be returned for a
* repository constructed from the URL "file://${basedir}/target/it-repo".
- *
- * @param repoUrl The URL to the repository, must not be <code>null</code>.
+ *
+ * @param repoUrl The URL to the repository, must not be <code>null</code>.
* @param projectDir The absolute path to the base directory of the project, must not be <code>null</code>
* @return The path to the repository (relative to the project base directory) or <code>null</code> if the
* repository is not rooted in the project.
@@ -1402,7 +1458,7 @@ public class AntBuildWriter
*
* @param properties not null
* @param name
- * @param value not null
+ * @param value not null
*/
private static void addProperty( Properties properties, String name, String value )
{
@@ -1411,7 +1467,7 @@ public class AntBuildWriter
/**
* @param includes an array of includes or exludes map
- * @param key a key wanted in the map, like <code>include</code> or <code>exclude</code>
+ * @param key a key wanted in the map, like <code>include</code> or <code>exclude</code>
* @return a String with comma-separated value of a key in each map
*/
private static String getCommaSeparatedList( Map[] includes, String key )
@@ -1448,13 +1504,13 @@ public class AntBuildWriter
/**
* Flattens the specified file selector options into a simple string list. For instance, the input
- *
+ * <p/>
* <pre>
* [ {include="*Test.java"}, {include="*TestCase.java"} ]
* </pre>
- *
+ * <p/>
* is converted to
- *
+ * <p/>
* <pre>
* [ "*Test.java", "*TestCase.java" ]
* </pre>
@@ -1467,8 +1523,9 @@ public class AntBuildWriter
List list = new ArrayList();
if ( options != null && options.length > 0 )
{
- for (Map option : options) {
- list.addAll(option.values());
+ for ( Map option : options )
+ {
+ list.addAll( option.values() );
}
}
return list;