Merge branch 'develop'

wcm-io · Dec 9, 2024 · 23ac863 · 23ac863
2 parents 8a61562 + 133eb3a
commit 23ac863
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 7 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.1.10" date="2024-12-09">
+      <action type="update" dev="sseifert">
+        Update global-parent dependency to 60.
+      </action>
+    </release>
+
     <release version="2.1.8" date="2024-06-04">
       <action type="update" dev="sseifert">
         Update global-parent dependency to 57.

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.global-parent</artifactId>
-    <version>57</version>
+    <version>60</version>
     <relativePath/>
   </parent>
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.parent</artifactId>
-  <version>2.1.8</version>
+  <version>2.1.10</version>
   <packaging>pom</packaging>
 
   <name>Maven Tooling</name>
@@ -83,8 +83,8 @@
     <site.deploy.url>scm:git:https://github.com/wcm-io/wcm-io.github.io.git</site.deploy.url>
 
     <!-- Versions -->
-    <maven-plugin-plugin.version>3.13.1</maven-plugin-plugin.version>
-    <mockito.version>5.12.0</mockito.version>
+    <maven-plugin-plugin.version>3.15.1</maven-plugin-plugin.version>
+    <mockito.version>5.14.2</mockito.version>
 
     <!-- set default empty argLine when not executing jacoco -->
     <argLine />
@@ -124,7 +124,7 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.10.2</version>
+        <version>5.11.3</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -301,6 +301,18 @@
           </dependencies>
         </plugin>
 
+        <!-- Stick with old versions of site plugins because latest ones use Doxia 2.x, which is not compatible with our io.wcm.maven.skins.reflow-velocity-tools -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.12.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-project-info-reports-plugin</artifactId>
+          <version>3.5.0</version>
+        </plugin>
+
       </plugins>
 
     </pluginManagement>

diff --git a/src/site/markdown/aem-dependencies.md b/src/site/markdown/aem-dependencies.md
@@ -4,7 +4,7 @@ Defines Maven dependencies for a specific AEM version, including those that are
 
 The first part of the AEM dependencies version number matches with the AEM version, and the version of the AEM API JAR. The last part (4 digits) is the revision number added by the wcm.io project, and is incremented if a fix or update of the POM needs to be published for the same AEM versions.
 
-### AEM Cloud Service
+### AEM as a Cloud Service (AEMaaCS)
 
 [![Maven Central](https://img.shields.io/maven-central/v/io.wcm.maven/io.wcm.maven.aem-cloud-dependencies)](https://repo1.maven.org/maven2/io/wcm/maven/io.wcm.maven.aem-cloud-dependencies/)
 
@@ -20,6 +20,8 @@ The first part of the AEM dependencies version number matches with the AEM versi
 
 Source code: https://github.com/wcm-io/io.wcm.maven.aem-cloud-dependencies
 
+*Please note*: Since version `2024.7.17098.20240711T134106Z-240600.0000` JSONP 2.1 and Johnzon 2.x is used by default by this POM. If your code, or dependencies of your project, still rely on JSONP 1.1 and Johnzon 1.2.x, you can use the [Mixin for JSONP 1.1](https://github.com/wcm-io/io.wcm.maven.aem-cloud-dependencies-mixin-jsonp11).
+
 
 ### AEM 6.5 - Latest Version
 
@@ -47,7 +49,7 @@ Source code: https://github.com/wcm-io/io.wcm.maven.aem-dependencies
 <dependency>
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.aem-dependencies</artifactId>
-  <version>6.5.0.0005</version>
+  <version>6.5.0.0007</version>
   <type>pom</type>
   <scope>import</scope>
 </dependency>