Merge remote-tracking branch 'upstream/main' into issue282_projectDet…

…ection_integrationTest

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All notable changes to the Liberty Tools extension will be documented below.
 
+## 24.0.12
+
+Version 24.0.12 of Liberty Tools for Visual Studio Code is a fix release that contains minor enhancements and fixes. Version 24.0.12 requires Visual Studio Code version 1.78+ and requires Java 17 or later.
+
+Notable changes:
+
+- Updated [Eclipse LSP4Jakarta](https://github.com/eclipse/lsp4jakarta) version to 0.2.2, which resolves the following bugs:
+  - Quick fix NullPointerException failures - https://github.com/OpenLiberty/liberty-tools-vscode/issues/336
+  - UnsupportedOperationException in the output tabs for language servers - https://github.com/OpenLiberty/liberty-tools-vscode/issues/207
+  - Incorrect behaviour for @Dependent quick fix - https://github.com/OpenLiberty/liberty-tools-vscode/issues/362
+  - For more information regarding changes for version 0.2.2, refer to the release notes: https://github.com/eclipse/lsp4jakarta/releases/tag/0.2.2.
+- Updated [Liberty Config Language Server](https://github.com/OpenLiberty/liberty-language-server) version to 2.2, which adds support for versionless features in server configuration and includes several bug fixes. For more information regarding changes for version 2.2, refer to the release notes:
+  - https://github.com/OpenLiberty/liberty-language-server/releases/tag/liberty-langserver-2.2
+  - https://github.com/OpenLiberty/liberty-language-server/releases/tag/lemminx-liberty-2.2
+- The Liberty dashboard now refreshes when a project is added to a workspace.
+  - https://github.com/OpenLiberty/liberty-tools-vscode/issues/371
+- Support has been added to the “Start”, “Start…”, and “Start in container” actions for project paths that contain spaces.
+  - https://github.com/OpenLiberty/liberty-tools-vscode/issues/337
+- Support has been added for various terminal shell types for the “Start”, “Start…”, and “Start in container” actions. For more information regarding support for terminal shell types, refer to the “Terminal shell support” section of the user guide: https://github.com/OpenLiberty/liberty-tools-vscode/blob/main/docs/user-guide.md#terminal-shell-support.
+- Support has been added for the new test report location following the update of the Maven Surefire Report Plugin.
+  - https://github.com/OpenLiberty/liberty-tools-vscode/issues/340
+
+See the [commit log](https://github.com/OpenLiberty/liberty-tools-vscode/compare/24.0.3...24.0.12) for the full set of changes since the previous release.
+
 ## 24.0.3
 
 Version 24.0.3 of Liberty Tools for Visual Studio Code is a fix release that contains minor enhancements and fixes. Version 24.0.3 requires Visual Studio Code version 1.78+ and requires Java 17 or later.

NOTICE

@@ -290,14 +290,17 @@ The Program includes some or all of the following that IBM obtained
 under the Eclipse Public License (source code available via the
 indicated URL):
 
- org.eclipse.lsp4j:org.eclipse.lsp4j.generator | https://mvnrepository.com/artifact/org.eclipse.lsp4j/org.eclipse.lsp4j.generator/0.17.0
+org.eclipse.lsp4j:org.eclipse.lsp4j.generator | https://mvnrepository.com/artifact/org.eclipse.lsp4j/org.eclipse.lsp4j.generator/0.17.0
 org.eclipse.lsp4j:org.eclipse.lsp4j | https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j/0.14.0/org.eclipse.lsp4j-0.14.0-sources.jar
 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc | https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.14.0/org.eclipse.lsp4j.jsonrpc-0.14.0-sources.jar
 org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.jdt.core | https://github.com/eclipse/lsp4jakarta
+org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.ls | https://github.com/eclipse/lsp4jakarta
 org.eclipse.lsp4mp:org.eclipse.lsp4mp.ls | https://github.com/eclipse/lsp4mp/tree/0.5.0
 org.eclipse.xtend:org.eclipse.xtend.lib | https://mvnrepository.com/artifact/org.eclipse.xtend/org.eclipse.xtend.lib/2.28.0
 org.eclipse.xtend:org.eclipse.xtend.lib.macro | https://mvnrepository.com/artifact/org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.28.0
 org.eclipse.xtext:org.eclipse.xtext.xbase.lib | https://mvnrepository.com/artifact/org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.28.0
+io.openliberty.tools:liberty-langserver | https://mvnrepository.com/artifact/io.openliberty.tools/liberty-langserver/2.2
+io.openliberty.tools:liberty-langserver-lemminx | https://mvnrepository.com/artifact/io.openliberty.tools/liberty-langserver-lemminx/2.2
 
 END OF ECLIPSE PUBLIC LICENSE, VERSION 2 NOTICES AND INFORMATION
 
@@ -343,17 +346,20 @@ MIT LICENSE
 The Program includes some or all of the following that IBM obtained
 under the MIT License:
 
+@jsep-plugin/assignment | Copyright 2013 Stephen Oney <https://ericsmekens.github.io/jsep/>
+@jsep-plugin/regex | Copyright 2013 Stephen Oney <https://ericsmekens.github.io/jsep/>
 @types/fs-extra | Copyright (c) Microsoft Corporation.
 @types/node | Copyright (c) Microsoft Corporation. All rights reserved.
 @types/semver | Copyright (c) Microsoft Corporation.
 @types/xml2js | Copyright (c) Microsoft Corporation.
 balanced-match | Copyright (c) 2013 Julian Gruber <[email protected]>
 brace-expansion | Copyright (c) 2013 Julian Gruber <[email protected]>
 fs-extra | Copyright (c) 2011-2017 JP Richardson
+jsep | Copyright 2013 Stephen Oney <https://ericsmekens.github.io/jsep/>
 jsonfile | Copyright (c) 2012-2015 JP Richardson <[email protected]>
 jsonpath-plus | Copyright (c) 2011-2019 Stefan Goessner, Subbu Allamaraju, Mike Brevoort,
 Robert Krahn, Brett Zamir, Richard Schneider
-lodash.merge | Copyright OpenJS Foundation and other contributors <https://openjsf.org/
+lodash.merge | Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
 org.checkerframework:checker-qual | Copyright 2004-present by the Checker Framework developers
 universalify | Copyright (c) 2017 Ryan Zimmerman <[email protected]>
 vscode-jsonrpc | Copyright (c) Microsoft Corporation

docs/user-guide.md

@@ -7,7 +7,8 @@ For information regarding known issues and limitations, refer to our [Common Iss
   - [Software requirements](#software-requirements)
   - [Application requirements](#application-requirements)
   - [Configure your Java runtime for language servers](#configure-your-java-runtime-for-language-servers)
-  - [External Settings](#external-settings)
+  - [External extension settings](#external-extension-settings)
+  - [Terminal shell support](#terminal-shell-support)
 - [Open the Liberty dashboard](#open-the-liberty-dashboard)
 - [Run your application on Liberty using dev mode](#run-your-application-on-liberty-using-dev-mode)
   - [Use the Liberty dashboard](#use-the-liberty-dashboard)
@@ -76,6 +77,15 @@ For LemMinX, Liberty Tools for Visual Studio Code will check for the Java versio
 | `xml.java.home` | This setting allows a user to define their LemMinX language server runtime without altering the `JAVA_HOME` environment variable.  | Not set |
 | `java.jdt.ls.java.home` | This setting specifies the folder path to the JDK (17 or later) that is used to launch the Java Language Server. This setting replaces the Java extension's embedded JRE to start the language servers.  | Not set |
 
+### Terminal shell support
+
+Liberty Tools supports the default shell types for each OS in the Visual Studio Code terminal. These include:
+- Linux: Bash or sh
+- macOS: Bash or Zsh
+- Windows: Command Prompt (cmd.exe)
+
+It may be possible to use other shell types, but support is not guaranteed. Please feel free to open an enhancement issue if your preferred shell type is not supported: https://github.com/OpenLiberty/liberty-tools-vscode/issues.
+
 ## Open the Liberty dashboard
 
 By default, the Liberty dashboard appears in the Project Explorer side bar. Optionally, you can drag the Liberty dashboard into the Activity Bar.

gulpfile.js

@@ -3,9 +3,9 @@ const download = require("gulp-download2");
 const cp = require("child_process");
 
 const libertyGroupId = "io.openliberty.tools";
-const libertyVersion = "2.1.1";
+const libertyVersion = "2.2";
 const jakartaGroupId = "org.eclipse.lsp4jakarta";
-const jakartaVersion = "0.2.1";
+const jakartaVersion = "0.2.2";
 var releaseLevel = "releases";  //"snapshots"; //snapshots or releases
 
 const libertyLemminxName = "liberty-langserver-lemminx-" + libertyVersion + "-jar-with-dependencies.jar";