You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/11/11 22:11:29 UTC
ant git commit: Complete antrun plugin update fix unit task
dependencies
Repository: ant
Updated Branches:
refs/heads/master f871e80a6 -> 103fc3dd5
Complete antrun plugin update fix unit task dependencies
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/103fc3dd
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/103fc3dd
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/103fc3dd
Branch: refs/heads/master
Commit: 103fc3dd5ab6d2b0b4561271757081ea4b837d6b
Parents: f871e80
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sun Nov 11 23:11:11 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sun Nov 11 23:11:11 2018 +0100
----------------------------------------------------------------------
src/etc/poms/ant-junit/pom.xml | 10 ++++++++--
src/etc/poms/ant-netrexx/pom.xml | 5 ++---
src/etc/poms/ant/pom.xml | 19 ++++++++++---------
3 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/103fc3dd/src/etc/poms/ant-junit/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-junit/pom.xml b/src/etc/poms/ant-junit/pom.xml
index bb50976..873339e 100644
--- a/src/etc/poms/ant-junit/pom.xml
+++ b/src/etc/poms/ant-junit/pom.xml
@@ -54,6 +54,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<version>2.12.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ <version>2.7.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -67,7 +73,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<copy todir="${project.build.outputDirectory}/org/apache/tools/ant/taskdefs/optional/junit/xsl">
<fileset dir="${project.build.scriptSourceDirectory}">
<include name="junit-frames.xsl"/>
@@ -76,7 +82,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<include name="junit-noframes-saxon.xsl"/>
</fileset>
</copy>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/ant/blob/103fc3dd/src/etc/poms/ant-netrexx/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant-netrexx/pom.xml b/src/etc/poms/ant-netrexx/pom.xml
index ac66a5a..a00f8ee 100644
--- a/src/etc/poms/ant-netrexx/pom.xml
+++ b/src/etc/poms/ant-netrexx/pom.xml
@@ -85,16 +85,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/ma
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<phase>validate</phase>
<configuration>
- <tasks>
+ <target>
<ant dir="${basedir}/../../../.." antfile="fetch.xml" target="netrexx">
<property name="dest" value="optional"/>
</ant>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
http://git-wip-us.apache.org/repos/asf/ant/blob/103fc3dd/src/etc/poms/ant/pom.xml
----------------------------------------------------------------------
diff --git a/src/etc/poms/ant/pom.xml b/src/etc/poms/ant/pom.xml
index e95255d..99c65f9 100644
--- a/src/etc/poms/ant/pom.xml
+++ b/src/etc/poms/ant/pom.xml
@@ -92,13 +92,13 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<tstamp/>
<mkdir dir="${project.build.directory}"/>
<touch file="${project.build.directory}/.build.timestamp.properties"/>
<echo file="${project.build.directory}/.build.timestamp.properties" append="false"
message="TODAY=${TODAY}"/>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
@@ -108,14 +108,14 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<get src="http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-1.10.5-bin.zip"
dest="${project.build.directory}/ant.zip"/>
- <delete dir="${project.build.directory}/ant.zip"/>
+ <delete dir="${project.build.directory}/ant-home"/>
<unzip src="${project.build.directory}/ant.zip" dest="${project.build.directory}/ant-home">
<cutdirsmapper dirs="1"/>
</unzip>
- </tasks>
+ </target>
</configuration>
</execution>
<execution>
@@ -125,7 +125,7 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<jar jarfile="${project.build.testOutputDirectory}/org/apache/tools/ant/taskdefs/test2-antlib.jar">
<manifest>
<attribute name="Extension-name"
@@ -147,7 +147,8 @@
<include name="taskdefs/test2.antlib.xml"/>
</zipfileset>
</jar>
- </tasks>
+ <echoproperties prefix="maven."/>
+ </target>
</configuration>
</execution>
<execution>
@@ -157,9 +158,9 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
+ <target>
<delete file="${project.build.directory}/.build.timestamp.properties"/>
- </tasks>
+ </target>
</configuration>
</execution>
</executions>