Merge dev branch into main

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

@@ -4,6 +4,7 @@ on:
   pull_request:
     branches:
       - main
+      - dev
 jobs:
   build:
     strategy:
@@ -56,7 +57,7 @@ jobs:
         uses: actions/cache/restore@v4
         with:
           path: test-tools/liberty-dev-tools
-          key: ${{ runner.os }}-tools-jdk21.0.3-maven3.9.6-gradle8.8
+          key: ${{ runner.os }}-tools-jdk21.0.3-maven3.9.6-gradle9.7.1
           restore-keys: |
             ${{ runner.os }}-tools-
 
@@ -68,20 +69,6 @@ jobs:
       - 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@v4
-        if: failure()
-        with:
-          name: test-app-logs
-          path: logs
-
       # Save Maven and Tycho dependencies cache (even on failure)
       - name: 'Cache: Maven and Tycho repository (save)'
         uses: actions/cache/save@v4
@@ -108,4 +95,4 @@ jobs:
         if: always()
         with:
           path: test-tools/liberty-dev-tools
-          key: ${{ runner.os }}-tools-jdk21.0.3-maven3.9.6-gradle8.8
+          key: ${{ runner.os }}-tools-jdk21.0.3-maven3.9.6-gradle9.7.1

bundles/io.openliberty.tools.eclipse.ui/.classpath

@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="lib" path="libs/json-20250107.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

bundles/io.openliberty.tools.eclipse.ui/.gitignore

@@ -1 +1,2 @@
 /bin/
+/libs/

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

@@ -8,18 +8,21 @@ Bundle-Version: 26.0.8.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",
+ io.openliberty.tools.eclipse.model;x-friends:="io.openliberty.tools.eclipse.tests",
  io.openliberty.tools.eclipse.ui.dashboard;x-friends:="io.openliberty.tools.eclipse.tests",
  io.openliberty.tools.eclipse.ui.launch;x-friends:="io.openliberty.tools.eclipse.tests",
  io.openliberty.tools.eclipse.ui.launch.shortcuts;x-friends:="io.openliberty.tools.eclipse.tests",
  io.openliberty.tools.eclipse.ui.preferences;x-friends:="io.openliberty.tools.eclipse.tests"
 Require-Bundle: org.eclipse.ui,
  org.eclipse.m2e.maven.runtime,
  org.eclipse.jdt.debug.ui;bundle-version="3.14.0",
- org.eclipse.jdt.debug;bundle-version="3.22.0"
+ org.eclipse.jdt.debug;bundle-version="3.22.0",
+ org.eclipse.ui.ide
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Automatic-Module-Name: io.openliberty.tools.eclipse.ui
 Bundle-ActivationPolicy: lazy
-Import-Package: org.eclipse.cdt.launch.ui,
+Import-Package: org.eclipse.buildship.core,
+ org.eclipse.cdt.launch.ui,
  org.eclipse.core.commands,
  org.eclipse.core.expressions,
  org.eclipse.core.resources,
@@ -47,7 +50,12 @@ Import-Package: org.eclipse.cdt.launch.ui,
  org.eclipse.osgi.util,
  org.eclipse.swt.custom,
  org.eclipse.ui.console,
+ org.eclipse.ui.forms.events,
+ org.eclipse.ui.forms.widgets,
+ org.eclipse.ui.dialogs,
  org.gradle.tooling,
  org.gradle.tooling.model,
  org.gradle.tooling.model.eclipse,
  org.osgi.framework
+Bundle-ClassPath: libs/json-20250107.jar,
+ .

bundles/io.openliberty.tools.eclipse.ui/build.properties

@@ -1,9 +1,10 @@
 source.. = src/
 output.. = bin/
-bin.includes = plugin.xml,\
-               about.html,\
+bin.includes = about.html,\
                epl-v20.html,\
-               META-INF/,\
-               .,\
                icons/,\
-               .options
+               libs/,\
+               META-INF/,\
+               plugin.xml,\
+               .options,\
+               .