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 2b20e6b27012faaf315b2bfddcbb501a1a56fd5b
Merge: 2fde2b4fd6 5ec24679f1
Author: Neil C Smith <neilcsm...@apache.org>
AuthorDate: Wed Oct 25 17:46:32 2023 +0100
Merge pull request #6608 from apache/delivery
Sync delivery to master after 20-rc2
.github/workflows/main.yml | 2 +-
.../gradle/tooling/NetBeansRunSinglePlugin.java | 95 ++--
.../modules/gradle/GradleConnectorManager.java | 80 +++
.../modules/gradle/GradleProjectConnection.java | 6 +-
.../execute/GradleDistributionProviderImpl.java | 4 +-
.../modules/gradle/loaders/GradleDaemon.java | 40 --
.../gradle/spi/newproject/TemplateOperation.java | 2 +
.../modules/gradle/api/GradleBaseProjectTest.java | 1 +
.../libs/git/jgit/commands/LogCommand.java | 6 +-
.../org/netbeans/modules/java/disco/Client.java | 70 +--
.../modules/java/disco/SelectPackagePanel.java | 6 +-
.../hints/infrastructure/JavaErrorProvider.java | 4 +-
java/java.lsp.server/build.xml | 2 +-
.../integration/commands/ProjectAuditCommand.java | 2 +-
.../commands/ProjectMetadataCommand.java | 2 +-
.../modules/nbcode/integration/maven.properties | 1 +
.../netbeans/modules/java/lsp/server/Utils.java | 40 ++
.../java/lsp/server/db/DBAddConnection.java | 4 +-
.../java/lsp/server/db/DBCommandProvider.java | 4 +-
.../java/lsp/server/db/DBConnectionProvider.java | 6 +-
.../attach/AttachConfigurationCompletion.java | 21 +-
.../debugging/attach/AttachConfigurations.java | 13 +-
.../debugging/attach/ConfigurationAttributes.java | 6 +-
.../debugging/attach/NbAttachRequestHandler.java | 5 +-
.../lsp/server/explorer/NodeActionsProvider.java | 2 +-
.../server/explorer/NodePropertiesProvider.java | 4 +-
.../modules/java/lsp/server/htmlui/WebView.java | 4 +-
.../lsp/server/protocol/CodeActionsProvider.java | 6 +-
.../lsp/server/protocol/ConstructorGenerator.java | 4 +-
.../server/protocol/DelegateMethodGenerator.java | 4 +-
.../server/protocol/EqualsHashCodeGenerator.java | 8 +-
.../lsp/server/protocol/GetterSetterGenerator.java | 8 +-
.../ImplementAllAbstractMethodsAction.java | 4 +-
.../protocol/ImplementOverrideMethodGenerator.java | 6 +-
.../protocol/LaunchConfigurationCompletion.java | 4 +
.../java/lsp/server/protocol/LoggerGenerator.java | 4 +-
.../server/protocol/NbCodeClientCapabilities.java | 40 ++
.../server/protocol/OrganizeImportsCodeAction.java | 4 +-
.../protocol/ProjectConfigurationCompletion.java | 11 +-
.../java/lsp/server/protocol/QuickOpen.java | 4 +-
.../modules/java/lsp/server/protocol/Server.java | 75 +--
.../java/lsp/server/protocol/SurroundWithHint.java | 8 +-
.../lsp/server/protocol/TestClassGenerator.java | 6 +-
.../server/protocol/TextDocumentServiceImpl.java | 22 +-
.../lsp/server/protocol/ToStringGenerator.java | 4 +-
.../lsp/server/protocol/WorkspaceServiceImpl.java | 47 +-
.../ChangeMethodParametersRefactoring.java | 6 +-
.../ExtractSuperclassOrInterfaceRefactoring.java | 10 +-
.../lsp/server/refactoring/MoveRefactoring.java | 8 +-
.../lsp/server/refactoring/PullUpRefactoring.java | 6 +-
.../server/refactoring/PushDownRefactoring.java | 6 +-
.../EnablePreviewSingleSourceFile.java | 4 +-
.../java/lsp/server/explorer/ProjectViewTest.java | 2 +-
.../java/lsp/server/protocol/ServerTest.java | 16 +-
java/java.lsp.server/vscode/package.json | 114 ++--
.../vscode/src/dbConfigurationProvider.ts | 4 +-
java/java.lsp.server/vscode/src/extension.ts | 87 +--
.../vscode/src/launchConfigurations.ts | 7 +-
.../vscode/src/test/suite/extension.test.ts | 22 +-
.../vscode/src/test/suite/testutils.ts | 6 +-
java/java.lsp.server/vscode/src/testAdapter.ts | 9 +-
java/java.mx.project/nbproject/project.properties | 2 +
.../java/openjdk/jtreg/CodeLensProviderImpl.java | 4 +-
.../org/netbeans/api/java/source/SourceUtils.java | 20 +-
.../netbeans/api/java/source/SourceUtilsTest.java | 11 +
.../org/netbeans/modules/java/ui/FmtNaming.form | 29 +-
.../org/netbeans/modules/java/ui/FmtNaming.java | 31 +-
java/maven/apichanges.xml | 14 +
java/maven/build.xml | 3 +-
.../netbeans/modules/maven/NbArtifactFixer.java | 49 ++
.../netbeans/modules/maven/NbMavenProjectImpl.java | 182 ++++++-
.../netbeans/modules/maven/api/NbMavenProject.java | 54 +-
.../classpath/AbstractProjectClassPathImpl.java | 9 +
.../maven/classpath/ClassPathProviderImpl.java | 2 +
.../maven/classpath/CompileClassPathImpl.java | 7 +-
.../modules/maven/customizer/BasicInfoPanel.java | 4 +
.../maven/execute/MavenCommandLineExecutor.java | 15 +-
.../modules/maven/execute/ReactorChecker.java | 12 +-
.../maven/modelcache/MavenProjectCache.java | 223 +++++---
.../modules/maven/nodes/AddDependencyPanel.java | 3 +
.../maven/problems/MavenModelProblemsProvider.java | 11 +-
.../maven/problems/ProblemReporterImpl.java | 2 +-
.../modules/maven/problems/SanityBuildAction.java | 17 +-
.../maven/spi/newproject/CreateProjectBuilder.java | 2 +-
.../data/projects/multiproject/democa/.gitignore | 15 +
.../unit/data/projects/multiproject/democa/LICENSE | 12 +-
.../data/projects/multiproject/democa/lib/pom.xml | 198 +++++++
.../data/projects/multiproject/democa/oci/pom.xml | 253 +++++++++
.../unit/data/projects/multiproject/democa/pom.xml | 50 ++
.../modules/maven/NbMavenProjectImpl2Test.java | 597 +++++++++++++++++++++
.../modules/maven/NbMavenProjectImplTest.java | 3 +
.../{MockMavenExec.java => MavenExecMonitor.java} | 50 +-
.../modules/maven/execute/MockMavenExec.java | 23 +-
.../modules/maven/problems/PrimingActionTest.java | 14 +-
.../spi/actions/ProvidedConfigurationsTest.java | 7 +-
nbbuild/templates/common.xml | 2 +
platform/libs.flatlaf/external/binaries-list | 2 +-
...3.2.1-license.txt => flatlaf-3.2.5-license.txt} | 4 +-
platform/libs.flatlaf/manifest.mf | 2 +-
platform/libs.flatlaf/nbproject/project.properties | 10 +-
platform/libs.flatlaf/nbproject/project.xml | 4 +-
101 files changed, 2294 insertions(+), 666 deletions(-)
diff --cc platform/libs.flatlaf/manifest.mf
index bfc0aea47a,2d9a5a3a43..9f135a5a40
--- a/platform/libs.flatlaf/manifest.mf
+++ b/platform/libs.flatlaf/manifest.mf
@@@ -2,6 -2,6 +2,6 @@@ Manifest-Version: 1.
OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/flatlaf/Bundle.properties
OpenIDE-Module: org.netbeans.libs.flatlaf/1
OpenIDE-Module-Install: org/netbeans/libs/flatlaf/Installer.class
-OpenIDE-Module-Specification-Version: 1.16
+OpenIDE-Module-Specification-Version: 1.17
AutoUpdate-Show-In-Client: false
- OpenIDE-Module-Implementation-Version: 3.2.1
+ OpenIDE-Module-Implementation-Version: 3.2.5
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
