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 @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
runtime: [ linux, mac, windows ]
targetPlatform: [ 1Q2026 ]
targetPlatform: [ 2Q2026 ]
include:
- runtime: linux
os: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions NOTICES
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ io.openliberty.tools:liberty-langserver-lemminx | https://mvnrepository.com/arti
org.eclipse.lsp4j:org.eclipse.lsp4j | https://repo1.maven.org/maven2/org/eclipse/lsp4j/org.eclipse.lsp4j/0.14.0/org.eclipse.lsp4j-0.14.0-sources.jar
org.eclipse.lsp4j:org.eclipse.lsp4j.generator | https://mvnrepository.com/artifact/org.eclipse.lsp4j/org.eclipse.lsp4j.generator/0.14.0
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.lsp4jakarta:org.eclipse.lsp4jakarta.ls | https://github.com/eclipse/lsp4jakarta/tree/0.2.6
org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.jdt.core | https://github.com/eclipse/lsp4jakarta/tree/0.2.6
org.eclipse.lsp4mp:org.eclipse.lsp4mp.ls | https://github.com/eclipse/lsp4mp/tree/0.17.0
org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.ls | https://github.com/eclipse/lsp4jakarta/tree/0.2.7
org.eclipse.lsp4jakarta:org.eclipse.lsp4jakarta.jdt.core | https://github.com/eclipse/lsp4jakarta/tree/0.2.7
org.eclipse.lsp4mp:org.eclipse.lsp4mp.ls | https://github.com/eclipse/lsp4mp/tree/0.18.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.macro | https://mvnrepository.com/artifact/org.eclipse.xtend/org.eclipse.xtend.lib.macro/2.24.0
org.eclipse.xtext:org.eclipse.xtext.xbase.lib | https://mvnrepository.com/artifact/org.eclipse.xtext/org.eclipse.xtext.xbase.lib/2.24.0
Expand Down
10 changes: 5 additions & 5 deletions bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@ 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: 26.0.8.qualifier
Bundle-Version: 26.0.9.qualifier
Bundle-Activator: io.openliberty.tools.eclipse.ls.plugin.LibertyToolsLSPlugin
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: io.openliberty.tools.eclipse.lsp4e
Bundle-RequiredExecutionEnvironment: JavaSE-21
Require-Bundle: com.google.gson,
org.eclipse.lsp4mp.jdt.core,
org.eclipse.lsp4jakarta.jdt.core,
org.eclipse.lsp4e;bundle-version="0.19.6",
org.eclipse.lsp4e.jdt;bundle-version="0.14.2",
org.eclipse.lsp4e,
org.eclipse.lsp4e.jdt,
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.jface.text,
org.eclipse.ui.editors,
org.eclipse.lsp4j;bundle-version="[0.24.0,1.0.0)",
org.eclipse.lsp4j.jsonrpc;bundle-version="[0.24.0,1.0.0)",
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc,
org.eclipse.jdt,
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
Expand Down
8 changes: 4 additions & 4 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>26.0.8-SNAPSHOT</version>
<version>26.0.9-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<properties>
<liberty.ls.version>2.4.1</liberty.ls.version>
<jakarta.ls.version>0.2.6</jakarta.ls.version>
<mp.ls.version>0.17.0</mp.ls.version>
<liberty.ls.version>2.4.2</liberty.ls.version>
<jakarta.ls.version>0.2.7</jakarta.ls.version>
<mp.ls.version>0.18.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 @@ -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: 26.0.8.qualifier
Bundle-Version: 26.0.9.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: 26.0.8.qualifier
Bundle-Version: 26.0.9.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
2 changes: 1 addition & 1 deletion bundles/io.openliberty.tools.eclipse.ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>io.openliberty.tools.eclipse</groupId>
<artifactId>parent</artifactId>
<version>26.0.8-SNAPSHOT</version>
<version>26.0.9-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

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 1Q2026') {
stage('Test on Eclipse 2Q2026') {
steps {
dir('liberty-tools-eclipse') {
script {
Expand All @@ -48,13 +48,13 @@ pipeline {
sh '''
MVNPATH="$(dirname $(which mvn))/.."
GRADLEPATH="$(dirname $(which gradle))/.."
mvn clean verify -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=1Q2026 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e -X
mvn clean verify -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=2Q2026 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e -X
'''
}
} finally {
sh "cd tests/target/surefire-reports && zip -r 1Q2026-test-reports.zip ."
sh "cd tests/target/surefire-reports && zip -r 2Q2026-test-reports.zip ."

archiveArtifacts artifacts: 'tests/target/surefire-reports/1Q2026-test-reports.zip', fingerprint: true
archiveArtifacts artifacts: 'tests/target/surefire-reports/2Q2026-test-reports.zip', fingerprint: true
archiveArtifacts artifacts: 'tests/target/work/data/.metadata/.log', fingerprint: true
}
}
Expand Down
1 change: 1 addition & 0 deletions docs/user-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ This guide provides detailed instructions on how to use Liberty Tools for the Ec
| 25.0.12 | 2025-09 - Eclipse v4.37 |
| 26.0.2 | 2025-12 - Eclipse v4.38 |
| 26.0.8 | 2026-03 - Eclipse v4.39 |
| 26.0.9 | 2026-06 - Eclipse v4.40 |

**NOTE:** Tested with each of the `Eclipse IDE for Enterprise Java and Web Developers` and `Eclipse IDE for Java Developers` packages

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
bin.includes = feature.xml, \
feature.properties, \
license.html
license.html, \
p2.inf
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="26.0.8.qualifier"
version="26.0.9.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="26.0.8.qualifier"
version="26.0.9.qualifier"
unpack="false"/>

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

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

<plugin
Expand Down
15 changes: 15 additions & 0 deletions features/io.openliberty.tools.eclipse.feature/p2.inf
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
requires.0.namespace = org.eclipse.equinox.p2.iu
requires.0.name = org.objectweb.asm
requires.0.range = [0.0.0,9.10.1)
requires.1.namespace = org.eclipse.equinox.p2.iu
requires.1.name = org.objectweb.asm.tree
requires.1.range = [0.0.0,9.10.1)
requires.2.namespace = org.eclipse.equinox.p2.iu
requires.2.name = org.objectweb.asm.tree.analysis
requires.2.range = [0.0.0,9.10.1)
requires.3.namespace = org.eclipse.equinox.p2.iu
requires.3.name = org.objectweb.asm.util
requires.3.range = [0.0.0,9.10.1)
requires.4.namespace = org.eclipse.equinox.p2.iu
requires.4.name = org.objectweb.asm.commons
requires.4.range = [0.0.0,9.10.1)
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>26.0.8-SNAPSHOT</version>
<version>26.0.9-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>1Q2026</eclipse.target>
<eclipse.target>2Q2026</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>26.0.8-SNAPSHOT</version>
<version>26.0.9-SNAPSHOT</version>
<file>target-platform-${eclipse.target}</file>
</artifact>
</target>
Expand Down
11 changes: 5 additions & 6 deletions releng/io.openliberty.tools.update/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@
IBM Corporation - initial implementation
-->
<site>
<feature url="features/io.openliberty.tools.eclipse_26.0.8.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="26.0.8.qualifier">
<feature url="features/io.openliberty.tools.eclipse_26.0.9.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="26.0.9.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.58.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.17.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/lsp4e/releases/0.29.5/" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.2.6/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/jdtls/milestones/1.60.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.18.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4j/updates/releases/1.0.0/" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.2.7/repository" enabled="true" />
</site>
119 changes: 119 additions & 0 deletions releng/target-platform-2Q2026/target-platform-2Q2026.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<!--
Copyright (c) 2026 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/2026-06/"/>
<unit id="org.eclipse.jdt.feature.group" version="3.20.600.v20260601-0713"/>
<unit id="org.eclipse.ui.trace" version="1.4.0.v20251230-0845"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.46.0.v20260425-0820"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.2100.v20260515-1403"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.6.1.20231024-1618"/>
<unit id="org.eclipse.sdk.feature.group" version="4.40.0.v20260601-0955"/>
<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.1.0"/>
<unit id="junit-jupiter-engine" version="6.1.0"/>
<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.400.v20260427-1331"/>
<unit id="org.eclipse.jdt.debug" version="3.26.0.v20260418-1439"/>
<unit id="org.eclipse.lsp4e" version="0.19.12.202605060644"/>
<unit id="org.eclipse.lsp4e.jdt" version="0.14.2.202512150839"/>
</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.5"/>
<unit id="org.eclipse.cdt.launch" version="11.0.300.202603111352"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4mp/releases/0.18.0/repository/"/>
<unit id="org.eclipse.lsp4mp.jdt.core" version="0.18.0.20260824-1304"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4j/updates/releases/1.0.0/"/>
<unit id="org.eclipse.lsp4j" version="1.0.0.v20260209-1721"/>
<unit id="org.eclipse.lsp4j.jsonrpc" version="1.0.0.v20260209-1721"/>
<unit id="org.eclipse.lsp4j.debug" version="1.0.0.v20260209-1721"/>
<unit id="org.eclipse.lsp4j.jsonrpc.debug" version="1.0.0.v20260209-1721"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/jdtls/milestones/1.60.0/repository/"/>
<unit id="org.eclipse.jdt.ls.core" version="1.60.0.202606262232"/>
</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.7/repository/"/>
<unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.2.7"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/releases/2026-06/"/>
     <unit id="org.objectweb.asm.util" version="9.9.1" />
     <unit id="org.objectweb.asm.tree" version="9.9.1" />
     <unit id="org.objectweb.asm.commons" version="9.9.1" />
    </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, 2026 IBM Corporation and others.
Bundle-ManifestVersion: 2
Bundle-Name: Tests Plug-in
Bundle-SymbolicName: io.openliberty.tools.eclipse.tests
Bundle-Version: 26.0.8.qualifier
Bundle-Version: 26.0.9.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>26.0.8-SNAPSHOT</version>
<version>26.0.9-SNAPSHOT</version>
</parent>

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