This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release112
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit fc82d6fe44bb3557f757bc520b7bc95fade01ebd
Merge: 4512841 645202b
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Tue Sep 24 11:40:09 2019 +0100
Merge pull request #1523 from apache/master
Sync master to release112 for beta 1
.gitignore | 2 +
.../J2SEPlatformDefaultJavadocImpl.java | 2 +-
nbbuild/antsrc/org/netbeans/nbbuild/HgExec.java | 74 --------
.../org/netbeans/nbbuild/ParseGitBranch.java | 80 --------
.../netbeans/nbbuild/ReleaseJsonProperties.java | 38 ++--
.../netbeans/nbbuild/ValidateHgConfiguration.java | 99 ----------
.../org/netbeans/nbbuild/extlibs/ignored-overlaps | 3 +
nbbuild/build.xml | 105 ++++++-----
nbbuild/external/binaries-list | 1 +
nbbuild/external/json-simple-1.1.1-license.txt | 208 +++++++++++++++++++++
nbbuild/rat-exclusions.txt | 3 +
nbbuild/templates/common.xml | 6 +-
.../src/org/openide/filesystems/FileUtil.java | 4 +-
13 files changed, 302 insertions(+), 323 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
