Merge branch 'develop'

Author: stefanseifert

.github/renovate.json

@@ -0,0 +1,11 @@
+{
+  "$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-testing"
+  ],
+  "ignoreDeps": [
+    "io.wcm.maven:io.wcm.maven.aem-global-parent"
+  ]
+}

.github/workflows/maven-build.yml

@@ -4,14 +4,9 @@ name: Build
 
 on:
   push:
-    branches-ignore:
-      - master
-      - experimental/**
+    branches:
+      - develop
   pull_request:
-    types: [opened, synchronize, reopened]
-    branches-ignore:
-      - master
-      - experimental/**
   workflow_dispatch:
 
 jobs:
@@ -20,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [8, 11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest]
         distribution: [temurin]
         include:
@@ -39,7 +34,7 @@ jobs:
           java-version: ${{ matrix.java }}
           maven-executable: ./mvnw
           sonar-run-on-os: ubuntu-latest
-          sonar-run-on-java-version: 11
+          sonar-run-on-java-version: 21
           sonar-token: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
           # Output error details when maven invoker IT fails

.github/workflows/maven-deploy.yml

@@ -1,7 +1,9 @@
-# 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
 
+concurrency: ${{ github.workflow }}
+
 on:
   push:
     branches:
@@ -15,19 +17,19 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - 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@v4
         with:
           distribution: temurin
-          java-version: 8
-          cache: 'maven'
+          java-version: 11
+          cache: maven
 
       - name: Build, verify, deploy, generate site
         env:

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

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

.mvn/wrapper/maven-wrapper.jar

@@ -5,14 +5,15 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

.mvn/wrapper/maven-wrapper.properties

@@ -7,7 +7,7 @@
 Convenience maven plugin for working with CQ/AEM maven projects.
 
 Documentation: https://wcm.io/tooling/maven/plugins/cq-maven-plugin/<br/>
-Issues: https://wcm-io.atlassian.net/browse/WTOOL<br/>
+Issues: https://github.com/wcm-io/io.wcm.maven.plugins.cq-maven-plugin/issues<br/>
 Wiki: https://wcm-io.atlassian.net/wiki/<br/>
 Continuous Integration: https://github.com/wcm-io/io.wcm.maven.plugins.cq-maven-plugin/actions<br/>
 Commercial support: https://wcm.io/commercial-support.html

README.md

@@ -19,13 +19,20 @@
   #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="1.2.2" date="2025-03-31">
+      <action type="update" dev="sseifert">
+        Switch to Java 11 as minimum version.
+      </action>
+    </release>
+
     <release version="1.2.0" date="2022-08-29">
       <action type="update" dev="sseifert">
-        Use "sling:install-file" instead of "sling:install" goal to be compatbile with sling-maven-plugin 3.x.
+        Use "sling:install-file" instead of "sling:install" goal to be compatible with sling-maven-plugin 3.x.
       </action>
     </release>