diff --git a/.github/workflows/run-regression-tests.yml b/.github/workflows/run-regression-tests.yml index 77ca6ca6..32858e6d 100644 --- a/.github/workflows/run-regression-tests.yml +++ b/.github/workflows/run-regression-tests.yml @@ -10,7 +10,7 @@ jobs: fail-fast: false matrix: runtime: [ linux, mac, windows ] - targetPlatform: [ 3Q2025 ] + targetPlatform: [ 4Q2025 ] include: - runtime: linux os: ubuntu-latest diff --git a/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF b/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF index feba70e0..15f92471 100644 --- a/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF +++ b/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ 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: 25.0.12.qualifier +Bundle-Version: 26.0.2.qualifier Bundle-Activator: io.openliberty.tools.eclipse.ls.plugin.LibertyToolsLSPlugin Bundle-ActivationPolicy: lazy Automatic-Module-Name: io.openliberty.tools.eclipse.lsp4e diff --git a/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml b/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml index 9b8c22ac..8bc4c695 100644 --- a/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml +++ b/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml @@ -20,14 +20,14 @@ io.openliberty.tools.eclipse parent - 25.0.12-SNAPSHOT + 26.0.2-SNAPSHOT ../../pom.xml 2.4 0.2.5 - 0.13.2 + 0.16.0 io.openliberty.tools.eclipse.lsp4e diff --git a/bundles/io.openliberty.tools.eclipse.lsp4e/src/io/openliberty/tools/eclipse/mpls/LibertyMPLSClientImpl.java b/bundles/io.openliberty.tools.eclipse.lsp4e/src/io/openliberty/tools/eclipse/mpls/LibertyMPLSClientImpl.java index 334f5fb2..1cb19f47 100644 --- a/bundles/io.openliberty.tools.eclipse.lsp4e/src/io/openliberty/tools/eclipse/mpls/LibertyMPLSClientImpl.java +++ b/bundles/io.openliberty.tools.eclipse.lsp4e/src/io/openliberty/tools/eclipse/mpls/LibertyMPLSClientImpl.java @@ -31,6 +31,7 @@ import org.eclipse.lsp4j.CompletionList; import org.eclipse.lsp4j.Diagnostic; import org.eclipse.lsp4j.Hover; +import org.eclipse.lsp4j.InlayHint; import org.eclipse.lsp4j.Location; import org.eclipse.lsp4j.PublishDiagnosticsParams; import org.eclipse.lsp4j.SymbolInformation; @@ -47,6 +48,7 @@ import org.eclipse.lsp4mp.commons.MicroProfileJavaDiagnosticsParams; import org.eclipse.lsp4mp.commons.MicroProfileJavaFileInfoParams; import org.eclipse.lsp4mp.commons.MicroProfileJavaHoverParams; +import org.eclipse.lsp4mp.commons.MicroProfileJavaInlayHintParams; import org.eclipse.lsp4mp.commons.MicroProfileJavaProjectLabelsParams; import org.eclipse.lsp4mp.commons.MicroProfileProjectInfo; import org.eclipse.lsp4mp.commons.MicroProfileProjectInfoParams; @@ -275,4 +277,10 @@ public CompletableFuture> getJavaWorkspaceSymbols(String // TODO Auto-generated method stub return null; } + + @Override + public CompletableFuture> getJavaInlayHint(MicroProfileJavaInlayHintParams arg0) { + // TODO Auto-generated method stub + return null; + } } diff --git a/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF b/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF index 8849879f..efcd9173 100644 --- a/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF +++ b/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Liberty Tools Bundle-Vendor: Open Liberty Bundle-SymbolicName: io.openliberty.tools.eclipse.product;singleton:=true -Bundle-Version: 25.0.12.qualifier +Bundle-Version: 26.0.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Automatic-Module-Name: io.openliberty.tools.eclipse Bundle-ActivationPolicy: lazy diff --git a/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF b/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF index 2df81a4d..c825bd7c 100644 --- a/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF +++ b/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Liberty Tools UI Bundle-Vendor: Open Liberty Bundle-SymbolicName: io.openliberty.tools.eclipse.ui;singleton:=true -Bundle-Version: 25.0.12.qualifier +Bundle-Version: 26.0.2.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", diff --git a/ci/jenkins/run-tests b/ci/jenkins/run-tests index a30c199e..4340efec 100644 --- a/ci/jenkins/run-tests +++ b/ci/jenkins/run-tests @@ -38,7 +38,7 @@ pipeline { } } - stage('Test on Eclipse 3Q2025') { + stage('Test on Eclipse 4Q2025') { steps { dir('liberty-tools-eclipse') { script { @@ -48,16 +48,16 @@ pipeline { sh ''' MVNPATH="$(dirname $(which mvn))/.." GRADLEPATH="$(dirname $(which gradle))/.." - mvn clean verify -DmvnLogFile -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=3Q2025 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e -X + mvn clean verify -DmvnLogFile -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=4Q2025 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e -X ''' } } finally { 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 3Q2025-test-reports.zip ." + sh "cd tests/target/surefire-reports && zip -r 4Q2025-test-reports.zip ." - archiveArtifacts artifacts: 'tests/target/surefire-reports/3Q2025-test-reports.zip', fingerprint: true + archiveArtifacts artifacts: 'tests/target/surefire-reports/4Q2025-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/features/io.openliberty.tools.eclipse.feature/feature.xml b/features/io.openliberty.tools.eclipse.feature/feature.xml index c79341a8..7745580a 100644 --- a/features/io.openliberty.tools.eclipse.feature/feature.xml +++ b/features/io.openliberty.tools.eclipse.feature/feature.xml @@ -14,7 +14,7 @@ @@ -28,21 +28,21 @@ id="io.openliberty.tools.eclipse.ui" download-size="0" install-size="0" - version="25.0.12.qualifier" + version="26.0.2.qualifier" unpack="false"/> diff --git a/pom.xml b/pom.xml index 218ce550..7e8425b6 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 io.openliberty.tools.eclipse parent - 25.0.12-SNAPSHOT + 26.0.2-SNAPSHOT pom @@ -42,7 +42,7 @@ - 3Q2025 + 4Q2025 @@ -196,7 +196,7 @@ io.openliberty.tools.eclipse target-platform-${eclipse.target} - 25.0.12-SNAPSHOT + 26.0.2-SNAPSHOT target-platform-${eclipse.target} diff --git a/releng/io.openliberty.tools.update/category.xml b/releng/io.openliberty.tools.update/category.xml index 501ef768..0717cfc1 100644 --- a/releng/io.openliberty.tools.update/category.xml +++ b/releng/io.openliberty.tools.update/category.xml @@ -12,14 +12,14 @@ IBM Corporation - initial implementation --> - + - - - + + + diff --git a/releng/target-platform-4Q2025/target-platform-4Q2025.target b/releng/target-platform-4Q2025/target-platform-4Q2025.target new file mode 100644 index 00000000..dfa85cfe --- /dev/null +++ b/releng/target-platform-4Q2025/target-platform-4Q2025.target @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + net.bytebuddy + byte-buddy-agent + 1.14.18 + jar + + + net.bytebuddy + byte-buddy + 1.14.18 + jar + + + org.mockito + mockito-core + 5.12.0 + jar + + + org.mockito + mockito-junit-jupiter + 5.12.0 + jar + + + org.objenesis + objenesis + 3.4 + jar + + + + + \ No newline at end of file diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index 2ae3bd85..7a73c379 100644 --- a/tests/META-INF/MANIFEST.MF +++ b/tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-Copyright: Copyright (c) 2022, 2025 IBM Corporation and others. Bundle-ManifestVersion: 2 Bundle-Name: Tests Plug-in Bundle-SymbolicName: io.openliberty.tools.eclipse.tests -Bundle-Version: 25.0.12.qualifier +Bundle-Version: 26.0.2.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 Require-Bundle: junit-jupiter-api, org.eclipse.ui, diff --git a/tests/pom.xml b/tests/pom.xml index 3afb2c10..2b1caaa7 100755 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -17,7 +17,7 @@ io.openliberty.tools.eclipse parent - 25.0.12-SNAPSHOT + 26.0.2-SNAPSHOT io.openliberty.tools.eclipse.tests