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 2022/02/02 17:23:44 UTC
[netbeans] 01/01: Merge pull request #3515 from apache/delivery
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 0b619d18948ec4ea1bfbb37dd192523843c43209
Merge: 8774f8d 3ff1e3d
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Wed Feb 2 17:23:26 2022 +0000
Merge pull request #3515 from apache/delivery
Sync delivery to master after 13-rc3
.../micronaut/licenseinfo.xml | 26 ++----
.../micronaut/newproject/BasePropertiesVisual.form | 102 ++++++++++++--------
.../micronaut/newproject/BasePropertiesVisual.java | 77 ++++++++-------
.../modules/micronaut/newproject/Bundle.properties | 1 +
.../newproject/MicronautProjectWizardIterator.java | 17 ++++
.../modules/micronaut/resources/warning.png | Bin 0 -> 585 bytes
.../modules/micronaut/resources/warning.svg | 98 ++++++++++++++++++++
harness/apisupport.harness/release/run.xml | 7 +-
.../org/netbeans/modules/html/templates/html.html | 2 +-
.../netbeans/modules/html/templates/xhtml.xhtml | 2 +-
.../hints/declarative/conditionapi/Matcher.java | 20 +++-
.../declarative/conditionapi/isReferencedIn.hint | 30 ++++++
.../declarative/conditionapi/isReferencedIn.test | 75 +++++++++++++++
java/java.lsp.server/vscode/BUILD.md | 40 ++++----
java/java.lsp.server/vscode/src/extension.ts | 12 +--
.../ui/ExtensionAndImplementationVisualPanel.java | 6 +-
.../netbeans/modules/maven/NbMavenProjectImpl.java | 34 ++++++-
.../maven/classpath/RuntimeClassPathImpl.java | 3 +-
.../maven/classpath/TestRuntimeClassPathImpl.java | 5 +-
nbbuild/build.xml | 7 +-
.../netbeans/modules/php/dbgp/DebugSession.java | 17 +++-
.../netbeans/modules/php/dbgp/SessionManager.java | 10 +-
.../php/editor/completion/PHPCodeCompletion.java | 19 +++-
.../php/editor/elements/IndexQueryImpl.java | 4 +
.../testfiles/completion/lib/gh3486/gh3486.php | 103 +++++++++++++++++++++
.../lib/gh3486/gh3486.php.testGH3486_01.completion | 16 ++++
.../lib/test207345/bar.php.testUseCase1.completion | 1 -
.../completion/PHPCodeCompletionGH3486Test.java | 49 ++++++++++
php/php.project/external/binaries-list | 2 +-
...1.3-license.txt => phpsigfiles-1.4-license.txt} | 2 +-
...s-1.3-notice.txt => phpsigfiles-1.4-notice.txt} | 0
php/php.project/nbproject/project.properties | 2 +-
platform/libs.flatlaf/external/binaries-list | 2 +-
...f-2.0-license.txt => flatlaf-2.0.1-license.txt} | 4 +-
platform/libs.flatlaf/nbproject/project.properties | 2 +-
platform/libs.flatlaf/nbproject/project.xml | 4 +-
.../netbeans/lib/profiler/heap/CacheDirectory.java | 9 +-
.../netbeans/lib/profiler/heap/HeapFactory.java | 2 +-
.../profiler/heapwalk/HeapFragmentWalker.java | 10 ++
.../modules/profiler/heapwalk/HeapWalker.java | 26 ++++--
.../profiler/heapwalk/HeapWalkerManager.java | 26 +++---
.../profiler/heapwalk/OverviewController.java | 14 ++-
.../profiler/heapwalk/ui/OverviewControllerUI.java | 2 +
43 files changed, 719 insertions(+), 171 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