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/9a0fa3f5
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9a0fa3f5
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9a0fa3f5

Branch: refs/heads/master
Commit: 9a0fa3f5d46b32385209a2bafb5fefeff234e977
Parents: d37df73 a3897d4
Author: Stefan Bodewig <bode...@apache.org>
Authored: Wed Sep 21 19:15:37 2016 +0200
Committer: Stefan Bodewig <bode...@apache.org>
Committed: Wed Sep 21 19:15:37 2016 +0200

----------------------------------------------------------------------
 WHATSNEW                |  7 +++++++
 manual/Tasks/style.html | 16 ++++++++++++++++
 2 files changed, 23 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/9a0fa3f5/WHATSNEW
----------------------------------------------------------------------
diff --cc WHATSNEW
index a0acec8,215f8cb..0b232c3
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -109,9 -92,12 +109,16 @@@ Other changes
   * it is now possible to use references to Ant types and classloaders
     built around Ant <path>s as values for TraX factory attributes.
  
 + * AntClassLoader and its subclasses register themselves as parallel
 +   capable.
 +
+  * <junitreport> now enables the feature
+    http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions
+    when run on Java 9 so the redirect extension function can be used
+    if when a SecurityManager is active.
+    Bugzilla Report 60060
++>>>>>>> 1.9.x
+ 
  Changes from Ant 1.9.6 TO Ant 1.9.7
  ===================================
  

Reply via email to