Merge branch '1.9.x' branch into master
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/995b518a Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/995b518a Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/995b518a Branch: refs/heads/master Commit: 995b518abf60dd8cd52f9e94c4186bbf78513b96 Parents: 84fe46d 9b1b8db Author: Jaikiran Pai <[email protected]> Authored: Sat Jul 7 17:39:35 2018 +0530 Committer: Jaikiran Pai <[email protected]> Committed: Sat Jul 7 17:39:35 2018 +0530 ---------------------------------------------------------------------- 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/poms/ant-javamail/pom.xml | 2 +- src/etc/testcases/filters/build.xml | 14 ++++++------- src/etc/testcases/filters/head-tail.xml | 6 +++--- src/etc/testcases/filters/tokenfilter.xml | 4 ++-- src/etc/testcases/taskdefs/delete.xml | 4 +++- src/etc/testcases/taskdefs/jar.xml | 21 ++++++++++++------- src/etc/testcases/taskdefs/loadfile.xml | 6 +++--- .../testcases/taskdefs/optional/javah/build.xml | 16 +++++++------- src/etc/testcases/taskdefs/optional/pvcs.xml | 9 +++----- src/etc/testcases/taskdefs/optional/script.xml | 4 ++-- .../taskdefs/optional/xalan-redirect-in.xsl | 10 ++++----- src/etc/testcases/taskdefs/typedef.xml | 4 ++-- src/tests/antunit/core/extension/module1.xml | 8 +++---- src/tests/antunit/taskdefs/concat-test.xml | 10 ++++----- src/tests/antunit/taskdefs/get-test.xml | 2 +- .../antunit/taskdefs/optional/javah-test.xml | 4 ++-- src/tests/antunit/taskdefs/rmic-test.xml | 2 +- 21 files changed, 81 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/poms/ant-javamail/pom.xml ---------------------------------------------------------------------- diff --cc src/etc/poms/ant-javamail/pom.xml index f35c8e8,328168b..c34fd5b --- a/src/etc/poms/ant-javamail/pom.xml +++ b/src/etc/poms/ant-javamail/pom.xml @@@ -47,10 -47,16 +47,10 @@@ xsi:schemaLocation="http://maven.apache <dependency> <groupId>javax.mail</groupId> <artifactId>javax.mail-api</artifactId> - <version>1.5.6</version> + <version>1.6.1</version> <scope>compile</scope> </dependency> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> -- </dependencies> ++ </dependencies> <build> <plugins> <plugin> http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/filters/build.xml ---------------------------------------------------------------------- diff --cc src/etc/testcases/filters/build.xml index 39d1bcf,b70b778..f908bb8 --- a/src/etc/testcases/filters/build.xml +++ b/src/etc/testcases/filters/build.xml @@@ -16,13 -16,12 +16,13 @@@ limitations under the License. --> <project default="tearDown" basedir="."> + <import file="../buildfiletest-base.xml"/> + <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> - <target name="testLineContains" depends="setUp"> <copy todir="${output}"> <fileset dir="input"> @@@ -91,12 -90,12 +91,12 @@@ </target> <target name="testReplaceTokensPropertyFile" depends="setUp"> - <copy tofile="${output}/replacetokensPropertyFile.test"> - <fileset dir="input" includes="replacetokens.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> </filterchain> </copy> </target> http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/filters/head-tail.xml ---------------------------------------------------------------------- diff --cc src/etc/testcases/filters/head-tail.xml index 3a8bc91,e0ffed7..3775a1a --- a/src/etc/testcases/filters/head-tail.xml +++ b/src/etc/testcases/filters/head-tail.xml @@@ -20,9 -20,10 +20,9 @@@ <import file="../buildfiletest-base.xml"/> <target name="setUp"> - <mkdir dir="${output}"/> + <mkdir dir="${output}" /> </target> - <!-- Testcases for HeadFilter --> <target name="testHead" depends="setUp"> http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/taskdefs/delete.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/taskdefs/optional/pvcs.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/etc/testcases/taskdefs/optional/script.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/995b518a/src/tests/antunit/taskdefs/get-test.xml ---------------------------------------------------------------------- diff --cc src/tests/antunit/taskdefs/get-test.xml index e7289e3,44d5af9..2f0245c --- a/src/tests/antunit/taskdefs/get-test.xml +++ b/src/tests/antunit/taskdefs/get-test.xml @@@ -20,8 -20,12 +20,8 @@@ <import file="../antunit-base.xml" /> <property name="location" value="http://ant.apache.org/webtest/gettest"; /> - - <condition property="java.atleast.1_8"> - <javaversion atleast="1.8"/> - </condition> + - - <target name="setUp"> + <target name="setUp"> <mkdir dir="${output}" /> </target>
