From f647a762387b5ba8d5b7aee008ce50aabec95a37 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 26 Jun 2025 17:20:23 +0200
Subject: [PATCH 1/2] Support eclipse 2025-06

---
 .github/workflows/build.yml                   | 10 ++++----
 ReleaseNotes.md                               |  2 ++
 pom.xml                                       |  2 +-
 .../{2024-06.target => 2025-06.target}        | 24 +++++++++----------
 target-platforms/{2024-06.tpd => 2025-06.tpd} |  5 ++--
 5 files changed, 23 insertions(+), 20 deletions(-)
 rename target-platforms/{2024-06.target => 2025-06.target} (59%)
 rename target-platforms/{2024-06.tpd => 2025-06.tpd} (69%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df770894..87634ac1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ env:
 jobs:
   # verify build on one node before multiple builds on different os are started
   fail-fast-build:
-    name: verify (ubuntu-latest, 2025-03)
+    name: verify (ubuntu-latest, 2025-06)
     timeout-minutes: 30
     defaults:
       run:
@@ -61,19 +61,19 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest, windows-latest, macos-latest ]
-        targetPlatform: [ 2025-03 ]
+        targetPlatform: [ 2025-06 ]
         exclude:
           # exclude the fail-fast-build, which already ran
           - os: ubuntu-latest
-            targetPlatform: 2025-03
+            targetPlatform: 2025-06
         # run other target platforms only on linux
         include:
+          - os: ubuntu-latest
+            targetPlatform: 2025-03
           - os: ubuntu-latest
             targetPlatform: 2024-12
           - os: ubuntu-latest
             targetPlatform: 2024-09
-          - os: ubuntu-latest
-            targetPlatform: 2024-06
       fail-fast: true
 
     runs-on: ${{ matrix.os }}
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index e706fffe..5cd7f111 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-06 added
+* Support for Eclipse 2024-06 removed
 
 ### Fixed Issues
 
diff --git a/pom.xml b/pom.xml
index 1f5bebb0..23dd392b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
   </modules>
 
   <properties>
-    <target.platform>2025-03</target.platform>
+    <target.platform>2025-06</target.platform>
 
     <java.version>1.8</java.version>
     <!-- https://github.com/eclipse/tycho/blob/master/RELEASE_NOTES.md and https://github.com/eclipse-tycho/tycho/releases -->
diff --git a/target-platforms/2024-06.target b/target-platforms/2025-06.target
similarity index 59%
rename from target-platforms/2024-06.target
rename to target-platforms/2025-06.target
index c4395662..75654808 100644
--- a/target-platforms/2024-06.target
+++ b/target-platforms/2025-06.target
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2024-06 (4.32)" sequenceNumber="1718389263">
+<target name="2025-06 (4.36)" sequenceNumber="1750950983">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="4.32.0.v20240601-0610"/>
-      <unit id="org.eclipse.jdt.feature.group" version="3.19.500.v20240601-0610"/>
-      <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.34.0.v202405130132"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.15.400.v20240601-0610"/>
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.2.0.202405291350"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="4.2.0.202405291350"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="4.2.0.202405291350"/>
-      <unit id="org.eclipse.swtbot.generator.feature.feature.group" version="4.2.0.202405291350"/>
-      <unit id="org.junit" version="4.13.2.v20230809-1000"/>
-      <unit id="org.junit.source" version="4.13.2.v20230809-1000"/>
-      <repository location="https://download.eclipse.org/releases/2024-06/"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.36.0.v20250528-2229"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.20.200.v20250528-1830"/>
+      <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.37.0.v202503020853"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.16.300.v20250528-1830"/>
+      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.3.0.202505280955"/>
+      <unit id="org.eclipse.swtbot.feature.group" version="4.3.0.202505280955"/>
+      <unit id="org.eclipse.swtbot.ide.feature.group" version="4.3.0.202505280955"/>
+      <unit id="org.eclipse.swtbot.generator.feature.feature.group" version="4.3.0.202505280955"/>
+      <unit id="org.junit" version="4.13.2.v20240929-1000"/>
+      <unit id="org.junit.source" version="4.13.2.v20240929-1000"/>
+      <repository location="https://download.eclipse.org/releases/2025-06/"/>
     </location>
   </locations>
   <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-21"/>
diff --git a/target-platforms/2024-06.tpd b/target-platforms/2025-06.tpd
similarity index 69%
rename from target-platforms/2024-06.tpd
rename to target-platforms/2025-06.tpd
index 127247d0..2f644635 100644
--- a/target-platforms/2024-06.tpd
+++ b/target-platforms/2025-06.tpd
@@ -1,6 +1,7 @@
-target "2024-06 (4.32)"
+// https://github.com/eclipse-simrel/.github/blob/main/wiki/Simultaneous_Release.md
+target "2025-06 (4.36)"
 with source requirements environment JavaSE-21
-location "https://download.eclipse.org/releases/2024-06/" {
+location "https://download.eclipse.org/releases/2025-06/" {
 	org.eclipse.platform.feature.group
 	org.eclipse.jdt.feature.group
 	org.eclipse.wst.xml_core.feature.feature.group

From fc1af1960b659f6e966d443f2b2b1cb284a62260 Mon Sep 17 00:00:00 2001
From: Andreas Dangel <andreas.dangel@pmd-code.org>
Date: Thu, 26 Jun 2025 17:27:03 +0200
Subject: [PATCH 2/2] [doc] Update release notes

---
 ReleaseNotes.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 5cd7f111..81089d48 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -31,6 +31,7 @@ This is a minor release.
 ### Merged pull requests
 * Refactor GitHub Action Workflows ([#271](https://github.com/pmd/pmd-eclipse-plugin/pull/271)) by [@adangel](https://github.com/adangel)
 * [ci] Make build a reuseable workflow ([#272](https://github.com/pmd/pmd-eclipse-plugin/pull/272)) by [@adangel](https://github.com/adangel)
+* Support eclipse 2025-06 ([#281](https://github.com/pmd/pmd-eclipse-plugin/pull/281)) by [@adangel](https://github.com/adangel)
 
 ### Dependency updates
 * Bump com.puppycrawl.tools:checkstyle from 10.23.0 to 10.23.1 ([#270](https://github.com/pmd/pmd-eclipse-plugin/pull/270))