Return-Path: <notifications-return-26628-archive-asf-public=cust-asf.ponee.io@ant.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id BEF24200B4E
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sun, 24 Jul 2016 13:11:09 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id BDB21160A69; Sun, 24 Jul 2016 11:11:09 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id EC8C3160A95
	for <archive-asf-public@cust-asf.ponee.io>; Sun, 24 Jul 2016 13:11:08 +0200 (CEST)
Received: (qmail 84802 invoked by uid 500); 24 Jul 2016 11:11:08 -0000
Mailing-List: contact notifications-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:notifications-help@ant.apache.org>
List-Unsubscribe: <mailto:notifications-unsubscribe@ant.apache.org>
List-Post: <mailto:notifications@ant.apache.org>
List-Id: <notifications.ant.apache.org>
Reply-To: dev@ant.apache.org
Delivered-To: mailing list notifications@ant.apache.org
Received: (qmail 84571 invoked by uid 99); 24 Jul 2016 11:11:08 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jul 2016 11:11:08 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id A93D7E35E8; Sun, 24 Jul 2016 11:11:07 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bodewig@apache.org
To: notifications@ant.apache.org
Date: Sun, 24 Jul 2016 11:11:12 -0000
Message-Id: <d0aaee4064624cc2b24e3a26e122be87@git.apache.org>
In-Reply-To: <060f41e3a8c5412ba41289d955f25dd3@git.apache.org>
References: <060f41e3a8c5412ba41289d955f25dd3@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [6/8] ant git commit: Merge branch '1.9.x'
archived-at: Sun, 24 Jul 2016 11:11:09 -0000

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

Branch: refs/heads/master
Commit: 26fd1bfee7afef9b6b0435d2d8c130d3f7091b1e
Parents: cec9978 4ef2554
Author: Stefan Bodewig <bodewig@apache.org>
Authored: Sun Jul 24 12:53:06 2016 +0200
Committer: Stefan Bodewig <bodewig@apache.org>
Committed: Sun Jul 24 12:53:06 2016 +0200

----------------------------------------------------------------------
 WHATSNEW                                        |   5 +
 manual/Tasks/native2ascii.html                  |  13 ++-
 .../native2ascii/BuiltinNative2Ascii.java       | 104 +++++++++++++++++++
 .../Native2AsciiAdapterFactory.java             |  29 ++++--
 .../tools/ant/util/Native2AsciiUtils.java       |  89 ++++++++++++++++
 .../taskdefs/optional/native2ascii-test.xml     |  67 ++++++++++++
 .../tools/ant/util/Native2AsciiUtilsTest.java   |  76 ++++++++++++++
 7 files changed, 372 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/26fd1bfe/WHATSNEW
----------------------------------------------------------------------
diff --cc WHATSNEW
index ab25572,0253e7e..3400159
--- a/WHATSNEW
+++ b/WHATSNEW
@@@ -50,9 -39,11 +50,14 @@@ Other changes
   * <scp> now supports compression via the optional compressed attribute.
     Bugzilla Report 47552
  
 + * <junit> now supports JDK9 modules
 +   Github Pull Request #18
 +
+  * a new implementation "builtin" has been added to <native2ascii> and
+    is the default when running on JDK9+ since the tool itself has been
+    removed from the JDK.
+    Bugzilla Report 59855
+ 
  Changes from Ant 1.9.6 TO Ant 1.9.7
  ===================================