Merge pull request #497 from awisniew90/1Q24-release

24.0.3 release

.github/workflows/run-regression-tests.yml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         runtime: [ linux, mac, windows ]
-        targetPlatform: [ 3Q2023 ]
+        targetPlatform: [ 4Q2023 ]
         include:
         - runtime: linux
           os: ubuntu-latest
@@ -36,3 +36,17 @@ jobs:
       # Build the plugin.
       - name: 'Build: Build-Package-RunTests'
         run: bash ./tests/resources/ci/scripts/exec.sh ${{ matrix.targetPlatform }}
+
+      # Collect logs
+      - run: |
+          mkdir logs
+          find tests -type f -name "lte-dev-mode-output-*.log" -exec cp {} logs \;
+        if: failure()
+
+      # save logs
+      - name: Upload Logs
+        uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: test-app-logs
+          path: logs

.mvn/extensions.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <extensions>
 	<extension>
-		<groupId>org.eclipse.tycho.extras</groupId>
-		<artifactId>tycho-pomless</artifactId>
-		<version>2.6.0</version>
+		<groupId>org.eclipse.tycho</groupId>
+		<artifactId>tycho-build</artifactId>
+		<version>4.0.6</version>
 	</extension>
 </extensions>

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

bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF

@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Bundle-Copyright: Copyright (c) 2022, 2023 IBM Corporation and others.
+Bundle-Copyright: Copyright (c) 2022, 2024 IBM Corporation and others.
 Bundle-ManifestVersion: 2
 Bundle-Name: Liberty Tools Support for Language Servers
 Bundle-Vendor: Open Liberty
 Bundle-SymbolicName: io.openliberty.tools.eclipse.lsp4e;singleton:=true
-Bundle-Version: 23.0.12.qualifier
+Bundle-Version: 24.0.3.qualifier
 Bundle-Activator: io.openliberty.tools.eclipse.ls.plugin.LibertyToolsLSPlugin
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: io.openliberty.tools.eclipse.lsp4e

bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml

@@ -20,13 +20,13 @@
     <parent>
         <groupId>io.openliberty.tools.eclipse</groupId>
         <artifactId>parent</artifactId>
-        <version>23.0.12-SNAPSHOT</version>
+        <version>24.0.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <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>
 

bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF

@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Bundle-Copyright: Copyright (c) 2022, 2023 IBM Corporation and others.
+Bundle-Copyright: Copyright (c) 2022, 2024 IBM Corporation and others.
 Bundle-ManifestVersion: 2
 Bundle-Name: Liberty Tools
 Bundle-Vendor: Open Liberty
 Bundle-SymbolicName: io.openliberty.tools.eclipse.product;singleton:=true
-Bundle-Version: 23.0.12.qualifier
+Bundle-Version: 24.0.3.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Automatic-Module-Name: io.openliberty.tools.eclipse
 Bundle-ActivationPolicy: lazy

bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF

@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Bundle-Copyright: Copyright (c) 2022 IBM Corporation and others.
+Bundle-Copyright: Copyright (c) 2022, 2024 IBM Corporation and others.
 Bundle-ManifestVersion: 2
 Bundle-Name: Liberty Tools UI
 Bundle-Vendor: Open Liberty
 Bundle-SymbolicName: io.openliberty.tools.eclipse.ui;singleton:=true
-Bundle-Version: 23.0.12.qualifier
+Bundle-Version: 24.0.3.qualifier
 Bundle-Activator: io.openliberty.tools.eclipse.LibertyDevPlugin
 Export-Package: io.openliberty.tools.eclipse;x-friends:="io.openliberty.tools.eclipse.tests",
  io.openliberty.tools.eclipse.debug;x-friends:="io.openliberty.tools.eclipse.tests",

