You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by sk...@apache.org on 2022/04/29 16:10:20 UTC
[netbeans] 01/01: Merge pull request #4031 from apache/delivery
This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 862379894fc239268e55f00bb4ce337d4c4437b8
Merge: bab3a7357b d5f29c12fd
Author: Eric Barboni <sk...@apache.org>
AuthorDate: Fri Apr 29 18:10:14 2022 +0200
Merge pull request #4031 from apache/delivery
Sync delivery to master after 14-rc2
ide/libs.truffleapi/nbproject/project.xml | 1 +
.../src/org/netbeans/modules/lsp/client/Utils.java | 4 +-
.../lsp/client/bindings/LanguageClientImpl.java | 102 +++++++++++--
.../nbcode/nbproject/platform.properties | 1 -
.../netbeans/modules/java/lsp/server/Utils.java | 42 ++++++
.../lsp/server/project/ProjectAlertPresenter.java | 14 +-
.../java/lsp/server/protocol/ServerTest.java | 2 -
.../java/source/indexing/VanillaCompileWorker.java | 10 ++
.../api/java/source/ui/ElementJavadoc.java | 3 +-
nbbuild/notice-stub.txt | 2 +-
.../core/network/proxy/NbProxySelector.java | 2 +-
platform/sampler/nbproject/project.properties | 2 +-
platform/sampler/nbproject/project.xml | 40 -----
.../org/netbeans/modules/sampler/CLISampler.java | 8 +-
.../netbeans/modules/sampler/InternalSampler.java | 31 ++--
.../src/org/netbeans/modules/sampler/Sampler.java | 15 +-
.../modules/sampler/SamplesOutputStream.java | 3 -
.../netbeans/modules/sampler/SelfSampleVFS.java | 4 +-
.../modules/sampler/StandaloneSampler.java | 55 +++++++
.../modules/sampler/AbstractSamplerBase.java | 167 +++++++++++++++++++++
.../netbeans/modules/sampler/CLISampleTest.java | 44 ++++++
.../modules/sampler/DirectSamplerHandle.java | 49 ++++++
.../org/netbeans/modules/sampler/SamplerTest.java | 145 ++----------------
.../modules/sampler/StandaloneSamplerTest.java | 117 +++++++++++++++
24 files changed, 634 insertions(+), 229 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