From f6f59059e01fc2729a150d413fb325c06a608b82 Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 30 Sep 2023 16:27:01 +0200 Subject: [PATCH 1/2] Support eclipse 2023-09 --- .github/workflows/build.yml | 12 +++---- ReleaseNotes.md | 3 ++ pom.xml | 2 +- .../{2022-09.target => 2023-09.target} | 36 +++++++++---------- target-platforms/{2022-09.tpd => 2023-09.tpd} | 12 +++---- 5 files changed, 34 insertions(+), 31 deletions(-) rename target-platforms/{2022-09.target => 2023-09.target} (50%) rename target-platforms/{2022-09.tpd => 2023-09.tpd} (58%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c2f932a..1e2c71e5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ on: jobs: # verify build on one node before multiple builds on different os are started fail-fast-build: - name: verify (ubuntu-latest, 2023-06) + name: verify (ubuntu-latest, 2023-09) timeout-minutes: 60 runs-on: ubuntu-latest steps: @@ -29,7 +29,7 @@ jobs: - name: Build uses: ./.github/actions/build with: - targetPlatform: 2023-06 + targetPlatform: 2023-09 deploy: true pmdCiSecretPassphrase: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }} githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -44,19 +44,19 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] - targetPlatform: [ 2023-06 ] + targetPlatform: [ 2023-09 ] exclude: # exclude the fail-fast-build, which already ran - os: ubuntu-latest - targetPlatform: 2023-06 + targetPlatform: 2023-09 # run other target platforms only on linux include: + - os: ubuntu-latest + targetPlatform: 2023-06 - os: ubuntu-latest targetPlatform: 2023-03 - os: ubuntu-latest targetPlatform: 2022-12 - - os: ubuntu-latest - targetPlatform: 2022-09 fail-fast: true runs-on: ${{ matrix.os }} diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 2da07934..31179908 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -13,12 +13,15 @@ This is a minor release. ### New and noteworthy +* Support for Eclipse 2023-09 added * Support for Eclipse 2023-06 added +* Support for Eclipse 2022-09 removed * Support for Eclipse 2022-06 removed ### Fixed Issues * [#181](https://github.com/pmd/pmd-eclipse-plugin/pull/181): Support eclipse 2023-06 +* [#183](https://github.com/pmd/pmd-eclipse-plugin/pull/183): Support eclipse 2023-09 ### API Changes diff --git a/pom.xml b/pom.xml index 74353229..5f372b22 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - 2023-06 + 2023-09 1.8 diff --git a/target-platforms/2022-09.target b/target-platforms/2023-09.target similarity index 50% rename from target-platforms/2022-09.target rename to target-platforms/2023-09.target index e7eebcbd..60417534 100644 --- a/target-platforms/2022-09.target +++ b/target-platforms/2023-09.target @@ -1,28 +1,28 @@ - + - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - + diff --git a/target-platforms/2022-09.tpd b/target-platforms/2023-09.tpd similarity index 58% rename from target-platforms/2022-09.tpd rename to target-platforms/2023-09.tpd index 553f0f05..f1dfdee7 100644 --- a/target-platforms/2022-09.tpd +++ b/target-platforms/2023-09.tpd @@ -1,6 +1,6 @@ -target "2022-09 (4.25)" -with source requirements environment JavaSE-11 -location "https://download.eclipse.org/releases/2022-09/" { +target "2023-09 (4.29)" +with source requirements environment JavaSE-17 +location "https://download.eclipse.org/releases/2023-09/" { org.eclipse.platform.feature.group org.eclipse.jdt.feature.group org.eclipse.wst.xml_core.feature.feature.group @@ -11,9 +11,9 @@ location "https://download.eclipse.org/releases/2022-09/" { org.eclipse.swtbot.generator.feature.feature.group } -location "https://download.eclipse.org/tools/orbit/downloads/2022-09/" { - org.apache.commons.io - org.apache.commons.io.source +location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2023-09/" { + org.apache.commons.commons-io + org.apache.commons.commons-io.source org.apache.commons.lang org.apache.commons.lang.source org.junit From cfcee1a0314f2c597e52a2b3580e0cf77f166fdf Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Sat, 30 Sep 2023 16:39:47 +0200 Subject: [PATCH 2/2] Import commons-io via package (bundle identifier changed) --- net.sourceforge.pmd.eclipse.plugin.test/META-INF/MANIFEST.MF | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net.sourceforge.pmd.eclipse.plugin.test/META-INF/MANIFEST.MF b/net.sourceforge.pmd.eclipse.plugin.test/META-INF/MANIFEST.MF index 23b60096..94e2b035 100644 --- a/net.sourceforge.pmd.eclipse.plugin.test/META-INF/MANIFEST.MF +++ b/net.sourceforge.pmd.eclipse.plugin.test/META-INF/MANIFEST.MF @@ -1,6 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Version: 7.0.0.qualifier +Import-Package: org.apache.commons.io Bundle-Name: PMD Test Plugin Bundle-SymbolicName: net.sourceforge.pmd.eclipse.plugin.test;singleton:=true Bundle-RequiredExecutionEnvironment: JavaSE-1.8 @@ -13,7 +14,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.core, org.eclipse.jdt.launching, org.junit, - org.apache.commons.io, org.eclipse.swtbot.go, org.eclipse.jdt.ui, org.eclipse.ui.navigator.resources