From 86523039c39ca220158e7a6ecc5966379a4918ff Mon Sep 17 00:00:00 2001 From: Adam Wisniewski Date: Wed, 20 Nov 2024 12:54:48 -0500 Subject: [PATCH 1/4] Update versions to 24.0.12 Signed-off-by: Adam Wisniewski --- .../META-INF/MANIFEST.MF | 2 +- bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../io.openliberty.tools.eclipse.ui/META-INF/MANIFEST.MF | 2 +- ci/scans/dependency-only-mend-pom.xml | 2 +- features/io.openliberty.tools.eclipse.feature/feature.xml | 8 ++++---- pom.xml | 4 ++-- releng/io.openliberty.tools.update/category.xml | 2 +- tests/META-INF/MANIFEST.MF | 2 +- tests/pom.xml | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) 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 aa57dbc9..cf72c6b1 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.9.qualifier +Bundle-Version: 24.0.12.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 29f6088d..3d727ea6 100644 --- a/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml +++ b/bundles/io.openliberty.tools.eclipse.lsp4e/pom.xml @@ -20,7 +20,7 @@ io.openliberty.tools.eclipse parent - 24.0.9-SNAPSHOT + 24.0.12-SNAPSHOT ../../pom.xml 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 7e873609..d89e19a3 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.9.qualifier +Bundle-Version: 24.0.12.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 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 1844f087..bcccd999 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.9.qualifier +Bundle-Version: 24.0.12.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/scans/dependency-only-mend-pom.xml b/ci/scans/dependency-only-mend-pom.xml index a641b351..2e88f2e0 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.9-SNAPSHOT + 24.0.12-SNAPSHOT ../../pom.xml diff --git a/features/io.openliberty.tools.eclipse.feature/feature.xml b/features/io.openliberty.tools.eclipse.feature/feature.xml index be75551a..f3f77d5c 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.9.qualifier" + version="24.0.12.qualifier" unpack="false"/> diff --git a/pom.xml b/pom.xml index 1a366a58..7f6ce947 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ 4.0.0 io.openliberty.tools.eclipse parent - 24.0.9-SNAPSHOT + 24.0.12-SNAPSHOT pom @@ -196,7 +196,7 @@ io.openliberty.tools.eclipse target-platform-${eclipse.target} - 24.0.9-SNAPSHOT + 24.0.12-SNAPSHOT target-platform-${eclipse.target} diff --git a/releng/io.openliberty.tools.update/category.xml b/releng/io.openliberty.tools.update/category.xml index 9ad890e1..ce26c4d1 100644 --- a/releng/io.openliberty.tools.update/category.xml +++ b/releng/io.openliberty.tools.update/category.xml @@ -12,7 +12,7 @@ IBM Corporation - initial implementation --> - + diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index e775005e..8b082bb4 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.9.qualifier +Bundle-Version: 24.0.12.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 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 97270efe..ce424f6b 100755 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -17,7 +17,7 @@ io.openliberty.tools.eclipse parent - 24.0.9-SNAPSHOT + 24.0.12-SNAPSHOT io.openliberty.tools.eclipse.tests From b79d276abcade364ae1e623d11e631350ec5dc66 Mon Sep 17 00:00:00 2001 From: Adam Wisniewski Date: Wed, 20 Nov 2024 12:58:22 -0500 Subject: [PATCH 2/4] Create target platform for 3q2024 Signed-off-by: Adam Wisniewski --- .../target-platform-3Q2024.target | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 releng/target-platform-3Q2024/target-platform-3Q2024.target diff --git a/releng/target-platform-3Q2024/target-platform-3Q2024.target b/releng/target-platform-3Q2024/target-platform-3Q2024.target new file mode 100644 index 00000000..83ac292e --- /dev/null +++ b/releng/target-platform-3Q2024/target-platform-3Q2024.target @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + net.bytebuddy + byte-buddy-agent + 1.14.18 + jar + + + net.bytebuddy + byte-buddy + 1.14.18 + jar + + + org.mockito + mockito-core + 5.12.0 + jar + + + org.mockito + mockito-junit-jupiter + 5.12.0 + jar + + + org.objenesis + objenesis + 3.4 + jar + + + + + From b17805ac548ef8b0dd41f50a006f5a7f4db77091 Mon Sep 17 00:00:00 2001 From: Adam Wisniewski Date: Wed, 20 Nov 2024 13:13:05 -0500 Subject: [PATCH 3/4] Update default test platform Signed-off-by: Adam Wisniewski --- .github/workflows/run-regression-tests.yml | 2 +- ci/jenkins/run-tests | 8 ++++---- pom.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/run-regression-tests.yml b/.github/workflows/run-regression-tests.yml index 77c43b43..c64910aa 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: [ 2Q2024 ] + targetPlatform: [ 3Q2024 ] include: - runtime: linux os: ubuntu-latest diff --git a/ci/jenkins/run-tests b/ci/jenkins/run-tests index 57db5617..1daea269 100644 --- a/ci/jenkins/run-tests +++ b/ci/jenkins/run-tests @@ -38,7 +38,7 @@ pipeline { } } - stage('Test on Eclipse 1Q2024') { + stage('Test on Eclipse 3Q2024') { 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=1Q2024 -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=3Q2024 -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 1Q2024-test-reports.zip ." + sh "cd tests/target/surefire-reports && zip -r 3Q2024-test-reports.zip ." - archiveArtifacts artifacts: 'tests/target/surefire-reports/1Q2024-test-reports.zip', fingerprint: true + archiveArtifacts artifacts: 'tests/target/surefire-reports/3Q2024-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/pom.xml b/pom.xml index 7f6ce947..e0f09820 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ - 2Q2024 + 3Q2024 From 7bf1c2315108336b9c46010856e055d7795f3005 Mon Sep 17 00:00:00 2001 From: Adam Wisniewski Date: Wed, 20 Nov 2024 15:19:39 -0500 Subject: [PATCH 4/4] Remove versions Signed-off-by: Adam Wisniewski --- tests/META-INF/MANIFEST.MF | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF index 8b082bb4..21dfb3a6 100644 --- a/tests/META-INF/MANIFEST.MF +++ b/tests/META-INF/MANIFEST.MF @@ -5,9 +5,9 @@ Bundle-Name: Tests Plug-in Bundle-SymbolicName: io.openliberty.tools.eclipse.tests Bundle-Version: 24.0.12.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-21 -Require-Bundle: junit-jupiter-api;bundle-version="[5.8.0,6.0.0)", +Require-Bundle: junit-jupiter-api, org.eclipse.ui, - org.hamcrest.library;bundle-version="[1.3.0,2.2)" + org.hamcrest.library Import-Package: io.openliberty.tools.eclipse, io.openliberty.tools.eclipse.debug, io.openliberty.tools.eclipse.ui.dashboard,