Merge branch 'main' into bump-pmd-7.15.0

Author: adangel

.ci/files/prepare_release_notes.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -e -o pipefail
+
+outfile="release_notes_prepared.md"
+infile="ReleaseNotes.md"
+
+if [ ! -e "$infile" ]; then
+  echo "File ${infile} not found!"
+  exit 1
+fi
+
+
+# Extract the release notes.
+# Note: "|| test $? -eq 141" is added to ignore SIGPIPE errors when head finishes before grep is done.
+BEGIN_LINE=$( (grep -n "^## " "${infile}" || test $? -eq 141) | head -1|cut -d ":" -f 1)
+END_LINE=$( (grep -n "^## " "${infile}" || test $? -eq 141) | head -2|tail -1|cut -d ":" -f 1)
+END_LINE=$((END_LINE - 1))
+EXTRACT=$(head -$END_LINE "${infile}" | tail -$((END_LINE - BEGIN_LINE)))
+
+RELEASE_BODY="A new PMD for Eclipse plugin version has been released.
+It is available via the update site: https://pmd.github.io/pmd-eclipse-plugin-p2-site/
+
+$EXTRACT
+"
+echo "${RELEASE_BODY}" > "${outfile}"
+echo "Created file ${outfile}"

.ci/files/regenerate_metadata.sh

@@ -1,20 +1,20 @@
 #!/bin/bash
 
 echo "Regenerating metadata for p2-site..."
-local releases=($(find . -maxdepth 1 -type d -regex "\./[0-9]+\.[0-9]+\.[0-9]+\..*" -printf '%f\n'| tr '.' '\0' | sort -t '\0' -k1,1nr -k2,2nr -k3,3nr -k4dr |awk -F '\0' '{printf "%s.%s.%s.%s\n", $1, $2, $3, $4}'))
+mapfile -t releases < <(find . -maxdepth 1 -type d -regex "\./[0-9]+\.[0-9]+\.[0-9]+\..*" -printf '%f\n'| tr '.' '\0' | sort -t '\0' -k1,1nr -k2,2nr -k3,3nr -k4dr |awk -F '\0' '{printf "%s.%s.%s.%s\n", $1, $2, $3, $4}')
 # remove old releases
 for i in "${releases[@]:5}"; do
-  pmd_ci_log_info "Removing old release $i..."
+  echo "  Removing old release $i..."
   rm -rf "$i"
 done
 releases=("${releases[@]:0:5}")
 
 # regenerate metadata
-local now
 now=$(date +%s000)
-local children=""
-local children_index=""
+children=""
+children_index=""
 for i in "${releases[@]}"; do
+  echo "  Adding release $i"
   children="${children}    <child location=\"$i\"/>\n"
   children_index="${children_index}  * [$i]($i/)\n"
   echo "This is a Eclipse Update Site for the [PMD Eclipse Plugin](https://github.com/pmd/pmd-eclipse-plugin/) ${i}.
@@ -33,8 +33,8 @@ Use <https://pmd.github.io/pmd-eclipse-plugin-p2-site/${i}/> to install the plug
   git add "$i"/index.md
 done
 
-local site_name="PMD for Eclipse - Update Site"
-local artifactsTemplate="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+site_name="PMD for Eclipse - Update Site"
+artifactsTemplate="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <?compositeArtifactRepository version=\"1.0.0\"?>
 <repository name=\"${site_name}\" type=\"org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository\" version=\"1.0.0\">
   <properties size=\"2\">
@@ -45,8 +45,9 @@ local artifactsTemplate="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 ${children}  </children>
 </repository>"
 echo -e "${artifactsTemplate}" > compositeArtifacts.xml
+git add compositeArtifacts.xml
 
-local contentTemplate="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+contentTemplate="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <?compositeMetadataRepository version=\"1.0.0\"?>
 <repository name=\"${site_name}\" type=\"org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository\" version=\"1.0.0\">
   <properties size=\"2\">
@@ -57,12 +58,14 @@ local contentTemplate="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 ${children}  </children>
 </repository>"
 echo -e "${contentTemplate}" > compositeContent.xml
