Merge branch 'jigsaw/java'
Conflicts:
src/main/org/apache/tools/ant/taskdefs/Java.java
src/main/org/apache/tools/ant/types/CommandlineJava.java
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/038e1948
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/038e1948
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/038e1948
Branch: refs/heads/master
Commit: 038e1948edba0a3bda64ccad0f3ae59ec730c63a
Parents: 8bb69bf 1e501f2
Author: Stefan Bodewig <[email protected]>
Authored: Sat Mar 12 18:58:11 2016 +0100
Committer: Stefan Bodewig <[email protected]>
Committed: Sat Mar 12 18:58:11 2016 +0100
----------------------------------------------------------------------
manual/Tasks/java.html | 62 +++++++++++++++++++-
.../org/apache/tools/ant/taskdefs/Java.java | 10 ++++
2 files changed, 69 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
