Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/run-regression-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
fail-fast: false
matrix:
runtime: [ linux, mac, windows ]
targetPlatform: [ 3Q2025 ]
targetPlatform: [ 4Q2025 ]
include:
- runtime: linux
os: ubuntu-latest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<parent>
<groupId>io.openliberty.tools.eclipse</groupId>
<artifactId>parent</artifactId>
<version>25.0.12-SNAPSHOT</version>
<version>26.0.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<properties>
<liberty.ls.version>2.4</liberty.ls.version>
<jakarta.ls.version>0.2.5</jakarta.ls.version>
<mp.ls.version>0.13.2</mp.ls.version>
<mp.ls.version>0.16.0</mp.ls.version>
</properties>

<artifactId>io.openliberty.tools.eclipse.lsp4e</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -275,4 +277,10 @@ public CompletableFuture<List<SymbolInformation>> getJavaWorkspaceSymbols(String
// TODO Auto-generated method stub
return null;
}

@Override
public CompletableFuture<List<InlayHint>> getJavaInlayHint(MicroProfileJavaInlayHintParams arg0) {
// TODO Auto-generated method stub
return null;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions ci/jenkins/run-tests
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pipeline {
}
}

stage('Test on Eclipse 3Q2025') {
stage('Test on Eclipse 4Q2025') {
steps {
dir('liberty-tools-eclipse') {
script {
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions features/io.openliberty.tools.eclipse.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<feature
id="io.openliberty.tools.eclipse"
label="%featureName"
version="25.0.12.qualifier"
version="26.0.2.qualifier"
plugin="io.openliberty.tools.eclipse.product"
provider-name="%providerName">

Expand All @@ -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"/>

<plugin
id="io.openliberty.tools.eclipse.lsp4e"
download-size="0"
install-size="0"
version="25.0.12.qualifier"
version="26.0.2.qualifier"
unpack="false"/>

<plugin
id="io.openliberty.tools.eclipse.product"
download-size="0"
install-size="0"
version="25.0.12.qualifier"
version="26.0.2.qualifier"
unpack="false"/>

</feature>
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.openliberty.tools.eclipse</groupId>
<artifactId>parent</artifactId>
<version>25.0.12-SNAPSHOT</version>
<version>26.0.2-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
<license>
Expand All @@ -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>3Q2025</eclipse.target>
<eclipse.target>4Q2025</eclipse.target>

</properties>

Expand Down Expand Up @@ -196,7 +196,7 @@
<artifact>
<groupId>io.openliberty.tools.eclipse</groupId>
<artifactId>target-platform-${eclipse.target}</artifactId>
<version>25.0.12-SNAPSHOT</version>
<version>26.0.2-SNAPSHOT</version>
<file>target-platform-${eclipse.target}</file>
</artifact>
</target>
Expand Down
8 changes: 4 additions & 4 deletions releng/io.openliberty.tools.update/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
IBM Corporation - initial implementation
-->
<site>
<feature url="features/io.openliberty.tools.eclipse_25.0.12.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="25.0.12.qualifier">
<feature url="features/io.openliberty.tools.eclipse_26.0.2.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="26.0.2.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.52.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.13.2/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1" enabled="true" />
<repository-reference location="https://download.eclipse.org/jdtls/milestones/1.56.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.16.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.2.5/repository" enabled="true" />
</site>
111 changes: 111 additions & 0 deletions releng/target-platform-4Q2025/target-platform-4Q2025.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<!--
Copyright (c) 2025 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
http://www.eclipse.org/legal/epl-2.0.

SPDX-License-Identifier: EPL-2.0

Contributors:
IBM Corporation - initial implementation
--><target includeMode="feature" name="target-platform.target" sequenceNumber="16">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/releases/2025-12/"/>
<unit id="org.eclipse.jdt.feature.group" version="3.20.400.v20251201-1407"/>
<unit id="org.eclipse.ui.trace" version="1.3.500.v20250320-0611"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.44.0.v20251106-1447"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1900.v20251126-0427"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.6.1.20231024-1618"/>
<unit id="org.eclipse.sdk.feature.group" version="4.38.0.v20251201-1407"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
<unit id="junit-jupiter-api" version="6.0.1"/>
<unit id="junit-jupiter-engine" version="6.0.1"/>
<unit id="org.eclipse.lsp4e" version="0.19.3.202512021035"/>
<unit id="org.eclipse.lsp4e.jdt" version="0.14.0.202511131327"/>
<unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="1.4.0.202511281851"/>
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="1.3.8.202511131403"/>
<unit id="org.eclipse.m2e.lemminx.feature.feature.group" version="2.6.101.20250727-0612"/>
<unit id="org.eclipse.jdt.debug.ui" version="3.15.200.v20251112-0612"/>
<unit id="org.eclipse.jdt.debug" version="3.25.0.v20251031-2243"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
<unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
<unit id="ch.qos.logback.slf4j.source" version="1.2.3.v20200428-2012"/>
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.3.0"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.3.0.202506021445"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="4.3.0.202506021445"/>
<unit id="org.eclipse.swtbot.feature.group" version="4.3.0.202506021445"/>
<unit id="org.eclipse.swtbot.forms.feature.group" version="4.3.0.202506021445"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="4.3.0.202506021445"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/cdt/releases/12.3"/>
<unit id="org.eclipse.cdt.launch" version="11.0.200.202512020204"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/lsp4mp/releases/0.16.0/repository/"/>
<unit id="org.eclipse.lsp4mp.jdt.core" version="0.16.0.20251216-1917"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0/"/>
<unit id="org.eclipse.lsp4j" version="0.24.0.v20250131-1745"/>
<unit id="org.eclipse.lsp4j.jsonrpc" version="0.24.0.v20250131-1745"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/jdtls/milestones/1.56.0/repository/"/>
<unit id="org.eclipse.jdt.ls.core" version="1.56.0.202601291528"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/buildship/updates/e427/releases/3.x/3.1.9.v20240115-1636/"/>
<unit id="org.eclipse.buildship.ui" version="3.1.9.v20240115-1636"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4jakarta/releases/0.2.5/repository/"/>
<unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.2.5"/>
</location>
<location includeDependencyDepth="none" includeDependencyScopes="compile" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.14.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.18</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.12.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>5.12.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>3.4</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
</locations>
</target>
2 changes: 1 addition & 1 deletion tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<parent>
<groupId>io.openliberty.tools.eclipse</groupId>
<artifactId>parent</artifactId>
<version>25.0.12-SNAPSHOT</version>
<version>26.0.2-SNAPSHOT</version>
</parent>

<artifactId>io.openliberty.tools.eclipse.tests</artifactId>
Expand Down
Loading