Skip to content

Commit cda863f

Browse files
awisniew90awisniew90
authored
Merge pull request #593 from awisniew90/2509-release
2509 release
2 parents 8be95d7 + 0e25cab commit cda863f

File tree

12 files changed

+130
-19
lines changed

12 files changed

+130
-19
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
fail-fast: false
1111
matrix:
1212
runtime: [ linux, mac, windows ]
13-
targetPlatform: [ 1Q2025 ]
13+
targetPlatform: [ 2Q2025 ]
1414
include:
1515
- runtime: linux
1616
os: ubuntu-latest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: Liberty Tools Support for Language Servers
55
Bundle-Vendor: Open Liberty
66
Bundle-SymbolicName: io.openliberty.tools.eclipse.lsp4e;singleton:=true
7-
Bundle-Version: 25.0.6.qualifier
7+
Bundle-Version: 25.0.9.qualifier
88
Bundle-Activator: io.openliberty.tools.eclipse.ls.plugin.LibertyToolsLSPlugin
99
Bundle-ActivationPolicy: lazy
1010
Automatic-Module-Name: io.openliberty.tools.eclipse.lsp4e

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>io.openliberty.tools.eclipse</groupId>
2222
<artifactId>parent</artifactId>
23-
<version>25.0.6-SNAPSHOT</version>
23+
<version>25.0.9-SNAPSHOT</version>
2424
<relativePath>../../pom.xml</relativePath>
2525
</parent>
2626

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: Liberty Tools
55
Bundle-Vendor: Open Liberty
66
Bundle-SymbolicName: io.openliberty.tools.eclipse.product;singleton:=true
7-
Bundle-Version: 25.0.6.qualifier
7+
Bundle-Version: 25.0.9.qualifier
88
Bundle-RequiredExecutionEnvironment: JavaSE-21
99
Automatic-Module-Name: io.openliberty.tools.eclipse
1010
Bundle-ActivationPolicy: lazy

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: Liberty Tools UI
55
Bundle-Vendor: Open Liberty
66
Bundle-SymbolicName: io.openliberty.tools.eclipse.ui;singleton:=true
7-
Bundle-Version: 25.0.6.qualifier
7+
Bundle-Version: 25.0.9.qualifier
88
Bundle-Activator: io.openliberty.tools.eclipse.LibertyDevPlugin
99
Export-Package: io.openliberty.tools.eclipse;x-friends:="io.openliberty.tools.eclipse.tests",
1010
io.openliberty.tools.eclipse.debug;x-friends:="io.openliberty.tools.eclipse.tests",

‎ci/jenkins/run-tests‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pipeline {
3838
}
3939
}
4040

