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 d60b28422c35fc6f2fa0952dc214c3bf010c33d3 Merge: 86e1b2e f5184a5 Author: Neil C Smith <neilcsm...@apache.org> AuthorDate: Tue Oct 15 11:22:05 2019 +0100 Merge pull request #1549 from apache/master Sync master to release112 branch for beta3 .travis.yml | 6 +- README.md | 6 +- .../maven/apisupport/MavenNbModuleImpl.java | 2 +- .../maven/apisupport/NbmWizardIterator.java | 4 +- .../libs.javafx.linux}/licenseinfo.xml | 7 +- .../libs.javafx.macosx}/licenseinfo.xml | 7 +- .../libs.javafx.win}/licenseinfo.xml | 7 +- .../modules/ext/nb-javac-13-api.jar.external | 4 - .../modules/ext/nb-javac-13-impl.jar.external | 4 - .../resources/src_main_webapp_pages_index.html.fmk | 59 ++++++++--- ide/db/build.xml | 4 +- ide/xml.tax/build.xml | 2 +- .../java/editor/imports/ClipboardHandlerTest.java | 26 ++++- .../netbeans/api/java/source/ElementHandle.java | 17 +++- .../api/java/source/GeneratorUtilities.java | 2 +- .../api/java/source/ElementHandleTest.java | 55 +++++++++++ .../api/java/source/GeneratorUtilitiesTest.java | 35 ++++++- .../modules/java/source/BootClassPathUtil.java | 11 ++- java/libs.javacapi/external/binaries-list | 2 +- java/libs.javacimpl/external/binaries-list | 2 +- nb/updatecenters/build.xml | 21 +++- nb/updatecenters/extras/.gitignore | 1 + .../nbjavac => nb/updatecenters/extras}/build.xml | 6 +- .../updatecenters/extras}/nbjavac.api/build.xml | 2 +- .../updatecenters/extras}/nbjavac.api/manifest.mf | 0 .../extras/nbjavac.api/nbproject/build-impl.xml | 50 ++++++++++ .../nbjavac.api/nbproject/genfiles.properties | 9 +- .../nbjavac.api}/nbproject/project.properties | 0 .../extras}/nbjavac.api/nbproject/project.xml | 1 + .../extras/nbjavac.api/nbproject/suite.properties | 2 +- .../modules/ext/nb-javac-13-api.jar.external | 4 + .../netbeans/modules/nbjavac/api/Bundle.properties | 0 .../updatecenters/extras}/nbjavac.impl/build.xml | 2 +- .../updatecenters/extras}/nbjavac.impl/manifest.mf | 0 .../extras/nbjavac.impl/nbproject/build-impl.xml | 50 ++++++++++ .../nbjavac.impl/nbproject/genfiles.properties | 9 +- .../nbjavac.impl}/nbproject/project.properties | 0 .../extras}/nbjavac.impl/nbproject/project.xml | 1 + .../extras/nbjavac.impl/nbproject/suite.properties | 2 +- .../modules/ext/nb-javac-13-impl.jar.external | 4 + .../modules/nbjavac/impl/Bundle.properties | 0 .../updatecenters/extras}/nbjavac/build.xml | 2 +- .../updatecenters/extras}/nbjavac/manifest.mf | 0 .../extras/nbjavac/nbproject/build-impl.xml | 50 ++++++++++ .../extras/nbjavac/nbproject/genfiles.properties | 9 +- .../extras}/nbjavac/nbproject/project.properties | 0 .../extras}/nbjavac/nbproject/project.xml | 1 + .../extras/nbjavac/nbproject/suite.properties | 2 +- .../org/netbeans/modules/nbjavac/Bundle.properties | 0 nb/updatecenters/extras/nbproject/build-impl.xml | 70 +++++++++++++ .../extras/nbproject/genfiles.properties | 15 ++- .../extras/nbproject/platform.properties | 22 ++++- nb/updatecenters/extras/nbproject/platform.xml | 54 ++++++++++ .../extras/nbproject/project.properties | 5 +- .../updatecenters/extras/nbproject/project.xml | 10 +- nb/updatecenters/licenseinfo.xml | 6 ++ .../antsrc/org/netbeans/nbbuild/GitBranchHash.java | 109 +++++++++++++++++++++ nbbuild/build.xml | 15 ++- nbbuild/rat-exclusions.txt | 1 - .../modules/options/export/OptionsExportModel.java | 3 +- 60 files changed, 706 insertions(+), 94 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