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 2021/08/25 08:23:43 UTC
[netbeans] 01/01: Merge pull request #3121 from apache/delivery
This is an automated email from the ASF dual-hosted git repository.
neilcsmith pushed a commit to branch release125
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 0067d3cd693282f4bf7d6e407665a4c2ebcab8dd
Merge: c0f4399 1bca448
Author: Neil C Smith <ne...@apache.org>
AuthorDate: Wed Aug 25 09:23:06 2021 +0100
Merge pull request #3121 from apache/delivery
Sync delivery to release125 for 12.5-beta2
.../modules/glassfish/common/ServerDetails.java | 4 +-
.../modules/gradle/ActionProviderImpl.java | 10 +-
.../modules/gradle/actions/ActionToTaskUtils.java | 41 ++-
.../actions/ConfigurableActionsProviderImpl.java | 7 +-
.../ConfigurableActionsProviderImplTest.java | 50 ++++
.../modules/groovy/editor/api/ASTUtils.java | 42 ++-
.../modules/groovy/editor/api/GroovyIndexer.java | 5 +
.../groovy/editor/api/StructureAnalyzer.java | 10 +-
.../editor/api/completion/CompletionItem.java | 6 +
.../groovy/editor/api/elements/ast/ASTClass.java | 5 +-
.../groovy/editor/api/elements/ast/ASTField.java | 3 +-
.../groovy/editor/api/elements/ast/ASTMethod.java | 8 +-
.../completion/inference/MethodInference.java | 21 +-
.../completion/inference/TypeInferenceVisitor.java | 114 +++++---
.../flow/reassignment/Reassignment.groovy | 7 +
...assignment.groovy.testReassignment_1.completion | 7 +
...assignment.groovy.testReassignment_2.completion | 6 +
.../completion/method/methods4/Methods4.groovy | 21 ++
.../Methods4.groovy.testMethods4.completion | 6 +
.../groovy/editor/api/completion/FlowCCTest.java | 8 +
.../groovy/editor/api/completion/MethodCCTest.java | 8 +
ide/extexecution/apichanges.xml | 18 +-
.../api/extexecution/startup/StartupExtender.java | 46 +++-
.../extexecution/startup/ProxyStartupExtender.java | 18 ++
.../StartupExtenderRegistrationOptions.java} | 20 +-
.../StartupExtenderRegistrationProcessor.java | 5 +-
.../spi/extexecution/startup/StartupExtender.java | 12 +
.../startup/StartupExtenderImplementation.java | 17 +-
.../test/unit/src/META-INF/MANIFEST.MF | 8 +
.../api/extexecution/resources/mf-layer.xml | 40 +++
...tupExtender.java => LegacyStartupExtender.java} | 20 +-
...upExtender.java => LegacyStartupExtender2.java} | 19 +-
.../extexecution/startup/StartupExtenderTest.java | 65 ++++-
.../extexecution/startup/TestStartupExtender.java | 2 +-
...StartupExtender.java => V2StartupExtender.java} | 21 +-
.../gradle/htmlui/HtmlJavaPagesNodeFactory.java | 110 ++++++++
.../htmlui/resources/desktop_build.gradle.fmk | 6 +-
.../htmlui/resources/gradle-wrapper.properties.fmk | 25 --
.../gradle/htmlui/resources/gradle.properties.fmk | 4 +-
.../modules/gradle/htmlui/resources/layer.xml | 8 +-
.../gradle/htmlui/resources/root_build.gradle.fmk | 22 +-
.../gradle/htmlui/resources/src_main_java_Demo.fmk | 23 +-
.../gradle/htmlui/resources/web_build.gradle.fmk | 9 +-
.../modules/gradle/htmlui/CreateArchetypeTest.java | 38 ++-
java/gradle.java/nbproject/project.xml | 2 +-
.../gradle/java/execute/JavaExecTokenProvider.java | 2 +-
.../netbeans/modules/java/disco/BrowsePanel.java | 31 ++-
.../modules/java/disco/BrowseWizardPanel.java | 2 +-
.../modules/java/disco/FoojayPlatformInstall.java | 2 +-
.../lsp/server/debugging/NbProtocolServer.java | 7 +-
java/java.source.ant/nbproject/project.xml | 5 +
.../java/source/ant/ProjectRunnerImplTest.java | 9 +
.../java/testrunner/ui/ComputeTestMethodsImpl.java | 5 +-
java/jshell.support/nbproject/project.xml | 2 +-
.../modules/jshell/j2se/JShellStartupExtender.java | 10 +-
java/maven/nbproject/project.xml | 2 +-
.../maven/execute/MavenCommandLineExecutor.java | 132 +++++----
.../maven/runjar/LaunchArgPrereqsChecker.java | 2 +-
.../modules/maven/runjar/MavenExecuteUtils.java | 21 +-
.../modules/maven/runjar/PropertySplitter.java | 2 +-
.../modules/maven/runjar/RunJarStartupArgs.java | 3 +-
.../test/unit/data/exec/PrintCommandLine.java} | 42 ++-
.../maven/runjar/RunJarStartupArgsTest.java | 303 +++++++++++++++++++++
.../annotations/ApiGenAnnotationsProvider.java | 3 +
.../php/apigen/annotations/Bundle.properties | 28 +-
.../php/apigen/annotations/InheritDocTag.java | 18 +-
.../modules/php/dbgp/ConnectionErrMessage.form | 14 +-
.../modules/php/dbgp/ConnectionErrMessage.java | 25 +-
.../php/editor/completion/PHPCodeCompletion.java | 2 +-
platform/libs.flatlaf/external/binaries-list | 2 +-
...laf-1.4-license.txt => flatlaf-1.5-license.txt} | 4 +-
platform/libs.flatlaf/nbproject/project.properties | 2 +-
platform/libs.flatlaf/nbproject/project.xml | 4 +-
.../src/org/openide/actions/HeapView.java | 17 +-
profiler/profiler.nbimpl/nbproject/project.xml | 2 +-
.../providers/DefaultProfilerArgsProvider.java | 12 +-
.../javascript/nodejs/exec/NodeExecutable.java | 2 +-
77 files changed, 1295 insertions(+), 369 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