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/07/04 15:50:24 UTC
[12/12] ant git commit: Merge branch '1.9.x'
Merge branch '1.9.x'
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e2c9cdd6
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e2c9cdd6
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e2c9cdd6
Branch: refs/heads/master
Commit: e2c9cdd636bdbb2216ebc0ab46e87887a55a64e9
Parents: c05c56d 7df9120
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Wed Jul 4 17:49:53 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Wed Jul 4 17:49:53 2018 +0200
----------------------------------------------------------------------
src/etc/ant-update.xsl | 2 +-
src/etc/jdepend.xsl | 2 +-
src/etc/junit-frames-xalan1.xsl | 22 ++++++------
src/etc/junit-noframes.xsl | 4 +--
src/etc/testcases/filters/build.xml | 4 +--
src/etc/testcases/filters/tokenfilter.xml | 4 +--
src/etc/testcases/taskdefs/delete.xml | 21 +++++------
src/etc/testcases/taskdefs/jar.xml | 38 ++++++++------------
src/etc/testcases/taskdefs/loadfile.xml | 2 +-
.../testcases/taskdefs/optional/javah/build.xml | 16 ++++-----
src/etc/testcases/taskdefs/optional/pvcs.xml | 13 ++++---
.../taskdefs/optional/xalan-redirect-in.xsl | 10 +++---
.../optional/xml/endpiece-ns-no-location.xml | 2 +-
.../taskdefs/optional/xml/endpiece.xml | 2 +-
src/etc/testcases/taskdefs/typedef.xml | 6 ++--
src/tests/antunit/core/extension/module1.xml | 8 ++---
src/tests/antunit/taskdefs/concat-test.xml | 10 +++---
src/tests/antunit/taskdefs/copy-test.xml | 6 ++--
src/tests/antunit/taskdefs/get-test.xml | 4 +--
.../antunit/taskdefs/optional/javah-test.xml | 4 +--
20 files changed, 85 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/e2c9cdd6/src/etc/testcases/filters/build.xml
----------------------------------------------------------------------
diff --cc src/etc/testcases/filters/build.xml
index eb4dcdb,c03443a..39d1bcf
--- a/src/etc/testcases/filters/build.xml
+++ b/src/etc/testcases/filters/build.xml
@@@ -91,12 -90,12 +91,12 @@@
</target>
<target name="testReplaceTokensPropertyFile" depends="setUp">
- <copy tofile="${output}/replacetokensPropertyFile.test">
+ <copy tofile="${output}/replaceTokensPropertyFile.test">
<fileset dir="input" includes="replacetokens.test"/>
<filterchain>
- <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
+ <filterreader classname="org.apache.tools.ant.filters.ReplaceTokens">
<param type="propertiesfile" value="${basedir}/input/sample.properties"/>
- </filterreader>
- </filterreader>
++ </filterreader>
</filterchain>
</copy>
</target>
http://git-wip-us.apache.org/repos/asf/ant/blob/e2c9cdd6/src/tests/antunit/taskdefs/copy-test.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/e2c9cdd6/src/tests/antunit/taskdefs/get-test.xml
----------------------------------------------------------------------
diff --cc src/tests/antunit/taskdefs/get-test.xml
index ced1dbd,d8ea4fc..2e041e4
--- a/src/tests/antunit/taskdefs/get-test.xml
+++ b/src/tests/antunit/taskdefs/get-test.xml
@@@ -95,14 -97,14 +95,14 @@@
<target name="testInfiniteRedirect" unless="jenkins">
-- <au:expectfailure expectedmessage="More than 25 times redirected, giving up">
++ <au:expectfailure expectedmessage="More than 25 times redirected, giving up">
<get src="${location}/infinite.txt" dest="${output}/infinite.tmp"/>
</au:expectfailure>
</target>
<target name="testNestedResources">
-- <get dest="${output}/downloads">
++ <get dest="${output}/downloads">
<url url="http://ant.apache.org/index.html"/>
<url url="http://ant.apache.org/faq.html"/>
</get>