Merge pull request #183 from adangel:support-eclipse-2023-09

Support eclipse 2023-09 #183
pmd · Sep 30, 2023 · fcb6c49 · fcb6c49
2 parents c5e8aee + cfcee1a
commit fcb6c49
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 32 deletions.
diff --git 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
@@ -14,13 +14,16 @@ This is a minor release.
 ### New and noteworthy
 
 * Updated to PMD 7.0.0-rc4
+* 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
 * [#182](https://github.com/pmd/pmd-eclipse-plugin/pull/182): Update to PMD 7.0.0-rc4
+* [#183](https://github.com/pmd/pmd-eclipse-plugin/pull/183): Support eclipse 2023-09
 
 ### API Changes
 

diff --git 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

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
   </modules>
 
   <properties>
-    <target.platform>2023-06</target.platform>
+    <target.platform>2023-09</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/2022-09.target → target-platforms/2023-09.target b/target-platforms/2022-09.target → target-platforms/2023-09.target
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="2022-09 (4.25)" sequenceNumber="1683993272">
+<target name="2023-09 (4.29)" sequenceNumber="1696083617">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.eclipse.platform.feature.group" version="4.25.0.v20220831-1800"/>
-      <unit id="org.eclipse.jdt.feature.group" version="3.18.1300.v20220831-1800"/>
-      <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.27.0.v202207150226"/>
-      <unit id="org.eclipse.pde.feature.group" version="3.14.1300.v20220831-1800"/>
-      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.0.0.202206011610"/>
-      <unit id="org.eclipse.swtbot.feature.group" version="4.0.0.202206011610"/>
-      <unit id="org.eclipse.swtbot.ide.feature.group" version="4.0.0.202206011610"/>
-      <unit id="org.eclipse.swtbot.generator.feature.feature.group" version="4.0.0.202206011610"/>
-      <repository location="https://download.eclipse.org/releases/2022-09/"/>
+      <unit id="org.eclipse.platform.feature.group" version="4.29.0.v20230903-1000"/>
+      <unit id="org.eclipse.jdt.feature.group" version="3.19.200.v20230903-1000"/>
+      <unit id="org.eclipse.wst.xml_core.feature.feature.group" version="3.31.0.v202308210520"/>
+      <unit id="org.eclipse.pde.feature.group" version="3.15.100.v20230903-1000"/>
+      <unit id="org.eclipse.swtbot.eclipse.feature.group" version="4.1.0.202306071420"/>
+      <unit id="org.eclipse.swtbot.feature.group" version="4.1.0.202306071420"/>
+      <unit id="org.eclipse.swtbot.ide.feature.group" version="4.1.0.202306071420"/>
+      <unit id="org.eclipse.swtbot.generator.feature.feature.group" version="4.1.0.202306071420"/>
+      <repository location="https://download.eclipse.org/releases/2023-09/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
-      <unit id="org.apache.commons.io" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.io.source" version="2.8.0.v20210415-0900"/>
-      <unit id="org.apache.commons.lang" version="2.6.0.v20220406-2305"/>
-      <unit id="org.apache.commons.lang.source" version="2.6.0.v20220406-2305"/>
-      <unit id="org.junit" version="4.13.2.v20211018-1956"/>
-      <unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/2022-09/"/>
+      <unit id="org.apache.commons.commons-io" version="2.13.0"/>
+      <unit id="org.apache.commons.commons-io.source" version="2.13.0"/>
+      <unit id="org.apache.commons.lang" version="2.6.0"/>
+      <unit id="org.apache.commons.lang.source" version="2.6.0"/>
+      <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/tools/orbit/simrel/orbit-aggregation/2023-09/"/>
     </location>
   </locations>
-  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+  <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
 </target>
diff --git a/target-platforms/2022-09.tpd → target-platforms/2023-09.tpd b/target-platforms/2022-09.tpd → 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