41-
stage('Test on Eclipse 1Q2025') {
41+
stage('Test on Eclipse 2Q2025') {
4242
steps {
4343
dir('liberty-tools-eclipse') {
4444
script {
@@ -48,16 +48,16 @@ pipeline {
4848
sh '''
4949
MVNPATH="$(dirname $(which mvn))/.."
5050
GRADLEPATH="$(dirname $(which gradle))/.."
51-
mvn clean verify -DmvnLogFile -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=1Q2025 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e -X
51+
mvn clean verify -DmvnLogFile -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=2Q2025 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e -X
5252
'''
5353
}
5454
} finally {
5555
sh "find tests -type f -name \"lte-dev-mode-output-*.log\""
5656
sh "mkdir lte-dev-mode-output-logs && find tests -type f -name \"lte-dev-mode-output-*.log\" -exec cp {} lte-dev-mode-output-logs \\;"
5757
sh "zip -r lte-dev-mode-output-logs.zip lte-dev-mode-output-logs"
58-
sh "cd tests/target/surefire-reports && zip -r 1Q2025-test-reports.zip ."
58+
sh "cd tests/target/surefire-reports && zip -r 2Q2025-test-reports.zip ."
5959

60-
archiveArtifacts artifacts: 'tests/target/surefire-reports/1Q2025-test-reports.zip', fingerprint: true
60+
archiveArtifacts artifacts: 'tests/target/surefire-reports/2Q2025-test-reports.zip', fingerprint: true
6161
archiveArtifacts artifacts: 'lte-dev-mode-output-logs.zip', fingerprint: true
6262
archiveArtifacts artifacts: 'tests/target/work/data/.metadata/.log', fingerprint: true
6363
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<feature
1515
id="io.openliberty.tools.eclipse"
1616
label="%featureName"
17-
version="25.0.6.qualifier"
17+
version="25.0.9.qualifier"
1818
plugin="io.openliberty.tools.eclipse.product"
1919
provider-name="%providerName">
2020

@@ -28,21 +28,21 @@
2828
id="io.openliberty.tools.eclipse.ui"
2929
download-size="0"
3030
install-size="0"
31-
version="25.0.6.qualifier"
31+
version="25.0.9.qualifier"
3232
unpack="false"/>
3333

3434
<plugin
3535
id="io.openliberty.tools.eclipse.lsp4e"
3636
download-size="0"
3737
install-size="0"
38-
version="25.0.6.qualifier"
38+
version="25.0.9.qualifier"
3939
unpack="false"/>
4040

4141
<plugin
4242
id="io.openliberty.tools.eclipse.product"
4343
download-size="0"
4444
install-size="0"
45-
version="25.0.6.qualifier"
45+
version="25.0.9.qualifier"
4646
unpack="false"/>
4747

4848
</feature>

‎pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<modelVersion>4.0.0</modelVersion>
1616
<groupId>io.openliberty.tools.eclipse</groupId>
1717
<artifactId>parent</artifactId>
18-
<version>25.0.6-SNAPSHOT</version>
18+
<version>25.0.9-SNAPSHOT</version>
1919
<packaging>pom</packaging>
2020
<licenses>
2121
<license>
@@ -42,7 +42,7 @@
4242

4343
<!-- default version of the eclipse IDE to run tests against -->
4444
<!-- must be one of the target platform files defined in this project under releng -->
45-
<eclipse.target>1Q2025</eclipse.target>
45+
<eclipse.target>2Q2025</eclipse.target>
4646

4747
</properties>
4848

@@ -196,7 +196,7 @@
196196
<artifact>
197197
<groupId>io.openliberty.tools.eclipse</groupId>
198198
<artifactId>target-platform-${eclipse.target}</artifactId>
199-
<version>25.0.6-SNAPSHOT</version>
199+
<version>25.0.9-SNAPSHOT</version>
200200
<file>target-platform-${eclipse.target}</file>
201201
</artifact>
202202
</target>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
IBM Corporation - initial implementation
1313
-->
1414
<site>
15-
<feature url="features/io.openliberty.tools.eclipse_25.0.6.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="25.0.6.qualifier">
15+
<feature url="features/io.openliberty.tools.eclipse_25.0.9.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="25.0.9.qualifier">
1616
<category name="io.openliberty.tools.eclipse"/>
1717
</feature>
1818

‎releng/target-platform-2Q2025/target-platform-2Q2025.target‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<?pde version="3.8"?>
3+
<!--
4+
Copyright (c) 2025 IBM Corporation and others.
5+
6+
This program and the accompanying materials are made available under the
7+
terms of the Eclipse Public License v. 2.0 which is available at
8+
http://www.eclipse.org/legal/epl-2.0.
9+
10+
SPDX-License-Identifier: EPL-2.0
11+
12+
Contributors:
13+
IBM Corporation - initial implementation
14+
--><target includeMode="feature" name="target-platform.target" sequenceNumber="16">
15+
<locations>
16+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
17+
<repository location="https://download.eclipse.org/releases/2025-06/"/>
18+
<unit id="org.eclipse.jdt.feature.group" version="3.20.200.v20250528-1830"/>
19+
<unit id="org.eclipse.ui.trace" version="1.3.500.v20250320-0611"/>
20+
<unit id="org.eclipse.emf.sdk.feature.group" version="2.42.0.v20250415-0852"/>
21+
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1700.v20250526-2018"/>
22+
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.6.1.20231024-1618"/>
23+
<unit id="org.eclipse.sdk.feature.group" version="4.36.0.v20250528-2229"/>
24+
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
25+
<unit id="org.junit" version="4.13.2.v20240929-1000"/>
26+
<unit id="junit-jupiter-api" version="5.12.2"/>
27+
<unit id="junit-jupiter-engine" version="5.12.2"/>
28+
<unit id="org.eclipse.lsp4e" version="0.18.20.202505071137"/>
29+
<unit id="org.eclipse.lsp4e.jdt" version="0.13.6.202504300423"/>
30+
<unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="1.3.9.202411190713"/>
31+
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="1.3.6.202409052135"/>
32+
<unit id="org.eclipse.m2e.lemminx.feature.feature.group" version="2.6.100.20250514-0352"/>
33+
<unit id="org.eclipse.jdt.debug.ui" version="3.15.0.v20250516-0336"/>
34+
<unit id="org.eclipse.jdt.debug" version="3.23.0.v20250516-0336"/>
35+
</location>
36+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
37+
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
38+
<unit id="ch.qos.logback.slf4j" version="1.2.3.v20200428-2012"/>
39+
<unit id="ch.qos.logback.slf4j.source" version="1.2.3.v20200428-2012"/>
40+
<unit id="org.slf4j.api" version="1.7.30.v20200204-2150"/>
41+
<unit id="org.slf4j.api.source" version="1.7.30.v20200204-2150"/>
42+
</location>
43+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
44+
<repository location="https://download.eclipse.org/technology/swtbot/releases/4.2.1"/>
45+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.2.1.202406141605"/>
46+
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="4.2.1.202406141605"/>
47+
<unit id="org.eclipse.swtbot.feature.group" version="4.2.1.202406141605"/>
48+
<unit id="org.eclipse.swtbot.forms.feature.group" version="4.2.1.202406141605"/>
49+
<unit id="org.eclipse.swtbot.ide.feature.group" version="4.2.1.202406141605"/>
50+
</location>
51+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
52+
<repository location="https://download.eclipse.org/tools/cdt/releases/11.6"/>
53+
<unit id="org.eclipse.cdt.launch" version="10.4.400.202402230238"/>
54+
</location>
55+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
56+
<repository location="http://download.eclipse.org/lsp4mp/releases/0.13.2/repository/"/>
57+
<unit id="org.eclipse.lsp4mp.jdt.core" version="0.13.2.20241022-1352"/>
58+
</location>
59+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
60+
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.24.0/"/>
61+
<unit id="org.eclipse.lsp4j" version="0.0.0"/>
62+
<unit id="org.eclipse.lsp4j.jsonrpc" version="0.0.0"/>
63+
</location>
64+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
65+
<repository location="https://download.eclipse.org/jdtls/milestones/1.42.0/repository/"/>
66+
<unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>
67+
</location>
68+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
69+
<repository location="https://download.eclipse.org/buildship/updates/e427/releases/3.x/3.1.9.v20240115-1636/"/>
70+
<unit id="org.eclipse.buildship.ui" version="3.1.9.v20240115-1636"/>
71+
</location>
72+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
73+
<repository location="https://download.eclipse.org/lsp4jakarta/releases/0.2.3/repository/"/>
74+
<unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.2.3"/>
75+
</location>
76+
<location includeDependencyDepth="none" includeDependencyScopes="compile" missingManifest="generate" type="Maven">
77+
<dependencies>
78+
<dependency>
79+
<groupId>net.bytebuddy</groupId>
80+
<artifactId>byte-buddy-agent</artifactId>
81+
<version>1.14.18</version>
82+
<type>jar</type>
83+
</dependency>
84+
<dependency>
85+
<groupId>net.bytebuddy</groupId>
86+
<artifactId>byte-buddy</artifactId>
87+
<version>1.14.18</version>
88+
<type>jar</type>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.mockito</groupId>
92+
<artifactId>mockito-core</artifactId>
93+
<version>5.12.0</version>
94+
<type>jar</type>
95+
</dependency>
96+
<dependency>
97+
<groupId>org.mockito</groupId>
98+
<artifactId>mockito-junit-jupiter</artifactId>
99+
<version>5.12.0</version>
100+
<type>jar</type>
101+
</dependency>
102+
<dependency>
103+
<groupId>org.objenesis</groupId>
104+
<artifactId>objenesis</artifactId>
105+
<version>3.4</version>
106+
<type>jar</type>
107+
</dependency>
108+
</dependencies>
109+
</location>
110+
</locations>
111+
</target>

0 commit comments

Comments
 (0)