Skip to content

Commit

Permalink
Merge pull request #507 from awisniew90/2Q-target
Browse files Browse the repository at this point in the history
2Q update for Eclipse 2024-03
  • Loading branch information
awisniew90 authored Apr 10, 2024
2 parents c07a562 + ac3febc commit c256b6f
Show file tree
Hide file tree
Showing 13 changed files with 145 additions and 23 deletions.
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: [ 4Q2023 ]
targetPlatform: [ 1Q2024 ]
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: 24.0.3.qualifier
Bundle-Version: 24.0.4.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>24.0.3-SNAPSHOT</version>
<version>24.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<properties>
<liberty.ls.version>2.1.2</liberty.ls.version>
<jakarta.ls.version>0.2.1</jakarta.ls.version>
<mp.ls.version>0.10.0</mp.ls.version>
<mp.ls.version>0.11.3</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: 24.0.3.qualifier
Bundle-Version: 24.0.4.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
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: 24.0.3.qualifier
Bundle-Version: 24.0.4.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 4Q2023') {
stage('Test on Eclipse 1Q2024') {
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=4Q2023 -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=1Q2024 -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 4Q2023-test-reports.zip ."
sh "cd tests/target/surefire-reports && zip -r 1Q2024-test-reports.zip ."

archiveArtifacts artifacts: 'tests/target/surefire-reports/4Q2023-test-reports.zip', fingerprint: true
archiveArtifacts artifacts: 'tests/target/surefire-reports/1Q2024-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
2 changes: 1 addition & 1 deletion ci/scans/dependency-only-mend-pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>io.openliberty.tools.eclipse</groupId>
<artifactId>parent</artifactId>
<version>24.0.3-SNAPSHOT</version>
<version>24.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

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="24.0.3.qualifier"
version="24.0.4.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="24.0.3.qualifier"
version="24.0.4.qualifier"
unpack="false"/>

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

<plugin
id="io.openliberty.tools.eclipse.product"
download-size="0"
install-size="0"
version="24.0.3.qualifier"
version="24.0.4.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>24.0.3-SNAPSHOT</version>
<version>24.0.4-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>4Q2023</eclipse.target>
<eclipse.target>1Q2024</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>24.0.3-SNAPSHOT</version>
<version>24.0.4-SNAPSHOT</version>
<file>target-platform-${eclipse.target}</file>
</artifact>
</target>
Expand Down
6 changes: 3 additions & 3 deletions releng/io.openliberty.tools.update/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
IBM Corporation - initial implementation
-->
<site>
<feature url="features/io.openliberty.tools.eclipse_24.0.3.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="24.0.3.qualifier">
<feature url="features/io.openliberty.tools.eclipse_24.0.4.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="24.0.4.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.28.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.10.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/jdtls/milestones/1.34.0/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4mp/releases/0.11.3/repository" enabled="true" />
<repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.2.1/repository" enabled="true" />
</site>
122 changes: 122 additions & 0 deletions releng/target-platform-1Q2024/target-platform-1Q2024.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<!--
Copyright (c) 2024 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/2024-03/"/>
<unit id="org.eclipse.jdt.feature.group" version="3.19.400.v20240229-0520"/>
<unit id="org.eclipse.ui.trace" version="1.3.300.v20231215-1019"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.37.0.v20240203-1010"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1100.v20240218-1855"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.6.1.20231024-1618"/>
<unit id="org.eclipse.sdk.feature.group" version="4.31.0.v20240229-1022"/>
<unit id="org.hamcrest.core" version="2.2.0.v20230809-1000"/>
<unit id="org.junit" version="4.13.2.v20230809-1000"/>
<unit id="junit-jupiter-api" version="5.10.2"/>
<unit id="junit-jupiter-engine" version="5.10.2"/>
<unit id="org.eclipse.lsp4e" version="0.18.6.202403050753"/>
<unit id="org.eclipse.lsp4e.jdt" version="0.13.0.202402070603"/>
<unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="1.3.3.202311211923"/>
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="1.3.1.202310310352"/>
<unit id="org.eclipse.m2e.lemminx.feature.feature.group" version="2.0.600.20240219-1707"/>
</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/3.1.0"/>
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="3.1.0.202106041005"/>
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="3.1.0.202106041005"/>
<unit id="org.eclipse.swtbot.feature.group" version="3.1.0.202106041005"/>
<unit id="org.eclipse.swtbot.forms.feature.group" version="3.1.0.202106041005"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="3.1.0.202106041005"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/cdt/releases/10.6"/>
<unit id="org.eclipse.cdt.launch" version="10.3.200.202201122357"/>
<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.cdtserial.feature.source.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.local.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.local.feature.source.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.remote.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.remote.feature.source.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.ssh.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.ssh.feature.source.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.telnet.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.connector.telnet.feature.source.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.control.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.control.feature.source.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.feature.source.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.view.feature.feature.group" version="10.6.2.202205081303"/>
<unit id="org.eclipse.tm.terminal.view.feature.source.feature.group" version="10.6.2.202205081303"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="http://download.eclipse.org/lsp4mp/releases/0.11.3/repository/"/>
<unit id="org.eclipse.lsp4mp.jdt.core" version="0.11.3.20240201-2107"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4jakarta/releases/0.2.1/repository/"/>
<unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.2.1"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/jdtls/milestones/1.34.0/repository/"/>
<unit id="org.eclipse.jdt.ls.core" version="0.0.0"/>
</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 includeDependencyDepth="none" includeDependencyScopes="compile" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy-agent</artifactId>
<version>1.12.17</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.12.17</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.8.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>4.8.1</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
<version>3.3</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, 2024 IBM Corporation and others.
Bundle-ManifestVersion: 2
Bundle-Name: Tests Plug-in
Bundle-SymbolicName: io.openliberty.tools.eclipse.tests
Bundle-Version: 24.0.3.qualifier
Bundle-Version: 24.0.4.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: junit-jupiter-api;bundle-version="[5.8.0,6.0.0)",
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>24.0.3-SNAPSHOT</version>
<version>24.0.4-SNAPSHOT</version>
</parent>

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

0 comments on commit c256b6f

Please sign in to comment.