Merge remote-tracking branch 'upstream/main' into constants#1153

Author: anusreelakshmi934

.github/workflows/cronJob.yaml

@@ -2,10 +2,11 @@ name: Cron Job
 
 on:
   workflow_dispatch:
-  schedule:
-    # The job runs at 9:30 AM UTC every Monday through Friday, which is 3:00 PM IST and 4:30 AM EST.
-    # Ref - https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onschedule
-    - cron: '30 9 * * 1-5'
+#  Temporarily turn off the LSP4IJ integration till https://github.com/OpenLiberty/liberty-tools-intellij/issues/1457 is resolved.
+#  schedule:
+#    # The job runs at 9:30 AM UTC every Monday through Friday, which is 3:00 PM IST and 4:30 AM EST.
+#    # Ref - https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#onschedule
+#    - cron: '30 9 * * 1-5'
 
 jobs:
   fetch_all_pull_request_shas:

README.md

@@ -1,7 +1,7 @@
 # Liberty Tools for IntelliJ IDEA
 
 <!-- Make sure to also update the #Requirements section below, and in user-guide.md -->
-> Note: Version 24.0.12 requires **IntelliJ IDEA 2024.1.\***, **2024.2.\***, or **2024.3.\*** and a minimum of **Java 17**.
+> Note: Version 25.0.9 requires **IntelliJ IDEA 2024.3.\***, **2025.1.\***, or **2025.2.\*** and a minimum of **Java 17**.
 >
 > This page provides an overview of Liberty Tools for IntelliJ IDEA.
 > For minimum requirements information and detailed instructions on how to use Liberty Tools, check the [user-guide](docs/user-guide.md).
