You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2016/04/12 14:03:13 UTC
[7/7] ant git commit: Merge branch '1.9.x'
Merge branch '1.9.x'
Conflicts:
WHATSNEW
build.xml
manual/cover.html
manual/credits.html
release/ivy.xml
src/etc/poms/ant-antlr/pom.xml
src/etc/poms/ant-apache-bcel/pom.xml
src/etc/poms/ant-apache-bsf/pom.xml
src/etc/poms/ant-apache-log4j/pom.xml
src/etc/poms/ant-apache-oro/pom.xml
src/etc/poms/ant-apache-regexp/pom.xml
src/etc/poms/ant-apache-resolver/pom.xml
src/etc/poms/ant-apache-xalan2/pom.xml
src/etc/poms/ant-commons-logging/pom.xml
src/etc/poms/ant-commons-net/pom.xml
src/etc/poms/ant-jai/pom.xml
src/etc/poms/ant-javamail/pom.xml
src/etc/poms/ant-jdepend/pom.xml
src/etc/poms/ant-jmf/pom.xml
src/etc/poms/ant-jsch/pom.xml
src/etc/poms/ant-junit/pom.xml
src/etc/poms/ant-junit4/pom.xml
src/etc/poms/ant-launcher/pom.xml
src/etc/poms/ant-netrexx/pom.xml
src/etc/poms/ant-swing/pom.xml
src/etc/poms/ant-testutil/pom.xml
src/etc/poms/ant/pom.xml
src/etc/poms/pom.xml
src/etc/testcases/taskdefs/conditions/antversion.xml
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/cf2e984d
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/cf2e984d
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/cf2e984d
Branch: refs/heads/master
Commit: cf2e984d5649e2ade67668bf3f5093a1c8f878aa
Parents: 062ccd0 8e8f4de
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Apr 12 14:02:35 2016 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Apr 12 14:02:35 2016 +0200
----------------------------------------------------------------------
ReleaseInstructions | 246 +++++++++++++------
build.xml | 10 -
.../taskdefs/conditions/antversion.xml | 9 +-
3 files changed, 172 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/cf2e984d/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/cf2e984d/src/etc/testcases/taskdefs/conditions/antversion.xml
----------------------------------------------------------------------
diff --cc src/etc/testcases/taskdefs/conditions/antversion.xml
index 217f164,33918e4..5dd97c7
--- a/src/etc/testcases/taskdefs/conditions/antversion.xml
+++ b/src/etc/testcases/taskdefs/conditions/antversion.xml
@@@ -32,11 -32,11 +32,10 @@@
<fail>
<condition>
<not>
- <antversion exactly="1.9.8" />
+ <antversion exactly="1.10.0" />
</not>
</condition>
- Should be exactly 1.9.8
-
+ Should be exactly 1.10.0
-
</fail>
</target>