+git add compositeContent.xml
 
 # p2.index
-local p2_index="version = 1
+p2_index="version = 1
 metadata.repository.factory.order = compositeContent.xml,\!
 artifact.repository.factory.order = compositeArtifacts.xml,\!"
 echo -e "${p2_index}" > p2.index
+git add p2.index
 
 # regenerate index.md
 echo -e "This is a composite Eclipse Update Site for the [PMD Eclipse Plugin](https://github.com/pmd/pmd-eclipse-plugin/).
@@ -78,4 +81,7 @@ ${children_index}
 For older versions, see <https://sourceforge.net/projects/pmd/files/pmd-eclipse/zipped/>
 
 " > index.md
+git add index.md
+
+echo "Done."
 

.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 }}

.github/workflows/publish-release.yml

@@ -144,18 +144,7 @@ jobs:
         with:
           name: update-site
       - name: Prepare Release Notes
-        run: |
-          # extract the release notes
-          BEGIN_LINE=$(grep -n "^## " ReleaseNotes.md|head -1|cut -d ":" -f 1)
-          END_LINE=$(grep -n "^## " ReleaseNotes.md|head -2|tail -1|cut -d ":" -f 1)
-          END_LINE=$((END_LINE - 1))
-
-          RELEASE_BODY="A new PMD for Eclipse plugin version has been released.
-          It is available via the update site: https://pmd.github.io/pmd-eclipse-plugin-p2-site/
-
-          $(head -$END_LINE ReleaseNotes.md | tail -$((END_LINE - BEGIN_LINE)))
-          "
-          echo "${RELEASE_BODY}" > release_notes_prepared.md
+        run: .ci/files/prepare_release_notes.sh
       - name: Create Release
         env:
           # Token required for GH CLI:
@@ -208,7 +197,7 @@ jobs:
           uploadUrl="${PMD_SF_USER}@web.sourceforge.net:/home/frs/project/pmd/pmd-eclipse/zipped/"
           rsync -avh \
               "net.sourceforge.pmd.eclipse.p2updatesite-${VERSION}.zip" \
-              "${uploadUrl}/net.sourceforge.pmd.eclipse.p2updatesite-SNAPSHOT.zip"
+              "${uploadUrl}/net.sourceforge.pmd.eclipse.p2updatesite-${VERSION}.zip"
 
       - name: Cleanup ssh
         if: ${{ always() }}
@@ -226,6 +215,9 @@ jobs:
       run:
         shell: bash
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event.workflow_run.head_branch }}
       - uses: actions/download-artifact@v4
         with:
           name: update-site
@@ -278,18 +270,7 @@ jobs:
         with:
           ref: ${{ github.event.workflow_run.head_branch }}
       - name: Prepare Release Notes
-        run: |
-          # extract the release notes
-          BEGIN_LINE=$(grep -n "^## " ReleaseNotes.md|head -1|cut -d ":" -f 1)
-          END_LINE=$(grep -n "^## " ReleaseNotes.md|head -2|tail -1|cut -d ":" -f 1)
-          END_LINE=$((END_LINE - 1))
-
-          RELEASE_BODY="A new PMD for Eclipse plugin version has been released.
-          It is available via the update site: https://pmd.github.io/pmd-eclipse-plugin-p2-site/
-
-          $(head -$END_LINE ReleaseNotes.md | tail -$((END_LINE - BEGIN_LINE)))
-          "
-          echo "${RELEASE_BODY}" > release_notes_prepared.md
+        run: .ci/files/prepare_release_notes.sh
       - name: Create Blog Post
         id: upload
         env:

ReleaseNotes.md

@@ -11,14 +11,24 @@ Eclipse Update Site:
 
 This is a minor release.
 
-### New and noteworthy
+### 🚀 New and noteworthy
 * Update to PMD 7.15.0
+* Support for Eclipse 2025-06 added
+* Support for Eclipse 2024-06 removed
 
-### Fixed Issues
+### 🐛 Fixed Issues
 
