Merge pull request #453 from awisniew90/eclipse-3Q

Eclipse 2023-09 support
OpenLiberty · Oct 17, 2023 · 8edb783 · 8edb783
2 parents bd85dd7 + 32ad078
commit 8edb783
Show file tree

Hide file tree

Showing 4 changed files with 138 additions and 6 deletions.
diff --git a/.github/workflows/run-regression-tests.yml b/.github/workflows/run-regression-tests.yml
@@ -10,7 +10,7 @@ jobs:
       fail-fast: false
       matrix:
         runtime: [ linux, mac, windows ]
-        targetPlatform: [ 2Q2023 ]
+        targetPlatform: [ 3Q2023 ]
         include:
         - runtime: linux
           os: ubuntu-latest

diff --git a/ci/jenkins/run-tests b/ci/jenkins/run-tests
@@ -38,18 +38,18 @@ pipeline {
             }
         }
 
-        stage('Test on Eclipse 2Q2023') {
+        stage('Test on Eclipse 3Q2023') {
             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=2Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e"
+                                sh "mvn clean verify -Dtycho.disableP2Mirrors=true -Declipse.target=3Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e"
                             }
                         } finally {
-                            sh "cd tests/target/surefire-reports && zip -r 2Q2023-test-reports.zip ."
-                            archiveArtifacts artifacts: 'tests/target/surefire-reports/2Q2023-test-reports.zip', fingerprint: true
+                            sh "cd tests/target/surefire-reports && zip -r 3Q2023-test-reports.zip ."
+                            archiveArtifacts artifacts: 'tests/target/surefire-reports/3Q2023-test-reports.zip', fingerprint: true
                         }
                     }
                 }

diff --git a/pom.xml b/pom.xml
@@ -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>2Q2023</eclipse.target>
+        <eclipse.target>3Q2023</eclipse.target>
 
 	</properties>
 

diff --git a/releng/target-platform-3Q2023/target-platform-3Q2023.target b/releng/target-platform-3Q2023/target-platform-3Q2023.target
@@ -0,0 +1,132 @@
+<?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.24.1/"/>
+            <unit id="org.eclipse.lsp4e" version="0.17.1.202308231210"/>
+            <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.3.0/"/>
+            <unit id="org.eclipse.wildwebdeveloper.feature.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <repository location="https://download.eclipse.org/releases/2023-09/"/>
+            <unit id="org.eclipse.jdt.feature.group" version="3.19.200.v20230903-1000"/>
+            <unit id="org.eclipse.ui.trace" version="1.3.100.v20230728-0611"/>
+            <unit id="org.eclipse.emf.sdk.feature.group" version="2.35.0.v20230829-0934"/>
+            <unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.900.v20230808-1403"/>
+            <unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.6.0.20230118-0812"/>
+            <unit id="org.eclipse.platform.sdk" version="4.29.0.I20230903-1000"/>
+            <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.0"/>
+            <unit id="junit-jupiter-engine" version="5.10.0"/>
+        </location>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <repository location="https://download.eclipse.org/releases/2023-09/"/>
+            <unit id="org.eclipse.m2e.lemminx.feature.feature.group" version="0.0.0"/>
+        </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>