bundles/io.openliberty.tools.eclipse.ui/src/io/openliberty/tools/eclipse/DevModeOperations.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
-* Copyright (c) 2022, 2023 IBM Corporation and others.
+* Copyright (c) 2022, 2024 IBM Corporation and others.
 *
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v. 2.0 which is available at
@@ -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;
@@ -75,6 +76,7 @@ public class DevModeOperations {
     public static final String BROWSER_MVN_IT_REPORT_NAME_SUFFIX = "failsafe report";
     public static final String BROWSER_MVN_UT_REPORT_NAME_SUFFIX = "surefire report";
     public static final String BROWSER_GRADLE_TEST_REPORT_NAME_SUFFIX = "test report";
+    public static final String MVN_RUN_APP_LOG_FILE = "io.openliberty.tools.eclipse.mvnlogfilename";
 
     private static final int STOP_TIMEOUT_SECONDS = 60;
     protected static final QualifiedName STOP_JOB_COMPLETION_TIMEOUT = new QualifiedName("io.openliberty.tools.eclipse.ui",
@@ -715,10 +717,11 @@ public void openGradleTestReport(IProject inputProject) {
                 if (Trace.isEnabled()) {
                     Trace.getTracer().trace(Trace.TRACE_TOOLS, msg + " No-op. Path: " + path);
                 }
-                ErrorHandler.processErrorMessage(
-                        NLS.bind(Messages.gradle_test_report_none_found, new String[] { projectName,
-                                DashboardView.APP_MENU_ACTION_RUN_TESTS, DashboardView.APP_MENU_ACTION_VIEW_GRADLE_TEST_REPORT }),
-                        true);
+                ErrorHandler
+                        .processErrorMessage(
+                                NLS.bind(Messages.gradle_test_report_none_found, new String[] { projectName,
+                                        DashboardView.APP_MENU_ACTION_RUN_TESTS, DashboardView.APP_MENU_ACTION_VIEW_GRADLE_TEST_REPORT }),
+                                true);
                 return;
             }
 
@@ -780,6 +783,16 @@ public void startDevMode(String cmd, String projectName, String projectPath, Str
         // The value for JAVA_HOME comes from the underlying configuration. The configuration allows
         // the java installation to be custom defined, execution environment defined, or workspace defined.
         envs.add("JAVA_HOME=" + javaInstallPath);
+        String logFileName = System.getProperty(MVN_RUN_APP_LOG_FILE);
+        if (logFileName != null && !logFileName.isEmpty()) {
+            // TODO - could abort if either of these env variables is already set but by guarding with sysprop no risk
+            // of accidental usage.
+
+            // mvn
+            envs.add("MAVEN_ARGS=--log-file " + logFileName);
+            // mvnw
+            envs.add("MAVEN_CONFIG=--log-file " + logFileName);
+        }
 
         projectTabController.runOnTerminal(projectName, projectPath, cmd, envs);
     }
@@ -921,9 +934,8 @@ public void run() {
                                 if (Trace.isEnabled()) {
                                     Trace.getTracer().trace(Trace.TRACE_TOOLS, msg);
                                 }
-                                ErrorHandler.rawErrorMessageDialog(
-                                        NLS.bind(Messages.plugin_stop_timeout,
-                                                new String[] { projectName, Integer.toString(STOP_TIMEOUT_SECONDS) }));
+                                ErrorHandler.rawErrorMessageDialog(NLS.bind(Messages.plugin_stop_timeout,
+                                        new String[] { projectName, Integer.toString(STOP_TIMEOUT_SECONDS) }));
                             }
                         });
                         return;

ci/jenkins/run-tests

@@ -4,7 +4,7 @@ pipeline {
     tools {
         jdk 'java17-semeru'
         xvfb 'gui-test'
-        maven 'maven-3.8.6'
+        maven 'maven-3.9.6'
         gradle 'gradle-7.6.1'
     }
 
@@ -38,7 +38,7 @@ pipeline {
             }
         }
 
