Skip to content

Commit

Permalink
24.0.3 release
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 Feb 15, 2024
1 parent 49dcf25 commit 05b484e
Show file tree
Hide file tree
Showing 13 changed files with 146 additions and 25 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: [ 3Q2023 ]
targetPlatform: [ 4Q2023 ]
include:
- runtime: linux
os: ubuntu-latest
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-Copyright: Copyright (c) 2022, 2023 IBM Corporation and others.
Bundle-Copyright: Copyright (c) 2022, 2024 IBM Corporation and others.
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.12.qualifier
Bundle-Version: 24.0.3.qualifier
Bundle-Activator: io.openliberty.tools.eclipse.ls.plugin.LibertyToolsLSPlugin
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: io.openliberty.tools.eclipse.lsp4e
Expand Down
2 changes: 1 addition & 1 deletion bundles/io.openliberty.tools.eclipse.lsp4e/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>23.0.12-SNAPSHOT</version>
<version>24.0.3-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-Copyright: Copyright (c) 2022, 2023 IBM Corporation and others.
Bundle-Copyright: Copyright (c) 2022, 2024 IBM Corporation and others.
Bundle-ManifestVersion: 2
Bundle-Name: Liberty Tools
Bundle-Vendor: Open Liberty
Bundle-SymbolicName: io.openliberty.tools.eclipse.product;singleton:=true
Bundle-Version: 23.0.12.qualifier
Bundle-Version: 24.0.3.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: io.openliberty.tools.eclipse
Bundle-ActivationPolicy: lazy
4 changes: 2 additions & 2 deletions bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-Copyright: Copyright (c) 2022 IBM Corporation and others.
Bundle-Copyright: Copyright (c) 2022, 2024 IBM Corporation and others.
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.12.qualifier
Bundle-Version: 24.0.3.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 3Q2023') {
stage('Test on Eclipse 4Q2023') {
steps {
dir('liberty-tools-eclipse') {
script {
Expand All @@ -48,12 +48,12 @@ pipeline {
sh '''
MVNPATH="$(dirname $(which mvn))/.."
GRADLEPATH="$(dirname $(which gradle))/.."
mvn clean verify -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=3Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e
mvn clean verify -DmvnPath=$MVNPATH -DgradlePath=$GRADLEPATH -Dtycho.disableP2Mirrors=true -Declipse.target=4Q2023 -Dosgi.debug=./tests/resources/ci/debug.opts -DtestAppImportWait=120000 -Dtycho.showEclipseLog -e
'''
}
} finally {
sh "cd tests/target/surefire-reports && zip -r 3Q2023-test-reports.zip ."
archiveArtifacts artifacts: 'tests/target/surefire-reports/3Q2023-test-reports.zip', fingerprint: true
sh "cd tests/target/surefire-reports && zip -r 4Q2023-test-reports.zip ."
archiveArtifacts artifacts: 'tests/target/surefire-reports/4Q2023-test-reports.zip', 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>23.0.12-SNAPSHOT</version>
<version>24.0.3-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="23.0.12.qualifier"
version="24.0.3.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.12.qualifier"
version="24.0.3.qualifier"
unpack="false"/>

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

<plugin
id="io.openliberty.tools.eclipse.product"
download-size="0"
install-size="0"
version="23.0.12.qualifier"
version="24.0.3.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.12-SNAPSHOT</version>
<version>24.0.3-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>3Q2023</eclipse.target>
<eclipse.target>4Q2023</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.12-SNAPSHOT</version>
<version>24.0.3-SNAPSHOT</version>
<file>target-platform-${eclipse.target}</file>
</artifact>
</target>
Expand Down
2 changes: 1 addition & 1 deletion 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.12.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="23.0.12.qualifier">
<feature url="features/io.openliberty.tools.eclipse_24.0.3.qualifier.liberty.jar" id="io.openliberty.tools.eclipse" version="24.0.3.qualifier">
<category name="io.openliberty.tools.eclipse"/>
</feature>

Expand Down
121 changes: 121 additions & 0 deletions releng/target-platform-4Q2023/target-platform-4Q2023.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<?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/2023-12/"/>
<unit id="org.eclipse.jdt.feature.group" version="3.19.300.v20231201-0110"/>
<unit id="org.eclipse.ui.trace" version="1.3.200.v20230913-0603"/>
<unit id="org.eclipse.emf.sdk.feature.group" version="2.36.0.v20231107-0612"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.23.1000.v20231114-0937"/>
<unit id="org.eclipse.m2e.wtp.feature.feature.group" version="1.6.1.20231024-1618"/>
<unit id="org.eclipse.sdk.feature.group" version="4.30.0.v20231201-0512"/>
<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.1"/>
<unit id="junit-jupiter-engine" version="5.10.1"/>
<unit id="org.eclipse.lsp4e" version="0.18.1.202311121506"/>
<unit id="org.eclipse.lsp4e.jdt" version="0.11.0.202301312314"/>
<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.6.20231113-2319"/>
</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.10.0/repository/"/>
<unit id="org.eclipse.lsp4mp.jdt.core" version="0.10.0.20231005-1230"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4jakarta/releases/0.2.0/repository/"/>
<unit id="org.eclipse.lsp4jakarta.jdt.core" version="0.2.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/jdtls/milestones/1.28.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>
</locations>
</target>
4 changes: 2 additions & 2 deletions tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-Copyright: Copyright (c) 2022 IBM Corporation and others.
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: 23.0.12.qualifier
Bundle-Version: 24.0.3.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: 2 additions & 2 deletions 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.12-SNAPSHOT</version>
<version>24.0.3-SNAPSHOT</version>
</parent>

<artifactId>io.openliberty.tools.eclipse.tests</artifactId>
Expand Down Expand Up @@ -62,7 +62,7 @@
<!-- Required for Run As configuration launcher. -->
<requirement>
<type>p2-installable-unit</type>
<id>org.eclipse.platform.sdk</id>
<id>org.eclipse.sdk.feature.group</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
Expand Down

0 comments on commit 05b484e

Please sign in to comment.