This is an automated email from the ASF dual-hosted git repository. skygo pushed a commit to branch release140 in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 9e9f14d532c46ceab204a0ca1eddecfed08ed1fb Merge: ca91d1962c d5f29c12fd Author: Eric Barboni <[email protected]> AuthorDate: Fri Apr 29 13:46:53 2022 +0200 Merge pull request #4032 from apache/delivery Sync delivery to release140 for 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/source/indexing/VanillaCompileWorker.java | 10 ++ .../api/java/source/ui/ElementJavadoc.java | 3 +- java/libs.nbjavacapi/manifest.mf | 2 +- .../netbeans/modules/nbjavac/api/Bundle.properties | 2 +- 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 +++++++++++++++ 25 files changed, 636 insertions(+), 229 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
