From 60463f8b232ba21502ddde24bb7f8da7fd8dd97c Mon Sep 17 00:00:00 2001 From: Adam Wisniewski Date: Thu, 4 Apr 2024 11:54:57 -0400 Subject: [PATCH] Update for Eclipse 2024-03 Signed-off-by: Adam Wisniewski --- .github/workflows/run-regression-tests.yml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../pom.xml | 4 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- ci/jenkins/run-tests | 8 +- ci/scans/dependency-only-mend-pom.xml | 2 +- .../feature.xml | 8 +- pom.xml | 6 +- .../io.openliberty.tools.update/category.xml | 6 +- .../target-platform-1Q2024.target | 122 ++++++++++++++++++ tests/META-INF/MANIFEST.MF | 2 +- tests/pom.xml | 2 +- 13 files changed, 145 insertions(+), 23 deletions(-) create mode 100644 releng/target-platform-1Q2024/target-platform-1Q2024.target diff --git a/.github/workflows/run-regression-tests.yml b/.github/workflows/run-regression-tests.yml index 8dff78b3..6738e29c 100644 --- 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: [ 4Q2023 ] + targetPlatform: [ 1Q2024 ] include: - runtime: linux os: ubuntu-latest diff --git a/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF b/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF index 0e4bfc27..a938b1b3 100644 --- a/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF +++ b/bundles/io.openliberty.tools.eclipse.lsp4e/META-INF/MANIFEST.MF @@ -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 diff --git a/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml b/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml index b7e1d47d..bb72e6e3 100644 --- a/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml +++ b/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml @@ -20,14 +20,14 @@ io.openliberty.tools.eclipse parent - 24.0.3-SNAPSHOT + 24.0.4-SNAPSHOT ../../pom.xml 2.1.2 0.2.1 - 0.10.0 + 0.11.3 io.openliberty.tools.eclipse.lsp4e diff --git a/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF b/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF index 1cee9603..3367cb4b 100644 --- a/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF +++ b/bundles/io.openliberty.tools.eclipse.product/META-INF/MANIFEST.MF @@ -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 diff --git a/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF b/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF index f7243b8e..79bc5d43 100644 --- a/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF +++ b/bundles/io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF @@ -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", diff --git a/ci/jenkins/run-tests b/ci/jenkins/run-tests index bdf20d04..1a2e333b 100644 --- a/ci/jenkins/run-tests +++ b/ci/jenkins/run-tests @@ -38,7 +38,7 @@ pipeline { } } - stage('Test on Eclipse 4Q2023') { + stage('Test on Eclipse 1Q2024') { steps { dir('liberty-tools-eclipse') { script { @@ -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 } diff --git a/ci/scans/dependency-only-mend-pom.xml b/ci/scans/dependency-only-mend-pom.xml index f1e21ffd..607cf6da 100644 --- a/ci/scans/dependency-only-mend-pom.xml +++ b/ci/scans/dependency-only-mend-pom.xml @@ -24,7 +24,7 @@ io.openliberty.tools.eclipse parent - 24.0.3-SNAPSHOT + 24.0.4-SNAPSHOT ../../pom.xml diff --git a/features/io.openliberty.tools.eclipse.feature/feature.xml b/features/io.openliberty.tools.eclipse.feature/feature.xml index 7785b54c..44072de4 100644 --- a/features/io.openliberty.tools.eclipse.feature/feature.xml +++ b/features/io.openliberty.tools.eclipse.feature/feature.xml @@ -14,7 +14,7 @@ @@ -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"/> diff --git a/pom.xml b/pom.xml index 57b3f40a..b3f937c8 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 io.openliberty.tools.eclipse parent - 24.0.3-SNAPSHOT + 24.0.6-SNAPSHOT pom @@ -42,7 +42,7 @@ - 4Q2023 + 1Q2024 @@ -196,7 +196,7 @@ io.openliberty.tools.eclipse target-platform-${eclipse.target} - 24.0.3-SNAPSHOT + 24.0.6-SNAPSHOT target-platform-${eclipse.target} diff --git a/releng/io.openliberty.tools.update/category.xml b/releng/io.openliberty.tools.update/category.xml index ff2b9644..608725fd 100644 --- a/releng/io.openliberty.tools.update/category.xml +++ b/releng/io.openliberty.tools.update/category.xml @@ -12,13 +12,13 @@ IBM Corporation - initial implementation --> - + - - + + diff --git a/releng/target-platform-1Q2024/target-platform-1Q2024.target b/releng/target-platform-1Q2024/target-platform-1Q2024.target new file mode 100644 index 00000000..8d27c023 --- /dev/null +++ b/releng/target-platform-1Q2024/target-platform-1Q2024.target @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + net.bytebuddy + byte-buddy-agent + 1.12.17 + jar + + + net.bytebuddy + byte-buddy + 1.12.17 + jar + + + org.mockito + mockito-core + 4.8.1 + jar + + + org.mockito + mockito-junit-jupiter + 4.8.1 + jar + + + org.objenesis + objenesis + 3.3 + jar + + + + + diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index 8218333b..a41ede86 100644 --- a/tests/META-INF/MANIFEST.MF +++ b/tests/META-INF/MANIFEST.MF @@ -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, diff --git a/tests/pom.xml b/tests/pom.xml index 491c5322..8f65c357 100755 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -17,7 +17,7 @@ io.openliberty.tools.eclipse parent - 24.0.3-SNAPSHOT + 24.0.4-SNAPSHOT io.openliberty.tools.eclipse.tests