Update LSP4Jakarta to 0.2.1

Signed-off-by: Adam Wisniewski <[email protected]>
OpenLiberty · Feb 27, 2024 · bbd0560 · bbd0560
1 parent a8aeb2e
commit bbd0560
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 10 deletions.
diff --git a/NOTICES b/NOTICES
@@ -45,7 +45,7 @@ org.eclipse.lsp4j:org.eclipse.lsp4j.generator | https://mvnrepository.com/artifa
 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.lsp4j:org.eclipse.lsp4j.jsonrpc | https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.20.1/org.eclipse.lsp4j.jsonrpc-0.20.1-sources.jar
 org.eclipse.lsp4j:org.eclipse.lsp4j.jsonrpc | https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j.jsonrpc/0.21.0/org.eclipse.lsp4j.jsonrpc-0.21.0-sources.jar
-org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.ls | https://github.com/eclipse/lsp4jakarta/tree/0.2.0
+org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.ls | https://github.com/eclipse/lsp4jakarta/tree/0.2.1
 org.eclipse.lsp4mp:org.eclipse.lsp4mp.ls | https://github.com/eclipse/lsp4mp/tree/0.10.0
 org.eclipse.xtend:org.eclipse.xtend.lib | https://mvnrepository.com/artifact/org.eclipse.xtend/org.eclipse.xtend.lib/2.24.0
 org.eclipse.xtend:org.eclipse.xtend.lib | https://mvnrepository.com/artifact/org.eclipse.xtend/org.eclipse.xtend.lib/2.28.0

diff --git a/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml b/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml
@@ -26,7 +26,7 @@
 
     <properties>
         <liberty.ls.version>2.1.1</liberty.ls.version>
-        <jakarta.ls.version>0.2.0</jakarta.ls.version>
+        <jakarta.ls.version>0.2.1</jakarta.ls.version>
         <mp.ls.version>0.10.0</mp.ls.version>
     </properties>
 

diff --git a/...s/io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/DevModeOperations.java b/...s/io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/DevModeOperations.java
@@ -18,6 +18,7 @@
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -28,14 +29,17 @@
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.QualifiedName;
+import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.debug.core.ILaunch;
 import org.eclipse.debug.core.ILaunchManager;
+import org.eclipse.jdt.launching.JavaRuntime;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.ISelectionService;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
@@ -54,7 +58,6 @@
 import io.openliberty.tools.eclipse.ui.terminal.ProjectTabController;
 import io.openliberty.tools.eclipse.ui.terminal.TerminalListener;
 import io.openliberty.tools.eclipse.utils.ErrorHandler;
-import jdk.internal.org.jline.utils.Display;
 
 /**
  * Provides the implementation of all supported dev mode operations.

diff --git a/ci/jenkins/run-tests b/ci/jenkins/run-tests
@@ -48,16 +48,18 @@ pipeline {
                                 sh '''
                                    MVNPATH="$(dirname $(which mvn))/.."
                                    GRADLEPATH="$(dirname $(which gradle))/.."
-                                   mvn clean verify -DmvnLogFile -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=4Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e
+                                   mvn clean verify -DmvnLogFile -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=4Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e -X
                                 '''
                             }
                         } finally {
-                            sh "cd tests/target/surefire-reports && zip -r 4Q2023-test-reports.zip ."
+                            sh "find tests -type f -name \"lte-dev-mode-output-*.log\""
                             sh "mkdir lte-dev-mode-output-logs && find tests -type f -name \"lte-dev-mode-output-*.log\" -exec cp {} lte-dev-mode-output-logs \\;"
                             sh "zip -r lte-dev-mode-output-logs.zip lte-dev-mode-output-logs"
-
+                            sh "cd tests/target/surefire-reports && zip -r 4Q2023-test-reports.zip ."
+
                             archiveArtifacts artifacts: 'tests/target/surefire-reports/4Q2023-test-reports.zip', fingerprint: true
                             archiveArtifacts artifacts: 'lte-dev-mode-output-logs.zip', fingerprint: true
+                            archiveArtifacts artifacts: 'tests/target/work/data/.metadata/.log', fingerprint: true
                         }
                     }
                 }

diff --git a/ci/scans/dependency-only-mend-pom.xml b/ci/scans/dependency-only-mend-pom.xml
@@ -103,7 +103,7 @@ OTHER REFERENCES:  https://projects.eclipse.org/projects/eclipse.platform/develo
 
     <properties>
         <liberty.ls.version>2.1-SNAPSHOT</liberty.ls.version>
-        <jakarta.ls.version>0.2.0-SNAPSHOT</jakarta.ls.version>
+        <jakarta.ls.version>0.2.1-SNAPSHOT</jakarta.ls.version>
         <mp.ls.version>0.10.0</mp.ls.version>
     </properties>
 

diff --git a/releng/io.openliberty.tools.update/category.xml b/releng/io.openliberty.tools.update/category.xml
@@ -20,5 +20,5 @@
 
     <repository-reference location="https://download.eclipse.org/jdtls/milestones/1.28.0/repository" enabled="true" />
     <repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.10.0/repository" enabled="true" />
-    <repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.2.0/repository" enabled="true" />
+    <repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.2.1/repository" enabled="true" />
 </site>
diff --git a/releng/target-platform-4Q2023/target-platform-4Q2023.target b/releng/target-platform-4Q2023/target-platform-4Q2023.target
@@ -73,8 +73,8 @@
             <unit id="org.eclipse.lsp4mp.jdt.core" version="0.10.0.20231005-1230"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-            <repository location="https://download.eclipse.org/lsp4jakarta/releases/0.2.0/repository/"/>
-            <unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.2.0"/>
+            <repository location="https://download.eclipse.org/lsp4jakarta/releases/0.2.1/repository/"/>
+            <unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.2.1"/>
         </location>
         <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
             <repository location="https://download.eclipse.org/jdtls/milestones/1.28.0/repository/"/>