-        stage('Test on Eclipse 3Q2023') {
+        stage('Test on Eclipse 4Q2023') {
             steps {
                 dir('liberty-tools-eclipse') {
                     script {
@@ -48,12 +48,18 @@ pipeline {
                                 sh '''
                                    MVNPATH="$(dirname $(which mvn))/.."
                                    GRADLEPATH="$(dirname $(which gradle))/.."
-                                   mvn clean verify -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=3Q2023 -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 3Q2023-test-reports.zip ."
-                            archiveArtifacts artifacts: 'tests/target/surefire-reports/3Q2023-test-reports.zip', fingerprint: true
+                            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
                         }
                     }
                 }

ci/scans/dependency-only-mend-pom.xml

@@ -24,7 +24,7 @@
     <parent>
         <groupId>io.openliberty.tools.eclipse</groupId>
         <artifactId>parent</artifactId>
-        <version>23.0.12-SNAPSHOT</version>
+        <version>24.0.3-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -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>
 

features/io.openliberty.tools.eclipse.feature/feature.xml

@@ -14,7 +14,7 @@
 <feature
       id="io.openliberty.tools.eclipse"
       label="%featureName"
-      version="23.0.12.qualifier"
+      version="24.0.3.qualifier"
     plugin="io.openliberty.tools.eclipse.product"
     provider-name="%providerName">
 
@@ -28,21 +28,21 @@
          id="io.openliberty.tools.eclipse.ui"
          download-size="0"
          install-size="0"
-         version="23.0.12.qualifier"
+         version="24.0.3.qualifier"
          unpack="false"/>
 
    <plugin
          id="io.openliberty.tools.eclipse.lsp4e"
          download-size="0"
          install-size="0"
-         version="23.0.12.qualifier"
+         version="24.0.3.qualifier"
          unpack="false"/>
 
    <plugin
          id="io.openliberty.tools.eclipse.product"
          download-size="0"
          install-size="0"
-         version="23.0.12.qualifier"
+         version="24.0.3.qualifier"
          unpack="false"/>
 
 </feature>

pom.xml

@@ -15,7 +15,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>io.openliberty.tools.eclipse</groupId>
 	<artifactId>parent</artifactId>
-	<version>23.0.12-SNAPSHOT</version>
+	<version>24.0.3-SNAPSHOT</version>
 	<packaging>pom</packaging>
     <licenses>
       <license>
@@ -29,7 +29,7 @@
 		<!-- Tycho version (<https://github.com/eclipse/tycho/blob/master/RELEASE_NOTES.md>) specified in:
 		     - .mvn/extensions.xml
 		     - and here: -->
-		<tycho.version>3.0.1</tycho.version>
+		<tycho.version>4.0.6</tycho.version>
 
 		<!-- To skip integration tests use: mvn verify -Dskip.ui-tests=true -->
 		<skip.ui-tests>false</skip.ui-tests>
@@ -42,7 +42,7 @@
 
         <!-- default version of the eclipse IDE to run tests against -->
         <!-- must be one of the target platform files defined in this project under releng -->
-        <eclipse.target>3Q2023</eclipse.target>
+        <eclipse.target>4Q2023</eclipse.target>
 
 	</properties>
 
@@ -196,7 +196,7 @@
 						<artifact>
 							<groupId>io.openliberty.tools.eclipse</groupId>
 							<artifactId>target-platform-${eclipse.target}</artifactId>
-							<version>23.0.12-SNAPSHOT</version>
+							<version>24.0.3-SNAPSHOT</version>
 							<file>target-platform-${eclipse.target}</file>
 						</artifact>
 					</target>

releng/io.openliberty.tools.update/category.xml

@@ -12,13 +12,13 @@
       IBM Corporation - initial implementation
 -->
 <site>
-    <feature url="features/io.openliberty.tools.eclipse_23.0.12.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="23.0.12.qualifier">
+    <feature url="features/io.openliberty.tools.eclipse_24.0.3.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="24.0.3.qualifier">
         <category name="io.openliberty.tools.eclipse"/>
     </feature>
 
     <category-def name="io.openliberty.tools.eclipse" label="Liberty Tools" />
 
     <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>