You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ne...@apache.org on 2019/10/02 12:59:46 UTC
[netbeans] 01/01: Merge pull request #1539 from apache/master
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 86e1b2eb194e8e9628a66e6ee1a128134c70671a
Merge: fc82d6f 101c870
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Wed Oct 2 13:59:38 2019 +0100
Merge pull request #1539 from apache/master
Sync master to release112 branch for beta2
enterprise/glassfish.eecommon/licenseinfo.xml | 30 ++++
.../modules/glassfish/eecommon/api/Utils.java | 4 +-
.../api/config/GlassfishConfiguration.java | 20 ++-
.../eecommon/api/config/J2eeModuleHelper.java | 8 +-
.../eecommon/api/config/ServletVersion.java | 9 +
.../api/ddtemplates/javaee/glassfish-web.xml | 25 +++
.../netbeans/modules/glassfish/eecommon/layer.xml | 20 +--
.../modules/j2ee/sun/dd/api/ASDDVersion.java | 53 ++++++
.../modules/j2ee/sun/dd/impl/DTDRegistry.java | 47 +++--
extra/nbjavac.api/build.xml | 25 +++
extra/nbjavac.api/manifest.mf | 7 +
extra/nbjavac.api/nbproject/project.properties | 21 +++
extra/nbjavac.api/nbproject/project.xml | 35 ++++
.../modules/ext/nb-javac-13-api.jar.external | 4 +
.../netbeans/modules/nbjavac/api/Bundle.properties | 18 ++
extra/nbjavac.impl/build.xml | 25 +++
extra/nbjavac.impl/manifest.mf | 8 +
extra/nbjavac.impl/nbproject/project.properties | 21 +++
extra/nbjavac.impl/nbproject/project.xml | 42 +++++
.../modules/ext/nb-javac-13-impl.jar.external | 4 +
.../modules/nbjavac/impl/Bundle.properties | 18 ++
extra/nbjavac/build.xml | 25 +++
extra/nbjavac/manifest.mf | 6 +
extra/nbjavac/nbproject/project.properties | 20 +++
extra/nbjavac/nbproject/project.xml | 76 ++++++++
.../org/netbeans/modules/nbjavac/Bundle.properties | 19 ++
.../antproject/resources/groovy-build-ejb.xsl | 1 +
.../antproject/resources/groovy-build-j2se.xsl | 1 +
.../antproject/resources/groovy-build-web.xsl | 1 +
.../src/org/netbeans/modules/diff/DiffAction.java | 6 +-
.../modules/diff/EditorBufferSelectorPanel.java | 31 +++-
.../java/editor/imports/ComputeImports.java | 5 +-
.../java/editor/imports/ComputeImportsTest.java | 197 +++++++++++++++++----
.../maven/newproject/MavenWizardIterator.java | 14 +-
nb/updatecenters/build.xml | 5 +-
.../netbeans/nbbuild/ReleaseJsonProperties.java | 10 +-
nbbuild/build.xml | 11 +-
nbbuild/default.xml | 9 +-
.../packaging/netbeans_snap/snap/snapcraft.yaml | 1 +
nbbuild/templates/common.xml | 2 +-
40 files changed, 778 insertions(+), 106 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists