Merge branch 'develop'

Author: stefanseifert

.github/renovate.json

@@ -0,0 +1,16 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "github>wcm-io/renovate-config:maven",
+    "github>wcm-io/renovate-config:automerge-parent",
+    "github>wcm-io/renovate-config:automerge-trusted-3rdparty",
+    "github>wcm-io/renovate-config:automerge-testing",
+    "github>wcm-io-devops/renovate-config:automerge-parent"
+  ],
+  "packageRules": [
+    {
+      "matchFileNames": ["src/it/**"],
+      "enabled": false
+    }
+  ]
+}

.github/workflows/maven-build.yml

@@ -4,13 +4,9 @@ name: Build
 
 on:
   push:
-    branches-ignore:
-      - master
-      - experimental/**
+    branches:
+      - develop
   pull_request:
-    branches-ignore:
-      - master
-      - experimental/**
   workflow_dispatch:
 
 jobs:
@@ -19,20 +15,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [8, 11]
+        java: [17, 21, 25]
         os: [ubuntu-latest]
         distribution: [temurin]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Setup JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: ${{ matrix.distribution }}
           java-version: ${{ matrix.java }}
-          cache: 'maven'
+          cache: maven
 
       - name: Build and verify
         run: mvn -s ./.maven-settings.xml -Pcontinuous-integration -B -U clean verify

.github/workflows/maven-deploy.yml

@@ -1,4 +1,4 @@
-# Deploy snapshots to Sonatpe OSS repository and deploy site to GitHub Pages
+# Deploy snapshots to Sonatype OSS repository and deploy site to GitHub Pages
 
 name: Deploy
 
@@ -15,19 +15,19 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Configure GIT
         run: |
           git config --global user.email "${{ secrets.GH_SITE_DEPLOY_EMAIL }}"
           git config --global user.name "${{ secrets.GH_SITE_DEPLOY_NAME }}"
 
       - name: Setup JDK
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 8
-          cache: 'maven'
+          java-version: 21
+          cache: maven
 
       - name: Build, verify, deploy
         env:

.github/workflows/release-from-tag.yml

@@ -12,8 +12,8 @@ jobs:
     permissions:
       contents: write
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v6
     - uses: ncipollo/release-action@v1
       with:
-        body: 'Changes: https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes-report.html'
+        body: 'Changes: https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes.html'
         token: ${{ secrets.GITHUB_TOKEN }}

.maven-settings.xml

@@ -43,8 +43,8 @@
         </repository>
 
         <repository>
-          <id>oss-snapshots</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <id>sonatype-central-snapshots</id>
+          <url>https://central.sonatype.com/repository/maven-snapshots</url>
           <layout>default</layout>
           <releases>
             <enabled>false</enabled>
@@ -86,8 +86,8 @@
         </pluginRepository>
 
         <pluginRepository>
-          <id>oss-snapshots</id>
-          <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+          <id>sonatype-central-snapshots</id>
+          <url>https://central.sonatype.com/repository/maven-snapshots</url>
           <layout>default</layout>
           <releases>
             <enabled>false</enabled>
@@ -123,7 +123,12 @@
 
   <servers>
     <server>
-      <id>ossrh</id>
+      <id>sonatype-central</id>
+      <username>${env.SONATYPE_USERNAME}</username>
+      <password>${env.SONATYPE_PASSWORD}</password>
+    </server>
+    <server>
+      <id>sonatype-central-snapshots</id>
       <username>${env.SONATYPE_USERNAME}</username>
       <password>${env.SONATYPE_PASSWORD}</password>
     </server>

README.md

@@ -1,6 +1,6 @@
 <img src="https://wcm.io/images/favicon-16@2x.png"/> Eclipse Maven Plugin
 ======
-[![Build](https://github.com/wcm-io-devops/eclipse-maven-plugin/workflows/Build/badge.svg?branch=develop)](https://github.com/wcm-io-devops/eclipse-maven-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
+[![Build](https://github.com/wcm-io-devops/eclipse-maven-plugin/actions/workflows/maven-build.yml/badge.svg?branch=develop)](https://github.com/wcm-io-devops/eclipse-maven-plugin/actions?query=workflow%3ABuild+branch%3Adevelop)
 [![Maven Central](https://img.shields.io/maven-central/v/io.wcm.devops.maven.plugins/eclipse-maven-plugin)](https://repo1.maven.org/maven2/io/wcm/devops/maven/plugins/eclipse-maven-plugin)
 
 The Eclipse Plugin is used to generate Eclipse IDE files (.project, .classpath and the .settings folder) from a POM.
@@ -14,7 +14,7 @@ So we maintain a fork of the original plugin here and publish it under Apache 2.
 Documentation:
 
 * [wcm.io DevOps Eclipse Maven Plugin Documentation](https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/)
-* [Changes since the original Maven Eclipse Plugin 2.10.](https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes-report.html)
+* [Changes since the original Maven Eclipse Plugin 2.10.](https://devops.wcm.io/maven/plugins/eclipse-maven-plugin/changes.html)
 
 To use this in your projects update all your POMs to use
 

changes.xml

@@ -19,10 +19,23 @@
   #L%
   -->
 
-<document xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/changes/1.0.0"
-    xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
+<document xmlns="http://maven.apache.org/changes/2.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
   <body>
 
+    <release version="3.3.0" date="2026-03-16">
+      <action type="update" dev="sseifert" issue="107">
+        Raise minimum maven version to 3.8.1, minimum java build version to Java 17.
+      </action>
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+      <action type="fix" dev="sseifert" issue="114">
+        Fix: Plugin ignores its own POM configuration due to wrong coordinates.
+      </action>
+    </release>
+
     <release version="3.2.0" date="2022-09-29">
       <action type="add" dev="jschaible">
         New parameters for to-maven goal.