You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ge...@apache.org on 2021/05/12 18:40:56 UTC
[netbeans] branch master updated (77b590b -> 1dc4113)
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from 77b590b Merge pull request #2938 from JaroslavTulach/jtulach/SingleJavaFileInCode
add 7f04658 Updates discoclient library (which adds more downloadable distributions)
add 84cbdab Merge pull request #2941 from emilianbold/emi-discoclient-1.0.1
add 291762e 12.4 release updates
add c6f55fc removed file added by mistake
add c66f8f7 Merge branch 'delivery' into delivery
add 5d775bf Merge pull request #2922 from MartinBalin/delivery
add 054a368 [NETBEANS-5587] Fix regression in gavSplit
add 87dae1c Merge pull request #2942 from lkishalmi/NETBEANS-5587
add 418b851 Adds all the JDK distros in the discovery service combobox
add 1e006a8 Merge pull request #2951 from emilianbold/emi-distros
new 1dc4113 Merge pull request #2946 from apache/delivery
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:
.../modules/gradle/GradleModuleFileCache21.java | 10 ++--
.../gradle/GradleModuleFileCache21Test.java | 66 ++++++++++++++++++---
java/java.disco/external/binaries-list | 2 +-
...0-license.txt => discoclient-1.0.1-license.txt} | 2 +-
java/java.disco/nbproject/project.properties | 2 +-
java/java.disco/nbproject/project.xml | 4 +-
.../netbeans/modules/java/disco/AdvancedPanel.java | 10 +++-
java/java.lsp.server/vscode/CHANGELOG.md | 7 +++
java/java.lsp.server/vscode/README.md | 36 +++++++++--
.../vscode/images/Test_explorer.png | Bin 0 -> 126694 bytes
java/java.lsp.server/vscode/package-lock.json | 2 +-
java/java.lsp.server/vscode/package.json | 2 +-
12 files changed, 116 insertions(+), 27 deletions(-)
rename java/java.disco/external/{discoclient-1.0-license.txt => discoclient-1.0.1-license.txt} (99%)
create mode 100644 java/java.lsp.server/vscode/images/Test_explorer.png
---------------------------------------------------------------------
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 #2946 from apache/delivery
Posted by ge...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
geertjan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 1dc4113f2a46656dd852cfedcafd12d52d7e73fa
Merge: 77b590b 1e006a8
Author: Geertjan Wielenga <ge...@apache.org>
AuthorDate: Wed May 12 20:40:46 2021 +0200
Merge pull request #2946 from apache/delivery
Sync master with delivery for rc3
.../modules/gradle/GradleModuleFileCache21.java | 10 ++--
.../gradle/GradleModuleFileCache21Test.java | 66 ++++++++++++++++++---
java/java.disco/external/binaries-list | 2 +-
...0-license.txt => discoclient-1.0.1-license.txt} | 2 +-
java/java.disco/nbproject/project.properties | 2 +-
java/java.disco/nbproject/project.xml | 4 +-
.../netbeans/modules/java/disco/AdvancedPanel.java | 10 +++-
java/java.lsp.server/vscode/CHANGELOG.md | 7 +++
java/java.lsp.server/vscode/README.md | 36 +++++++++--
.../vscode/images/Test_explorer.png | Bin 0 -> 126694 bytes
java/java.lsp.server/vscode/package-lock.json | 2 +-
java/java.lsp.server/vscode/package.json | 2 +-
12 files changed, 116 insertions(+), 27 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