Merge branch 'OpenLiberty:main' into issue#577

.github/workflows/build.yaml

@@ -40,8 +40,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           path: liberty-tools-intellij
-      - name: Setup FFmpeg
-        uses: FedericoCarboni/setup-ffmpeg@v2
       - name: 'Install required integration test software'
         working-directory: ./liberty-tools-intellij
         run: bash ./src/test/resources/ci/scripts/setup.sh

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'io.openliberty.tools'
-version '23.0.12-SNAPSHOT'
+version '24.0.1-SNAPSHOT'
 
 sourceCompatibility = 17
 targetCompatibility = 17
@@ -71,8 +71,8 @@ dependencies {
     implementation ('org.eclipse.lemminx:org.eclipse.lemminx:0.25.0') {
         exclude group: 'org.eclipse.lsp4j'
     }
-    implementation 'io.openliberty.tools:liberty-langserver-lemminx:2.1-SNAPSHOT'
-    implementation ('io.openliberty.tools:liberty-langserver:2.1-SNAPSHOT') {
+    implementation 'io.openliberty.tools:liberty-langserver-lemminx:2.1.1'
+    implementation ('io.openliberty.tools:liberty-langserver:2.1.1') {
         exclude group: 'org.eclipse.lsp4j'
     }
     implementation ('org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.ls:0.1.1') {
@@ -111,10 +111,10 @@ dependencies {
     lsp('org.eclipse.lemminx:org.eclipse.lemminx:0.25.0:uber') {
         transitive = false
     }
-    lsp('io.openliberty.tools:liberty-langserver-lemminx:2.1-SNAPSHOT:jar-with-dependencies') {
+    lsp('io.openliberty.tools:liberty-langserver-lemminx:2.1.1:jar-with-dependencies') {
         transitive = false
     }
-    lsp('io.openliberty.tools:liberty-langserver:2.1-SNAPSHOT:jar-with-dependencies') {
+    lsp('io.openliberty.tools:liberty-langserver:2.1.1:jar-with-dependencies') {
         transitive = false
     }
     lsp('org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.ls:0.1.1:jar-with-dependencies') {
@@ -179,10 +179,35 @@ tasks {
 
 patchPluginXml {
     changeNotes = """
+        <h2> 23.0.12 </h2>
+        Version 23.0.12 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 23.0.12 requires IntelliJ IDEA version 2023.1+ and requires Java 17 or later.
+        <br>
+        Notable changes:
+        <ul>
+        <li> Partial quick fix support for Jakarta EE Web Profile 9.x APIs when editing Java files via the <a href="https://github.com/eclipse/lsp4jakarta">Eclipse LSP4Jakarta</a>, Language Server for Jakarta EE
+        <li> Updated <a href="https://github.com/OpenLiberty/liberty-language-server">Liberty Config Language Server</a> version to 2.1.1. For information regarding changes for version 2.1, refer to the release notes linked below:
+          <ul>
+            <li> https://github.com/OpenLiberty/liberty-language-server/releases/tag/liberty-langserver-2.1
+            <li> https://github.com/OpenLiberty/liberty-language-server/releases/tag/lemminx-liberty-2.1
+          </ul>
+        <li> Fix for projects being detected in the Liberty Tool Window when the Liberty Gradle Plugin is commented out in the build.gradle - https://github.com/OpenLiberty/liberty-tools-intellij/issues/445
+        <li> Fix for incorrect project name being displayed in the “Remove Liberty project” confirmation dialog - https://github.com/OpenLiberty/liberty-tools-intellij/issues/321
+        <li> Fix to link to the Liberty Tools for IntelliJ GitHub issues page when an error in the Liberty Tools plugin is reported by the IntelliJ IDE - https://github.com/OpenLiberty/liberty-tools-intellij/issues/468
+        <li> Fix to surface error to user when Java 17 or later is not found when attempting to start up language servers - https://github.com/OpenLiberty/liberty-tools-intellij/issues/196
+        <li> Enhancement to enable custom Liberty configuration support provided by the Liberty Config Language Server - https://github.com/OpenLiberty/liberty-tools-intellij/issues/490
+        <li> Enhancement to add a “Run in container” checkbox to the Liberty run/debug configuration - https://github.com/OpenLiberty/liberty-tools-intellij/issues/160
+        <li> Enhancement to support IntelliJ IDEA version 2023.2.x - https://github.com/OpenLiberty/liberty-tools-intellij/issues/487
+        <li> Fix for ClassCastException from Liberty Tool Window project tree - https://github.com/OpenLiberty/liberty-tools-intellij/issues/561
+        <li> Fix for NullPointerException when the Maven executable is not able to execute - https://github.com/OpenLiberty/liberty-tools-intellij/issues/566
+        <li> Fix for Liberty start actions not working when the Maven build settings are set to use a Maven wrapper and multiple Maven projects are loaded in the IntelliJ workspace - https://github.com/OpenLiberty/liberty-tools-intellij/issues/563
+        <li> Fix for Liberty start actions not working when multiple Gradle projects are loaded in the IntelliJ workspace - https://github.com/OpenLiberty/liberty-tools-intellij/issues/568
+        </ul>
+        See the <a href="https://github.com/OpenLiberty/liberty-tools-intellij/compare/23.0.6...23.0.12">commit log</a> for the full set of changes since the previous release.
+        <br>
         <h2> 23.0.6 </h2>
         Version 23.0.6 of Liberty Tools for IntelliJ IDEA contains new functionality and fixes. Version 23.0.6 requires IntelliJ IDEA version 2023.1+ and requires Java 17 or later.
         <br>
-        Notable enhancements:
+        Notable changes:
         <ul>
         <li> Diagnostic and hover support when editing server.xml, server.env, bootstrap.properties via the <a href="https://github.com/OpenLiberty/liberty-language-server">Liberty Config Language Server</a>
         <li> Quick fix support when editing server.xml via the <a href="https://github.com/OpenLiberty/liberty-language-server">Liberty Config Language Server</a>

docs/user-guide.md

@@ -85,7 +85,7 @@ A new terminal tab opens to the run the application in dev mode.
 
 ### Start your application in dev mode with configuration
 
-To start your application in dev mode with custom configuration, select the **Start...** action for your application in the Liberty tool window. The action opens a Liberty Edit Configuration dialog. You can specify parameters for the [Liberty Maven dev goal](https://github.com/OpenLiberty/ci.maven/blob/main/docs/dev.md#additional-parameters) or [Liberty Gradle dev task](https://github.com/OpenLiberty/ci.gradle/blob/main/docs/libertyDev.md#command-line-parameters).
+To start your application in dev mode with custom configuration, select the **Start...** action for your application in the Liberty tool window. The action opens a Liberty Edit Configuration dialog. You can specify parameters for the [Liberty Maven dev goal](https://github.com/OpenLiberty/ci.maven/blob/main/docs/dev.md#additional-parameters) or [Liberty Gradle dev task](https://github.com/OpenLiberty/ci.gradle/blob/main/docs/libertyDev.md#command-line-parameters). You can also check the **Run in container** checkbox to start your application in dev mode in a container.
 
 ![Liberty Start... action](images/liberty-start-with-config.png)
 
@@ -193,7 +193,7 @@ Liberty configuration assistance is offered through the Liberty Config Language
 
 ## Develop with Jakarta EE and MicroProfile APIs
 
-Liberty Tools editing assistance provides code completion in configuration and application files for Jakarta EE and MicroProfile APIs.
+Liberty Tools editing assistance provides code completion, diagnostics, and quick-fixes in configuration and application files for Jakarta EE and MicroProfile APIs.
 
 1. Open a Java or microprofile-config.properties file.
 2. To use Jakarta EE-specific and MicroProfile-specific code completion, press <kbd>Ctrl</kbd> + <kbd>Space</kbd> / <kbd>Cmd</kbd> + <kbd>Space</kbd> anywhere within the document. A drop-down list of completion suggestions appears.
@@ -202,6 +202,10 @@ Liberty Tools editing assistance provides code completion in configuration and a
 
 ![Eclipse LSP4MP microprofile-config.properties completion](images/LSP4MP-mp-properties-completion.png)
 
+3. To use Jakarta EE-specific and MicroProfile-specific quick-fixes, hover over a Jakarta EE or MicroProfile diagnostic. A pop-up dialog appears that contains the diagnostic message and a quick-fix suggestion, if available. To see more quick-fix suggestions, click on the **More actions...** link.
+
+![Jakarta EE quick fix](images/LSP4Jakarta-quickfix.png)
+
 Jakarta EE API configuration assistance is offered through Eclipse LSP4Jakarta, the Language Server for Jakarta EE. For more information, see the [project documentation in GitHub](https://github.com/eclipse/lsp4jakarta#eclipse-lsp4jakarta).
 
 MicroProfile EE API configuration assistance is offered through Eclipse LSP4MP, the Language Server for MicroProfile. For more information, see the [project documentation in GitHub](https://github.com/eclipse/lsp4mp#eclipse-lsp4mp---language-server-for-microprofile).

src/main/resources/messages/LibertyBundles.properties

@@ -39,7 +39,7 @@ action.io.openliberty.tools.intellij.actions.RemoveLibertyProjectAction.text=Lib
 action.io.openliberty.tools.intellij.actions.RemoveLibertyProjectAction.description=Remove the selected Liberty project from the tool window
 
 # Messages for Liberty actions and pop-up dialog
-no.liberty.projects.detected=No Liberty Maven or Liberty Gradle projects detected in this workspace.
+no.liberty.projects.detected=\n 1. If no projects are open in the Project tool window, open or create a Liberty project using the File menu. \n\n 2. If one or more existing Maven or Gradle projects are open in the Project tool window, try one of the following actions: \n \n a. Configure the Liberty build plugin in the build file of an existing Maven or Gradle project.\n\n b. Add a server.xml file to an existing Maven or Gradle project at 'src/main/liberty/config'.\n\n c. Manually add an existing Maven or Gradle project to the Liberty tool window using the 'Liberty: Add project to the tool window' action through the Search Everywhere window.
 liberty.dev.not.started.notification.content=Unable to {0}. Liberty dev mode may not have been started on {1}. {2}Use the Liberty tool window to start Liberty dev mode.
 liberty.project.does.not.resolve=Unable to {0}: could not resolve project. Ensure you run the Liberty action from the Liberty tool window.
 liberty.build.file.does.not.resolve=Unable to {0}: could not resolve build file for {1}. Ensure you run the Liberty action from the Liberty tool window.

src/test/java/io/openliberty/tools/intellij/it/UIBotTestUtils.java

@@ -1691,7 +1691,13 @@ public static void selectProjectFromRemoveLibertyProjectDialog(RemoteRobot remot
      * @param waitTime    The time (seconds) to wait for the required message to appear in the text area.
      */
     public static void waitForLTWNoProjectDetectedMsg(RemoteRobot remoteRobot, int waitTime) {
-        String text = "No Liberty Maven or Liberty Gradle projects detected in this workspace.";
+        String text = " 1. If no projects are open in the Project tool window, open or create a Liberty project using " +
+                "the File menu.  2. If one or more existing Maven or Gradle projects are open in the Project tool " +
+                "window, try one of the following actions:   a. Configure the Liberty build plugin in the build file " +
+                "of an existing Maven or Gradle project. b. Add a server.xml file to an existing Maven or Gradle " +
+                "project at 'src/main/liberty/config'. c. Manually add an existing Maven or Gradle project to the" +
+                " Liberty tool window using the 'Liberty: Add project to the tool window' action through the " +
+                "Search Everywhere window.";
 
         int maxRetries = 3;
         Exception error = null;