From 859a895ee8b06a61bd9363cf205609d6f5112ebb Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 6 Mar 2025 08:24:00 +0100 Subject: [PATCH 1/3] Support eclipse 2025-03 --- .github/workflows/build.yml | 14 +++++++------- ReleaseNotes.md | 2 ++ pom.xml | 2 +- target-platforms/2024-03.target | 28 ---------------------------- target-platforms/2024-03.tpd | 21 --------------------- target-platforms/2025-03.target | 21 +++++++++++++++++++++ target-platforms/2025-03.tpd | 14 ++++++++++++++ 7 files changed, 45 insertions(+), 57 deletions(-) delete mode 100644 target-platforms/2024-03.target delete mode 100644 target-platforms/2024-03.tpd create mode 100644 target-platforms/2025-03.target create mode 100644 target-platforms/2025-03.tpd diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7eec478..aecf31f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,7 @@ on: jobs: # verify build on one node before multiple builds on different os are started fail-fast-build: - name: verify (ubuntu-latest, 2024-12) + name: verify (ubuntu-latest, 2025-03) timeout-minutes: 60 runs-on: ubuntu-latest steps: @@ -28,7 +28,7 @@ jobs: - name: Build uses: ./.github/actions/build with: - targetPlatform: 2024-12 + targetPlatform: 2025-03 deploy: true pmdCiSecretPassphrase: ${{ secrets.PMD_CI_SECRET_PASSPHRASE }} githubToken: ${{ secrets.GITHUB_TOKEN }} @@ -39,7 +39,7 @@ jobs: uses: actions/upload-artifact@v4 if: ${{ failure() }} with: - name: screenshots-ubuntu-latest-2024-12 + name: screenshots-ubuntu-latest-2025-03 path: net.sourceforge.pmd.eclipse.plugin.test/screenshots if-no-files-found: ignore @@ -53,19 +53,19 @@ jobs: strategy: matrix: os: [ ubuntu-latest, windows-latest, macos-latest ] - targetPlatform: [ 2024-12 ] + targetPlatform: [ 2025-03 ] exclude: # exclude the fail-fast-build, which already ran - os: ubuntu-latest - targetPlatform: 2024-12 + targetPlatform: 2025-03 # run other target platforms only on linux include: + - os: ubuntu-latest + targetPlatform: 2024-12 - os: ubuntu-latest targetPlatform: 2024-09 - os: ubuntu-latest targetPlatform: 2024-06 - - os: ubuntu-latest - targetPlatform: 2024-03 fail-fast: true runs-on: ${{ matrix.os }} diff --git a/ReleaseNotes.md b/ReleaseNotes.md index c9b6e005..554a8ed0 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -12,6 +12,8 @@ Eclipse Update Site: This is a minor release. ### New and noteworthy +* Support for Eclipse 2025-03 added +* Support for Eclipse 2024-03 removed ### Fixed Issues diff --git a/pom.xml b/pom.xml index 509fa762..ac0a1eb7 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - 2024-12 + 2025-03 1.8 diff --git a/target-platforms/2024-03.target b/target-platforms/2024-03.target deleted file mode 100644 index 30839e78..00000000 --- a/target-platforms/2024-03.target +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/target-platforms/2024-03.tpd b/target-platforms/2024-03.tpd deleted file mode 100644 index 4c48fa35..00000000 --- a/target-platforms/2024-03.tpd +++ /dev/null @@ -1,21 +0,0 @@ -target "2024-03 (4.31)" -with source requirements environment JavaSE-17 -location "https://download.eclipse.org/releases/2024-03/" { - org.eclipse.platform.feature.group - org.eclipse.jdt.feature.group - org.eclipse.wst.xml_core.feature.feature.group - org.eclipse.pde.feature.group - org.eclipse.swtbot.eclipse.feature.group - org.eclipse.swtbot.feature.group - org.eclipse.swtbot.ide.feature.group - org.eclipse.swtbot.generator.feature.feature.group -} - -location "https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-03/" { - org.apache.commons.commons-io - org.apache.commons.commons-io.source - org.apache.commons.lang - org.apache.commons.lang.source - org.junit - org.junit.source -} diff --git a/target-platforms/2025-03.target b/target-platforms/2025-03.target new file mode 100644 index 00000000..9844ba6e --- /dev/null +++ b/target-platforms/2025-03.target @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/target-platforms/2025-03.tpd b/target-platforms/2025-03.tpd new file mode 100644 index 00000000..721a7c41 --- /dev/null +++ b/target-platforms/2025-03.tpd @@ -0,0 +1,14 @@ +target "2025-03 (4.35)" +with source requirements environment JavaSE-21 +location "https://download.eclipse.org/releases/2025-03/" { + org.eclipse.platform.feature.group + org.eclipse.jdt.feature.group + org.eclipse.wst.xml_core.feature.feature.group + org.eclipse.pde.feature.group + org.eclipse.swtbot.eclipse.feature.group + org.eclipse.swtbot.feature.group + org.eclipse.swtbot.ide.feature.group + org.eclipse.swtbot.generator.feature.feature.group + org.junit + org.junit.source +} From 456f867e15ad0500646eb31d6eeae005a736127c Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 20 Mar 2025 15:49:55 +0100 Subject: [PATCH 2/3] Regenerate/update target platform 2025-03 --- target-platforms/2025-03.target | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/target-platforms/2025-03.target b/target-platforms/2025-03.target index 9844ba6e..4e2b5937 100644 --- a/target-platforms/2025-03.target +++ b/target-platforms/2025-03.target @@ -1,13 +1,13 @@ - + - - - - + + + + From 55aed907876e5b31fcdf9c96cac0d7522c038b4f Mon Sep 17 00:00:00 2001 From: Andreas Dangel Date: Thu, 20 Mar 2025 15:51:23 +0100 Subject: [PATCH 3/3] Update release notes (#260) --- ReleaseNotes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 554a8ed0..afda9f1c 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -19,7 +19,8 @@ This is a minor release. ### API Changes -### External Contributions +### Merged pull requests +* Support eclipse 2025-03 ([#260](https://github.com/pmd/pmd-eclipse-plugin/pull/260)) by [@adangel](https://github.com/adangel) ## 28-February-2025: 7.11.0.v20250228-1209-r