Skip to content

Commit

Permalink
2023-06 IDE support
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Wisniewski <[email protected]>
  • Loading branch information
Adam Wisniewski authored and Adam Wisniewski committed Sep 6, 2023
1 parent 2fb4b6b commit 0488cb5
Show file tree
Hide file tree
Showing 16 changed files with 176 additions and 30 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: [ 1Q2023 ]
targetPlatform: [ 2Q2023 ]
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: 23.0.8.qualifier
Bundle-Version: 23.0.9.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,12 +20,12 @@
<parent>
<groupId>io.openliberty.tools.eclipse</groupId>
<artifactId>parent</artifactId>
<version>23.0.8-SNAPSHOT</version>
<version>23.0.9-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<properties>
<liberty.ls.version>1.0</liberty.ls.version>
<liberty.ls.version>2.0.1</liberty.ls.version>
<jakarta.ls.version>0.1.1</jakarta.ls.version>
<mp.ls.version>0.7.0</mp.ls.version>
</properties>
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: 23.0.8.qualifier
Bundle-Version: 23.0.9.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: 23.0.8.qualifier
Bundle-Version: 23.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.ui.dashboard;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,18 +38,18 @@ pipeline {
}
}

stage('Test on Eclipse 1Q2023') {
stage('Test on Eclipse 2Q2023') {
steps {
dir('liberty-tools-eclipse') {
script {
try {
wrap([$class: 'Xvfb', installationName: 'gui-test', autoDisplayName: true, debug: true, parallelBuild: true, screen: '1680x1050x24']) {
sh "metacity --sm-disable --replace &"
sh "mvn clean verify -Dtycho.disableP2Mirrors=true -Declipse.target=1Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DmvnImportWait=60000 -Dtycho.showEclipseLog -e"
sh "mvn clean verify -Dtycho.disableP2Mirrors=true -Declipse.target=2Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DmvnImportWait=60000 -Dtycho.showEclipseLog -e"
}
} finally {
sh "cd tests/target/surefire-reports && zip -r 1Q2023-test-reports.zip ."
archiveArtifacts artifacts: 'tests/target/surefire-reports/1Q2023-test-reports.zip', fingerprint: true
sh "cd tests/target/surefire-reports && zip -r 2Q2023-test-reports.zip ."
archiveArtifacts artifacts: 'tests/target/surefire-reports/2Q2023-test-reports.zip', 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="23.0.8.qualifier"
version="23.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="23.0.8.qualifier"
version="23.0.9.qualifier"
unpack="false"/>

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

<plugin
id="io.openliberty.tools.eclipse.product"
download-size="0"
install-size="0"
version="23.0.8.qualifier"
version="23.0.9.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>23.0.8-SNAPSHOT</version>
<version>23.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>1Q2023</eclipse.target>
<eclipse.target>2Q2023</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>23.0.8-SNAPSHOT</version>
<version>23.0.9-SNAPSHOT</version>
<file>target-platform-${eclipse.target}</file>
</artifact>
</target>
Expand Down
4 changes: 2 additions & 2 deletions releng/io.openliberty.tools.update/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
IBM Corporation - initial implementation
-->
<site>
<feature url="features/io.openliberty.tools.eclipse_23.0.8.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="23.0.8.qualifier">
<feature url="features/io.openliberty.tools.eclipse_23.0.9.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="23.0.9.qualifier">
<category name="io.openliberty.tools.eclipse" />
</feature>

Expand All @@ -24,7 +24,7 @@
<repository-reference location="https://download.eclipse.org/lsp4jakarta/releases/0.1.1/repository" enabled="true" />

<!-- Dependencies -->
<bundle id="org.eclipse.ui.trace" version="1.2.200.v20220310-2159">
<bundle id="org.eclipse.ui.trace" version="1.3.0.v20230515-0022">
<category name="io.openliberty.tools.eclipse" />
</bundle>
</site>
127 changes: 127 additions & 0 deletions releng/target-platform-2Q2023/target-platform-2Q2023.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<!--
Copyright (c) 2023 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="15">
<locations>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<!-- Matches level from category.xml -->
<repository location="https://download.eclipse.org/lsp4e/releases/0.23.0/"/>
<unit id="org.eclipse.lsp4e" version="0.16.1.202305241229"/>
<unit id="org.eclipse.lsp4e.jdt" version="0.11.0.202301312314"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.1.0/"/>
<unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="1.1.0.202305041915"/>
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="1.1.0.202304242122"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/releases/2023-06/"/>
<unit id="org.eclipse.jdt.feature.group" version="3.19.100.v20230605-0440"/>
<unit id="org.eclipse.ui.trace" version="1.3.0.v20230515-0022"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.34.0.v20230406-1334"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.800.v20230523-2142"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.6.0.20230118-0812"/>
<unit id="org.eclipse.platform.sdk" version="4.28.0.I20230605-0440"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
<unit id="junit-jupiter-api" version="5.9.3"/>
<unit id="junit-jupiter-engine" version="5.9.3"/>
</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.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.7.0/repository/"/>
<unit id="org.eclipse.lsp4mp.jdt.core" version="0.7.0.20230403-1449"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/jdtls/milestones/1.25.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/e423/releases/3.x/3.1.6.v20220511-1359/"/>
<unit id="org.eclipse.buildship.ui" version="3.1.6.v20220511-1359"/>
</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>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4jakarta/releases/0.1.1/repository"/>
<unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.0"/>
</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 IBM Corporation and others.
Bundle-ManifestVersion: 2
Bundle-Name: Tests Plug-in
Bundle-SymbolicName: io.openliberty.tools.eclipse.tests
Bundle-Version: 23.0.8.qualifier
Bundle-Version: 23.0.9.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: junit-jupiter-api;bundle-version="[5.8.0,6.0.0)",
org.eclipse.ui,
Expand Down
4 changes: 3 additions & 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>23.0.8-SNAPSHOT</version>
<version>23.0.9-SNAPSHOT</version>
</parent>

<artifactId>io.openliberty.tools.eclipse.tests</artifactId>
Expand All @@ -38,6 +38,7 @@
<useUIThread>false</useUIThread>
<providerHint>junit5</providerHint>
<trimStackTrace>false</trimStackTrace>
<runOrder>alphabetical</runOrder>
<!--
<runOrder>alphabetical</runOrder>
-->
Expand Down Expand Up @@ -126,6 +127,7 @@
<version>${tycho-version}</version>
<configuration>
<argLine>-XstartOnFirstThread</argLine>
<runOrder>alphabetical</runOrder>
</configuration>
</plugin>
</plugins>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@
*******************************************************************************/
package io.openliberty.tools.eclipse.test.it;

import static io.openliberty.tools.eclipse.test.it.utils.SWTBotPluginOperations.openDashboardUsingToolbar;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer.MethodName;
import org.junit.jupiter.api.Test;

import static io.openliberty.tools.eclipse.test.it.utils.SWTBotPluginOperations.*;
import org.junit.jupiter.api.TestMethodOrder;

/**
* Tests Open Liberty Eclipse plugin functions.
*/
@TestMethodOrder(MethodName.class)
public class LibertyPluginSWTBotDashboardTest extends AbstractLibertyPluginSWTBotTest {

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer.MethodName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;

import io.openliberty.tools.eclipse.CommandBuilder;
import io.openliberty.tools.eclipse.CommandBuilder.CommandNotFoundException;
Expand All @@ -80,6 +82,7 @@
/**
* Tests Open Liberty Eclipse plugin functions.
*/
@TestMethodOrder(MethodName.class)
public class LibertyPluginSWTBotGradleTest extends AbstractLibertyPluginSWTBotTest {

/**
Expand Down Expand Up @@ -193,13 +196,16 @@ public static final void validateBeforeTestRun() {

// Check that dashboard contains the expected applications.
boolean foundApp = false;
boolean foundWrapperApp = false;
for (String project : projectList) {
if (GRADLE_APP_NAME.equals(project)) {
foundApp = true;
break;
} else if (GRADLE_WRAPPER_APP_NAME.equals(project)) {
foundWrapperApp = true;
}
}
Assertions.assertTrue(foundApp, () -> "The dashboard does not contain expected application: " + GRADLE_APP_NAME);
Assertions.assertTrue(foundWrapperApp, () -> "The dashboard does not contain expected application: " + GRADLE_WRAPPER_APP_NAME);

// Check that the menu for the expected application contains the required actions.
List<String> menuItems = getDashboardItemMenuActions(GRADLE_APP_NAME);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.MethodOrderer.MethodName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;

import io.openliberty.tools.eclipse.CommandBuilder;
import io.openliberty.tools.eclipse.CommandBuilder.CommandNotFoundException;
Expand All @@ -78,6 +80,7 @@
/**
* Tests Open Liberty Eclipse plugin functions.
*/
@TestMethodOrder(MethodName.class)
public class LibertyPluginSWTBotMavenTest extends AbstractLibertyPluginSWTBotTest {

/**
Expand Down
Loading

0 comments on commit 0488cb5

Please sign in to comment.