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:45 UTC
[netbeans] branch release112 updated (fc82d6f -> 86e1b2e)
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a change to branch release112
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from fc82d6f Merge pull request #1523 from apache/master
add b9a74ba Make newer snapcraft happy adding parse-info tag.
add d289969 Merge pull request #1531 from lkishalmi/Snapcraft_update
add 4f05b9a [NETBEANS-2914]: Elements.getPackageElement works better/safer when a ModuleSymbol is given.
add 779a798 Merge pull request #1529 from jlahoda/NETBEANS-2914
add 192d969 [NETBEANS-3106] Add javahome property to groovyc task
add 6e4d083 Merge pull request #1513 from graben/NETBEANS-3106
add 76bf6c3 fix build order for git properties + json correction
add 6c3e8d1 Merge pull request #1533 from ebarboni/buildimprovement
add ec05931 [NETBEANS-3175] Removed JavaFX Maven application, replace with Gluon
add 205f94a Merge pull request #1535 from apache/geertjanw-patch-5
add 6e34996 Pack200 is deprecated for removal, disabling it by default when creating an NBM.
add 217ae66 Merge pull request #1537 from jlahoda/disable.pack200
add 4b93558 [NETBEANS-3040] Diff to feature does not work for Remote files in C/C++
add eb073e1 Merge pull request #1536 from SiddheshRane/diff-for-remote-files
add 5a51d83 [NETBEANS-2888] - Project Context Path problem for Java Maven Web Application (#1526)
add 124aea5 Set buildnumber to "${metabuild.RawVersion}-${metabuild.hash}" if both values have been computed.
add 3243f30 Merge pull request #1540 from neilcsmith-net/git-buildnum
add 101c870 Putting nb-javac NBM directly into the NetBeans distribution. (#1538)
new 86e1b2e Merge pull request #1539 from apache/master
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
create mode 100644 enterprise/glassfish.eecommon/licenseinfo.xml
create mode 100644 enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/ddtemplates/javaee/glassfish-web.xml
create mode 100644 extra/nbjavac.api/build.xml
create mode 100644 extra/nbjavac.api/manifest.mf
create mode 100644 extra/nbjavac.api/nbproject/project.properties
create mode 100644 extra/nbjavac.api/nbproject/project.xml
create mode 100644 extra/nbjavac.api/release/modules/ext/nb-javac-13-api.jar.external
create mode 100644 extra/nbjavac.api/src/org/netbeans/modules/nbjavac/api/Bundle.properties
create mode 100644 extra/nbjavac.impl/build.xml
create mode 100644 extra/nbjavac.impl/manifest.mf
create mode 100644 extra/nbjavac.impl/nbproject/project.properties
create mode 100644 extra/nbjavac.impl/nbproject/project.xml
create mode 100644 extra/nbjavac.impl/release/modules/ext/nb-javac-13-impl.jar.external
create mode 100644 extra/nbjavac.impl/src/org/netbeans/modules/nbjavac/impl/Bundle.properties
create mode 100644 extra/nbjavac/build.xml
create mode 100644 extra/nbjavac/manifest.mf
create mode 100644 extra/nbjavac/nbproject/project.properties
create mode 100644 extra/nbjavac/nbproject/project.xml
create mode 100644 extra/nbjavac/src/org/netbeans/modules/nbjavac/Bundle.properties
---------------------------------------------------------------------
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
[netbeans] 01/01: Merge pull request #1539 from apache/master
Posted by ne...@apache.org.
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