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/15 10:22:19 UTC
[netbeans] branch release112 updated (86e1b2e -> d60b284)
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 86e1b2e Merge pull request #1539 from apache/master
add 1d8420d Fork HgId Ant task to try and parse git branch and hash from .git folder if not otherwise available.
add 2f3fd90 Merge pull request #1541 from neilcsmith-net/git-parse-branch-hash
add 10657f0 [NETBEANS-3209] Add JAVA_HOME and ANT_HOME note
add 177e6c0 Merge pull request #1554 from jgneff/homenote
add 2d00244 [NETBEANS-3019] Using an actual/existing entered CompilationUnit to check accessibility, instead of possibly a scratch one, which may not have an owning module filled.
add 6842115 Merge branch 'master' into NETBEANS-3019
add cbc3251 Attempting to avoid issues during build, where the fake FileSystem was probably GCed while the test was running.
add 6997958 Merge pull request #1462 from jlahoda/NETBEANS-3019
add aa44bca [NETBEANS-3191] ensuring ElementHandle works even for CompilationInfos that are based on classfiles (and hence don't have a CompilationUnitTree).
add 27a09aa Merge pull request #1542 from jlahoda/NETBEANS-3191
add a3575da Retry mysql tests in Travis config
add 8757ee0 Merge pull request #1550 from blackleg/fix_mysql_tests
add 8ceae91 NETBEANS-3185 use last maven-nbm-plugin
add 6cea228 Merge pull request #1555 from apache/ebarboni-nbm-patch-1
add 1ae47c8 Remove rat-exclusion for *.jar.external and use licenseinfo.xml
add 7a6f223 Merge pull request #1558 from matthiasblaesing/fx-licenseinfo
add 1b56603 Use Materialize CSS to make the example look nicer (#1552)
add 62caea7 Always specify javac.target to allow compilation on JDK11+ and execution on JDK8
add 39902f2 Merge pull request #1561 from JaroslavTulach/jtulach/JavaTarget
add 0c21642 Update NbmWizardIterator.java
add 348a9fe Merge pull request #1563 from apache/ebarboni-patchfornbm-1
add 4099efe [NETBEANS-3164]:Fixed issue in Text-Block
add 312f983 Making sure the internal nb-javac modules are part of the source distro
add 02acbf5 [NETBEANS-3198] fallback to hard-coded build date in Options import / export
add f5184a5 Merge pull request #1571 from neilcsmith-net/fix-netbeans-3198
new d60b284 Merge pull request #1549 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:
.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 | 0
.../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 +
.../nbjavac.impl}/nbproject/suite.properties | 0
.../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 | 0
.../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, 703 insertions(+), 91 deletions(-)
copy {nb/updatecenters => extra/libs.javafx.linux}/licenseinfo.xml (71%)
copy {nb/updatecenters => extra/libs.javafx.macosx}/licenseinfo.xml (72%)
copy {nb/updatecenters => extra/libs.javafx.win}/licenseinfo.xml (72%)
delete mode 100644 extra/nbjavac.api/release/modules/ext/nb-javac-13-api.jar.external
delete mode 100644 extra/nbjavac.impl/release/modules/ext/nb-javac-13-impl.jar.external
create mode 100644 nb/updatecenters/extras/.gitignore
copy {extra/nbjavac => nb/updatecenters/extras}/build.xml (79%)
copy {extra => nb/updatecenters/extras}/nbjavac.api/build.xml (94%)
rename {extra => nb/updatecenters/extras}/nbjavac.api/manifest.mf (100%)
create mode 100644 nb/updatecenters/extras/nbjavac.api/nbproject/build-impl.xml
copy extra/nbjavac.impl/nbproject/project.properties => nb/updatecenters/extras/nbjavac.api/nbproject/genfiles.properties (68%)
copy {extra/nbjavac.impl => nb/updatecenters/extras/nbjavac.api}/nbproject/project.properties (100%)
rename {extra => nb/updatecenters/extras}/nbjavac.api/nbproject/project.xml (97%)
copy {apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2 => nb/updatecenters/extras/nbjavac.api}/nbproject/suite.properties (100%)
create mode 100644 nb/updatecenters/extras/nbjavac.api/release/modules/ext/nb-javac-13-api.jar.external
rename {extra => nb/updatecenters/extras}/nbjavac.api/src/org/netbeans/modules/nbjavac/api/Bundle.properties (100%)
rename {extra => nb/updatecenters/extras}/nbjavac.impl/build.xml (94%)
rename {extra => nb/updatecenters/extras}/nbjavac.impl/manifest.mf (100%)
create mode 100644 nb/updatecenters/extras/nbjavac.impl/nbproject/build-impl.xml
copy extra/nbjavac.impl/nbproject/project.properties => nb/updatecenters/extras/nbjavac.impl/nbproject/genfiles.properties (68%)
rename {extra/nbjavac.api => nb/updatecenters/extras/nbjavac.impl}/nbproject/project.properties (100%)
rename {extra => nb/updatecenters/extras}/nbjavac.impl/nbproject/project.xml (98%)
copy {apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2 => nb/updatecenters/extras/nbjavac.impl}/nbproject/suite.properties (100%)
create mode 100644 nb/updatecenters/extras/nbjavac.impl/release/modules/ext/nb-javac-13-impl.jar.external
copy {extra => nb/updatecenters/extras}/nbjavac.impl/src/org/netbeans/modules/nbjavac/impl/Bundle.properties (100%)
rename {extra => nb/updatecenters/extras}/nbjavac/build.xml (94%)
rename {extra => nb/updatecenters/extras}/nbjavac/manifest.mf (100%)
create mode 100644 nb/updatecenters/extras/nbjavac/nbproject/build-impl.xml
copy extra/nbjavac.impl/nbproject/project.properties => nb/updatecenters/extras/nbjavac/nbproject/genfiles.properties (68%)
rename {extra => nb/updatecenters/extras}/nbjavac/nbproject/project.properties (100%)
rename {extra => nb/updatecenters/extras}/nbjavac/nbproject/project.xml (99%)
copy {apisupport/apisupport.ant/test/unit/data/example-external-projects/suite4/module2 => nb/updatecenters/extras/nbjavac}/nbproject/suite.properties (100%)
rename {extra => nb/updatecenters/extras}/nbjavac/src/org/netbeans/modules/nbjavac/Bundle.properties (100%)
create mode 100644 nb/updatecenters/extras/nbproject/build-impl.xml
copy extra/nbjavac.impl/nbproject/project.properties => nb/updatecenters/extras/nbproject/genfiles.properties (56%)
rename extra/nbjavac.impl/nbproject/project.properties => nb/updatecenters/extras/nbproject/platform.properties (54%)
create mode 100644 nb/updatecenters/extras/nbproject/platform.xml
rename extra/nbjavac.impl/src/org/netbeans/modules/nbjavac/impl/Bundle.properties => nb/updatecenters/extras/nbproject/project.properties (92%)
rename extra/nbjavac.api/build.xml => nb/updatecenters/extras/nbproject/project.xml (75%)
create mode 100644 nbbuild/antsrc/org/netbeans/nbbuild/GitBranchHash.java
---------------------------------------------------------------------
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 #1549 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 d60b28422c35fc6f2fa0952dc214c3bf010c33d3
Merge: 86e1b2e f5184a5
Author: Neil C Smith <ne...@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-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