@@ -12,7 +12,7 @@
 
 Liberty Tools for IntelliJ IDEA is an IntelliJ IDEA plugin for developing cloud-native Java applications with [Open Liberty](https://openliberty.io/) and [WebSphere Liberty](https://www.ibm.com/products/websphere-liberty). Iterate fast with Liberty dev mode, code with assistance for MicroProfile and Jakarta EE APIs, and easily edit Liberty configuration files.
 
-Liberty Tools for IntelliJ includes [LSP4IJ](https://github.com/redhat-developer/lsp4ij), an external plugin dependency that is automatically installed with Liberty Tools. LSP4IJ is a free and open-source Language Server Protocol (LSP) client developed by Red Hat, enabling seamless language server integration.
+Liberty Tools for IntelliJ has an external dependency on [LSP4IJ](https://github.com/redhat-developer/lsp4ij), which is automatically installed from the JetBrains Marketplace when Liberty Tools is installed. LSP4IJ is a free and open-source IntelliJ plugin that enables Language Server Protocol (LSP) support for language server integration in IntelliJ IDEA.
 
 If you wish to change the version of LSP4IJ installed along with Liberty Tools, you can refer to the documentation [here](docs/user-guide.md#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace).
 
@@ -106,7 +106,7 @@ If you experience a problem with this plugin you might be asked to collect langu
 
 ## Requirements
 <!-- Make sure to also update the note at the top of this file, and in user-guide.md -->
-Version 24.0.12 requires **IntelliJ IDEA 2024.1.\***, **2024.2.\***, or **2024.3.\*** and a minimum of **Java 17**.
+Version 25.0.9 requires **IntelliJ IDEA 2024.3.\***, **2025.1.\***, or **2025.2.\*** and a minimum of **Java 17**.
 
 For more details, check the [user guide](docs/user-guide.md#software-requirements).
 

build.gradle

@@ -3,16 +3,16 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 plugins {
     id 'java'
-    id 'org.jetbrains.intellij.platform' version '2.1.0'
+    id 'org.jetbrains.intellij.platform' version '2.7.2'
     id 'org.jetbrains.kotlin.jvm' version '2.0.20'
 }
 
 group 'io.openliberty.tools'
-version '25.0.1-SNAPSHOT'
+version '25.0.9'
 
 def remoteRobotVersion = "0.11.23"
 // To switch to nightly version, append "@nightly" to the version number (i.e. 0.4.1-20240828-013108@nightly)
-def lsp4ijVersion = '0.12.0'
+def lsp4ijVersion = '0.18.0'
 
 allprojects {
     sourceCompatibility = javaVersion
@@ -57,6 +57,9 @@ repositories {
     maven {
         url = "https://cache-redirector.jetbrains.com/download-pgp-verifier"
     }
+    maven {
+        url = "https://central.sonatype.com/repository/maven-snapshots/"
+    }
     intellijPlatform {
         defaultRepositories()
     }
@@ -231,6 +234,61 @@ intellijPlatform {
             untilBuild = providers.gradleProperty("pluginUntilBuild")
         }
         changeNotes = """
+        <h2> 25.0.9 </h2>
+        <p>Version 25.0.9 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 25.0.9 requires IntelliJ IDEA version 2024.3.*, 2025.1.*, or 2025.2.* and a minimum of Java 17.</p>
+        Notable changes:
+        <ul>
+        <li> Support for IntelliJ IDEA 2025.2 and its successive fix releases. </li>
+        <li> Updated the <a href="https://github.com/OpenLiberty/liberty-language-server">Liberty Config Language Server</a> version to 2.3.2, which includes multiple enhancements and bug fixes. For more information regarding changes for version 2.3.2, refer to the release notes:
+          <ul>
+            <li> https://github.com/OpenLiberty/liberty-language-server/releases/tag/liberty-langserver-2.3.2 </li>
+            <li> https://github.com/OpenLiberty/liberty-language-server/releases/tag/lemminx-liberty-2.3.2 </li>
+          </ul>
+        </li>
+        <li> Resolved an exception that occurred when running Liberty actions in IntelliJ 2024.3.x. </li>
+        <li> Enabled Liberty actions to be run with the new “Reworked 2025” terminal engine. </li>
+        <li> Resolved a bug where multiple @BeanParams were incorrectly reported as an error in Java files. </li>
+        <li> Liberty Tools version 25.0.9 has been tested with <a href="https://github.com/redhat-developer/lsp4ij">LSP4IJ</a> versions 0.15.0, 0.16.0, and 0.16.1. </li>
+          <ul>
+            <li> For more information regarding tested LSP4IJ versions, refer to the table in <a href="https://github.com/OpenLiberty/liberty-tools-intellij/blob/main/docs/user-guide.md#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace">this section</a> of the user guide. </li>
+          </ul>
+        </li>
+        See the <a href="https://github.com/OpenLiberty/liberty-tools-intellij/compare/25.0.8...25.0.9">commit log</a> for the full set of changes since the previous release.
+        <br>
+        <h2> 25.0.8 </h2>
+        <p>Version 25.0.8 of Liberty Tools for IntelliJ IDEA contains a workaroud for a bug in the IntelliJ IDEA 2025.1.x fix stream. Version 25.0.8 requires IntelliJ IDEA version 2024.2.*, 2024.3.*, or 2025.1.* and a minimum of Java 17.</p>
+        <ul>
+        <li> This release contains a workaround for a NullPointerException that blocks application startup when using Liberty Tools with a fresh installation of IntelliJ IDEA 2025.1.2 or higher in the 2025.1.x fix stream. </li>
+        <li> Liberty Tools version 25.0.8 has been tested with <a href="https://github.com/redhat-developer/lsp4ij">LSP4IJ</a> version 0.14.2.
+          <ul>
+            <li> For more information regarding tested LSP4IJ versions, refer to the table in <a href="https://github.com/OpenLiberty/liberty-tools-intellij/blob/main/docs/user-guide.md#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace">this section</a> of the user guide.
+          </ul>
+        </li>
+        </ul>
+        See the <a href="https://github.com/OpenLiberty/liberty-tools-intellij/compare/25.0.5...25.0.8">commit log</a> for the full set of changes since the previous release.
+        <br>
+        <h2> 25.0.5 </h2>
+        <p>Version 25.0.5 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 25.0.5 requires IntelliJ IDEA version 2024.2.*, 2024.3.*, or 2025.1.* and a minimum of Java 17.</p>
+        Notable changes:
+        <ul>
+        <li> Support for IntelliJ IDEA 2025.1 and its successive fix releases.
+        <li> Fix to enable the debugger to attach to a Liberty server when using a custom Liberty installation.
+        <li> Fix for NPE when creating a new Liberty run/debug configuration for a new project without opening the Liberty tool window first.
+        <li> Fix to enable the “Liberty: Start” action to always run a basic dev mode command with no parameters.
+        <li> Fix to enable removal of the “Run in container” parameter when the Liberty run/debug config is deleted.
+        <li> Prepopulate the name for a new Liberty run/debug config.
+        <li> Updated the <a href="https://github.com/OpenLiberty/liberty-language-server">Liberty Config Language Server</a> version to 2.2.1, which includes multiple enhancements and bug fixes. For more information regarding changes for version 2.2.1, refer to the release notes:
+          <ul>
+            <li> https://github.com/OpenLiberty/liberty-language-server/releases/tag/liberty-langserver-2.2.1
+            <li> https://github.com/OpenLiberty/liberty-language-server/releases/tag/lemminx-liberty-2.2.1
+          </ul>
+        <li> Updated the <a href="https://github.com/eclipse/lsp4jakarta">Language Server for Jakarta EE</a> version to 0.2.3. For more information regarding changes for version 0.2.3, refer to the release notes: https://github.com/eclipse-lsp4jakarta/lsp4jakarta/releases/tag/0.2.3
+        <li> Liberty Tools version 25.0.5 has been tested with <a href="https://github.com/redhat-developer/lsp4ij">LSP4IJ</a> version 0.13.0.
+          <ul>
+            <li> For more information regarding tested LSP4IJ versions, refer to the table in <a href="https://github.com/OpenLiberty/liberty-tools-intellij/blob/main/docs/user-guide.md#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace">this section</a> of the user guide.
+          </ul>
+        See the <a href="https://github.com/OpenLiberty/liberty-tools-intellij/compare/24.0.12...25.0.5">commit log</a> for the full set of changes since the previous release.
+        <br>
         <h2> 24.0.12 </h2>
         <p>Version 24.0.12 of Liberty Tools for IntelliJ IDEA contains enhancements and fixes. Version 24.0.12 requires IntelliJ IDEA version 2024.1.*, 2024.2.*, or 2024.3.* and a minimum of Java 17.</p>
         Notable changes:

docs/user-guide.md

@@ -7,7 +7,10 @@ For information regarding known issues and limitations, refer to our [Common Iss
     - [Software requirements](#software-requirements)
     - [Application requirements](#application-requirements)
     - [Settings](#settings)
-- [Manually install specific release of the LSP4IJ plugin from the Marketplace](#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace)
+- [LSP4IJ plugin](#lsp4ij-plugin)
+    - [LSP4IJ tested versions](#lsp4ij-tested-versions)
+    - [Manually install specific release of the LSP4IJ plugin from the Marketplace](#manually-install-specific-release-of-the-lsp4ij-plugin-from-the-marketplace)
+    - [Third party language servers](#third-party-language-servers)
 - [Open the Liberty tool window](#open-the-liberty-tool-window)
 - [Run your application on Liberty using dev mode](#run-your-application-on-liberty-using-dev-mode)
     - [Use the Liberty tool window](#use-the-liberty-tool-window)
@@ -29,7 +32,7 @@ For information regarding known issues and limitations, refer to our [Common Iss
 ## Before you begin
 ### Software requirements
 <!-- Make sure to also update the main README.md note at its top, and its #Requirements section -->
-- Version 24.0.12 requires **IntelliJ IDEA 2024.1.\***, **2024.2.\***, or **2024.3.\***. Liberty Tools for IntelliJ IDEA is compatible with the Community Edition of IntelliJ IDEA.
+- Version 25.0.9 requires **IntelliJ IDEA 2024.3.\***, **2025.1.\***, or **2025.2.\*** and a minimum of **Java 17**. Liberty Tools for IntelliJ IDEA is compatible with both IntelliJ IDEA Ultimate and IntelliJ IDEA Community Edition.
 - **Java 17** or later. If you change the IntelliJ IDEA Boot Java Runtime through the **Change Boot Java Runtime for the IDE** preference, ensure that you are using Java 17 or later.
 - [Liberty Tools for IntelliJ IDEA plugin](https://plugins.jetbrains.com/plugin/14856-liberty-tools/)
 
@@ -51,17 +54,24 @@ Liberty Tools for IntelliJ IDEA honors the following settings:
 #### Environment Variables:
 - The **JAVA_HOME** system environment variable in the current terminal is used when you run Liberty dev mode in any project.
 
-## Manually install specific release of the LSP4IJ plugin from the Marketplace
+## LSP4IJ plugin
+Liberty Tools for IntelliJ has an external dependency on [LSP4IJ](https://github.com/redhat-developer/lsp4ij), which is automatically installed from the JetBrains Marketplace when Liberty Tools is installed. LSP4IJ is a free and open-source IntelliJ plugin that enables Language Server Protocol (LSP) support for language server integration in IntelliJ IDEA.
 
-When installing the Liberty Tools for IntelliJ plugin, the latest version of LSP4IJ from the JetBrains marketplace will be installed by default.
+### LSP4IJ tested versions
 
-If you prefer to use an older version of LSP4IJ (e.g., a specific version that was tested with the Liberty Tools release you are using), you can manually downgrade it by installing the desired version as a dependency from the [JetBrains marketplace](https://plugins.jetbrains.com/plugin/23257-lsp4ij/versions).
+| Liberty Tools version | LSP4IJ version(s) tested                     |
+|-----------------------|----------------------------------------------|
+| 24.0.9                | 0.5.0, 0.6.0, 0.7.0, 0.8.1                   |
+| 24.0.12               | 0.8.1, 0.9.0, 0.10.0, 0.11.0, 0.12.0, 0.13.0 |
+| 25.0.5                | 0.13.0, 0.14.0, 0.14.2                       |
+| 25.0.8                | 0.14.2, 0.15.0, 0.16.0, 0.16.1               |
+| 25.0.9                | 0.15.0, 0.16.0, 0.16.1, 0.17.0, 0.18.0       |
 
-| Liberty Tools version | LSP4IJ version(s) tested             |
-|-----------------------|--------------------------------------|
-| 24.0.9                | 0.5.0, 0.6.0, 0.7.0, 0.8.1           |
-| 24.0.12               | 0.8.1, 0.9.0, 0.10.0, 0.11.0, 0.12.0 |
+### Manually install specific release of the LSP4IJ plugin from the Marketplace
+
+When installing the Liberty Tools for IntelliJ plugin, the latest version of LSP4IJ from the JetBrains marketplace will be installed by default.
 
+If you prefer to use an older version of LSP4IJ (e.g., a specific version that was tested with the Liberty Tools release you are using), you can manually downgrade it by installing the desired version as a dependency from the [JetBrains marketplace](https://plugins.jetbrains.com/plugin/23257-lsp4ij/versions).
 
 Steps to install an older version of LSP4IJ:
 1. Go to the Plugins tab in the IDE Settings and uninstall the latest version.
@@ -75,6 +85,16 @@ Steps to install an older version of LSP4IJ:
 
 5. Confirm by clicking OK, then apply the changes. If prompted, restart your IDE.
 
+### Third party language servers
+LSP4IJ includes a built-in installer that may prompt users to install additional third-party language servers. While users are free to explore and install these language servers, Liberty Tools **only supports the following officially bundled language servers**:
+
+- [Liberty Config Language Server](https://github.com/OpenLiberty/liberty-language-server)
+- [Liberty LemMinX Language Server](https://github.com/OpenLiberty/liberty-language-server)
+- [Eclipse LSP4Jakarta: Language Server for Jakarta EE](https://github.com/eclipse/lsp4jakarta)
+- [Eclipse LSP4MP: Language Server for MicroProfile](https://github.com/eclipse/lsp4mp)
+
+Third-party language servers installed via LSP4IJ are **not supported** by Liberty Tools. Any issues or unexpected behaviour resulting from such third-party tools fall outside the scope of Liberty Tools support. **The Liberty Tools team is not responsible for troubleshooting or resolving problems caused by third-party language servers.**
+
 ## Open the Liberty tool window
 Select **View > Tool Windows > Liberty**.
 

gradle.properties

@@ -1,13 +1,13 @@
 useLocal=false
-pluginSinceBuild=241
-pluginUntilBuild=243.*
+pluginSinceBuild=243
+pluginUntilBuild=252.*
 
-javaVersion=17
+javaVersion=21
 
 # Target IntelliJ Community by default
 platformType=IC
-platformVersion=2024.1.7
-ideTargetVersion=2024.3
+platformVersion=2024.3.6
+ideTargetVersion=2025.2.1
 
 # Example: platformBundledPlugins = com.intellij.java
 platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij.gradle, org.jetbrains.plugins.terminal, com.intellij.properties
@@ -16,5 +16,8 @@ platformBundledPlugins=com.intellij.java, org.jetbrains.idea.maven, com.intellij
 lsp4JakartaVersion=0.2.3
 lsp4mpVersion=0.13.0
 lemminxVersion=0.26.1
-lclsLemminxVersion=2.2.1
-lclsVersion=2.2.1
+lclsLemminxVersion=2.4
+lclsVersion=2.4
+
+# Increase Gradle memory by setting maximum heap size to 2 GB and minimum to 1 GB to prevent OutOfMemoryError
+org.gradle.jvmargs=-Xmx2g -Xms1g -Dfile.encoding=UTF-8

src/main/java/io/openliberty/tools/intellij/LibertyExplorer.java

@@ -284,10 +284,9 @@ private static void executeAction(Tree tree) {
             }
             LibertyGeneralAction action = (LibertyGeneralAction) am.getAction(actionId);
             if (action != null) {
-                action.actionPerformed(new AnActionEvent(null,
-                        DataManager.getInstance().getDataContext(tree),
-                        ActionPlaces.UNKNOWN, new Presentation(),
-                        am, 0));
+                action.actionPerformed(new AnActionEvent(DataManager.getInstance().getDataContext(tree),
+                        new Presentation(), ActionPlaces.UNKNOWN, ActionUiKind.NONE, null,
+                        0, am));
             }
         }
     }

src/main/java/io/openliberty/tools/intellij/LibertyPluginIcons.java

@@ -17,6 +17,6 @@ public interface LibertyPluginIcons {
     Icon IntelliJGear = IconLoader.getIcon("AllIcons.General.GearPlain", LibertyPluginIcons.class);
     Icon libertyIcon = IconLoader.getIcon("/icons/OL_logo_13.svg", LibertyPluginIcons.class);
     Icon libertyIcon_40 = IconLoader.getIcon("/icons/OL_logo_40.svg", LibertyPluginIcons.class);
-    Icon gradleIcon = IconLoader.getIcon("icons/gradle-tag-1.png", LibertyPluginIcons.class);
+    Icon gradleIcon = IconLoader.getIcon("/icons/gradle-tag-1.png", LibertyPluginIcons.class);
     Icon mavenIcon = IconLoader.getIcon("/icons/maven-tag.png", LibertyPluginIcons.class);
 }

src/main/java/io/openliberty/tools/intellij/actions/RunLibertyDevTask.java

@@ -10,10 +10,7 @@
 package io.openliberty.tools.intellij.actions;
 
 import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.ActionManager;
-import com.intellij.openapi.actionSystem.ActionUpdateThread;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
@@ -84,7 +81,7 @@ private void handleLibertyTreeEvent(@NotNull AnActionEvent e, Project project, b
                                 } else {
                                     // calls selected action
                                     AnAction action = ActionManager.getInstance().getAction(Constants.FULL_ACTIONS_MAP.get(lastPathComponent));
-                                    action.actionPerformed(new AnActionEvent(null, DataManager.getInstance().getDataContext(libertyTree), e.getPlace(), e.getPresentation(), ActionManager.getInstance(), 0));
+                                    action.actionPerformed(new AnActionEvent(DataManager.getInstance().getDataContext(libertyTree), e.getPresentation(), e.getPlace(), ActionUiKind.NONE, null, 0, ActionManager.getInstance()));
                                 }
                             }
                         }
@@ -120,7 +117,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
                 String selectedAction = libertyActions[ret];
                 // run selected action
                 AnAction action = ActionManager.getInstance().getAction(Constants.FULL_ACTIONS_MAP.get(selectedAction));
-                action.actionPerformed(new AnActionEvent(null, e.getDataContext(), e.getPlace(), e.getPresentation(), ActionManager.getInstance(), 0));
+                action.actionPerformed(new AnActionEvent(e.getDataContext(), e.getPresentation(), e.getPlace(), ActionUiKind.NONE, null, 0, ActionManager.getInstance()));
             }
         } else {
             handleLibertyTreeEvent(e, project, false);