-### API Changes
+### ✨ Merged pull requests
+* [#277](https://github.com/pmd/pmd-eclipse-plugin/pull/277): \[ci] Fix publish release - [Andreas Dangel](https://github.com/adangel) (@adangel)
+* [#281](https://github.com/pmd/pmd-eclipse-plugin/pull/281): Support eclipse 2025-06 - [Andreas Dangel](https://github.com/adangel) (@adangel)
 
-### External Contributions
+### 📦 Dependency updates
+* [#275](https://github.com/pmd/pmd-eclipse-plugin/pull/275): Bump com.puppycrawl.tools:checkstyle from 10.24.0 to 10.25.0
+* [#276](https://github.com/pmd/pmd-eclipse-plugin/pull/276): Bump org.apache.maven.plugins:maven-clean-plugin from 3.4.1 to 3.5.0
+* [#278](https://github.com/pmd/pmd-eclipse-plugin/pull/278): Bump com.puppycrawl.tools:checkstyle from 10.25.0 to 10.25.1
+* [#280](https://github.com/pmd/pmd-eclipse-plugin/pull/280): Bump build-tools from 30 to 32
+
+### API Changes
 
 ## 30-May-2025: 7.14.0.v20250530-1904-r
 
@@ -2264,4 +2274,3 @@ a lib subdirectory.
 **Development**
 * Adding a ant build file
 * Adapting .project to be compatible with both Eclipse 2.02 and WSAD v5.
-

do-release.sh

@@ -96,13 +96,16 @@ ${RELEASE_NOTES_HEADER}
 
 This is a minor release.
 
-### New and noteworthy
+### 🚀 New and noteworthy
 
-### Fixed Issues
+### 🐛 Fixed Issues
+
+### ✨ Merged pull requests
+
+### 📦 Dependency updates
 
 ### API Changes
 
-### External Contributions
 ${RELEASE_NOTES_BODY}
 
 EOF

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/plugin/PMDPlugin.java

@@ -98,12 +98,12 @@ public class PMDPlugin extends AbstractUIPlugin {
 
     private Map<RGB, Color> coloursByRgb = new HashMap<>();
 
-    private StringTable stringTable; // NOPMD by Herlin on 11/10/06 00:22
+    private StringTable stringTable;
 
     private IPreferencesFactory preferencesFactory = new PreferencesFactoryImpl();
     private IPropertiesFactory propertiesFactory = new PropertiesFactoryImpl();
 
-    private final IRuleSetManager ruleSetManager = new RuleSetManagerImpl(); // NOPMD:SingularField
+    private final IRuleSetManager ruleSetManager = new RuleSetManagerImpl();
 
     private final LogbackConfiguration logbackConfiguration = new LogbackConfiguration();
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/DeleteMarkersCommand.java

@@ -28,7 +28,7 @@ public DeleteMarkersCommand() {
         setUserInitiated(false);
     }
 
-    public final void setMarkers(IMarker[] theMarkers) { // NOPMD by Sven on 13.11.06 11:43
+    public final void setMarkers(IMarker[] theMarkers) {
         markers = theMarkers;
     }
 

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/properties/impl/ProjectPropertiesManagerImpl.java

@@ -348,7 +348,7 @@ private ProjectPropertiesTO fillTransferObject(IProjectProperties projectPropert
 
             for (RuleSet ruleSet : ruleSets) {
                 for (Rule rule : ruleSet.getRules()) {
-                    rules.add(new RuleSpecTO(rule.getName(), rule.getRuleSetName())); // NOPMD:AvoidInstantiatingObjectInLoop
+                    rules.add(new RuleSpecTO(rule.getName(), rule.getRuleSetName()));
                 }
                 for (Pattern pattern : ruleSet.getFileExclusions()) {
                     excludePatterns.add(pattern.pattern());

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/ui/actions/CPDCheckProjectAction.java

@@ -50,7 +50,7 @@ public class CPDCheckProjectAction extends AbstractUIAction {
     private static final String CSV_KEY = "CSV";
 
     @Override
-    public void run(final IAction action) { // NOPMD:UnusedFormalParameter
+    public void run(final IAction action) {
         final IWorkbenchPartSite site = targetPartSite();
         final ISelection sel = targetSelection();
         final Shell shell = site.getShell();