Merge branch 'develop'

wcm-io · Dec 9, 2024 · 443fc64 · 443fc64
2 parents 7138cbf + 6b0c239
commit 443fc64
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,15 @@
     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.3.4" date="2024-12-09">
+      <action type="update" dev="sseifert">
+        Update to aem-global-parent 2.1.24.
+      </action>
+      <action type="update" dev="sseifert">
+        Update testing dependencies.
+      </action>
+    </release>
+
     <release version="2.3.2" date="2024-06-04">
       <action type="update" dev="sseifert">
         Update to aem-global-parent 2.1.18.

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-    <version>2.1.18</version>
+    <version>2.1.24</version>
     <relativePath />
   </parent>
 
   <groupId>io.wcm</groupId>
   <artifactId>io.wcm.parent_toplevel</artifactId>
-  <version>2.3.2</version>
+  <version>2.3.4</version>
   <packaging>pom</packaging>
 
   <name>Toplevel Parent</name>
@@ -89,7 +89,7 @@
     <site.deploy.url>scm:git:https://github.com/wcm-io/wcm-io.github.io.git</site.deploy.url>
 
     <!-- Versions -->
-    <mockito.version>5.12.0</mockito.version>
+    <mockito.version>5.14.2</mockito.version>
 
     <!-- set default empty argLine when not executing jacoco -->
     <argLine />
@@ -172,7 +172,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>
@@ -399,6 +399,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>