Merge branch 'develop'

wcm-io-devops · Dec 18, 2023 · 7219417 · 7219417
2 parents 7bcc020 + e21d8be
commit 7219417
Show file tree

Hide file tree

Showing 13 changed files with 88 additions and 233 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="2.19.10" date="2023-12-18">
+      <action type="fix" dev="sseifert">
+        Update to latest io.wcm.tooling.commons.content-package-builder to fix potential problem with element ordering content packages generated from JSON files.
+      </action>
+    </release>
+
     <release version="2.19.8" date="2023-10-18">
       <action type="fix" dev="trichter" issue="73">
         Increase SnakeYAML codepoint limit to 64MB (from default 3MB).

diff --git a/conga-aem-plugin/pom.xml b/conga-aem-plugin/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.8</version>
+    <version>2.19.10</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>2.19.8</version>
+  <version>2.19.10</version>
   <packaging>jar</packaging>
 
   <name>CONGA AEM Plugin</name>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-  <version>2.19.8</version>
+  <version>2.19.10</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>
@@ -48,7 +48,7 @@
 
   <properties>
     <maven.version>3.3.9</maven.version>
-    <oak.version>1.58.0</oak.version>
+    <oak.version>1.60.0</oak.version>
   </properties>
 
   <dependencyManagement>
@@ -68,7 +68,7 @@
       <dependency>
         <groupId>io.wcm.devops.conga.plugins</groupId>
         <artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
-        <version>1.3.0</version>
+        <version>1.3.4</version>
       </dependency>
 
       <dependency>
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>io.wcm.tooling.commons</groupId>
         <artifactId>io.wcm.tooling.commons.content-package-builder</artifactId>
-        <version>1.7.0</version>
+        <version>1.7.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm.tooling.commons</groupId>
@@ -91,7 +91,7 @@
       <dependency>
         <groupId>org.apache.jackrabbit</groupId>
         <artifactId>filevault-package-maven-plugin</artifactId>
-        <version>1.3.4</version>
+        <version>1.3.6</version>
       </dependency>
 
       <dependency>
@@ -108,22 +108,22 @@
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-compress</artifactId>
-        <version>1.24.0</version>
+        <version>1.25.0</version>
       </dependency>
         <dependency>
         <groupId>commons-cli</groupId>
         <artifactId>commons-cli</artifactId>
-        <version>1.5.0</version>
+        <version>1.6.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-lang3</artifactId>
-        <version>3.13.0</version>
+        <version>3.14.0</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.14.0</version>
+        <version>2.15.1</version>
       </dependency>
 
       <dependency>

diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.8</version>
+    <version>2.19.10</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
-  <version>2.19.8</version>
+  <version>2.19.10</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>

diff --git a/tooling/conga-aem-crypto-cli/pom.xml b/tooling/conga-aem-crypto-cli/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.8</version>
+    <version>2.19.10</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-crypto-cli</artifactId>
   <packaging>jar</packaging>
-  <version>2.19.8</version>
+  <version>2.19.10</version>
 
   <name>CONGA AEM Crypto Command Line Interface</name>
   <description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.19.8</version>
+      <version>2.19.10</version>
       <scope>compile</scope>
       <exclusions>
         <!-- Exclude all deps - only crypto util classes are used -->

diff --git a/tooling/conga-aem-maven-plugin/pom.xml b/tooling/conga-aem-maven-plugin/pom.xml
@@ -25,14 +25,14 @@
   <parent>
     <groupId>io.wcm.devops.conga.plugins</groupId>
     <artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
-    <version>2.19.8</version>
+    <version>2.19.10</version>
     <relativePath>../../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>conga-aem-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>2.19.8</version>
+  <version>2.19.10</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -41,7 +41,7 @@
     <site.url.module.prefix>tooling/conga-aem-maven-plugin</site.url.module.prefix>
 
     <!-- Versions -->
-    <maven-plugin-plugin.version>3.9.0</maven-plugin-plugin.version>
+    <maven-plugin-plugin.version>3.10.2</maven-plugin-plugin.version>
 
     <!-- Enable recording of coverage during execution of maven-invoker-plugin -->
     <jacoco.propertyName>invoker.mavenOpts</jacoco.propertyName>
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.19.8</version>
+      <version>2.19.10</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml
@@ -182,7 +182,6 @@
     <dependency>
       <groupId>com.adobe.aem</groupId>
       <artifactId>uber-jar</artifactId>
-      <classifier>apis</classifier>
       <scope>provided</scope>
     </dependency>
     <dependency>

diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-    <version>2.0.16</version>
+    <version>2.1.12</version>
     <relativePath/>
   </parent>
 
@@ -29,8 +29,8 @@
     <eclipse.settings.nullanalysis>enabled</eclipse.settings.nullanalysis>
 
     <!-- Versions -->
-    <core.wcm.components.version>2.21.0</core.wcm.components.version>
-    <acs.aem.commons.version>5.3.2</acs.aem.commons.version>
+    <core.wcm.components.version>2.23.4</core.wcm.components.version>
+    <acs.aem.commons.version>6.3.0</acs.aem.commons.version>
 
     <!-- Enable reproducible builds -->
     <project.build.outputTimestamp>2021-01-01T00:00:00Z</project.build.outputTimestamp>
@@ -84,12 +84,12 @@
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.models.api</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.models.impl</artifactId>
-        <version>1.5.0</version>
+        <version>1.6.4</version>
       </dependency>
 
       <!-- Latest Sling Context-Aware Configuration bundles -->
@@ -118,17 +118,17 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.caconfig.extensions</artifactId>
-        <version>1.9.0</version>
+        <version>1.9.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.caconfig.editor</artifactId>
-        <version>1.13.0</version>
+        <version>1.15.6</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.sling.commons</artifactId>
-        <version>1.5.0</version>
+        <version>1.6.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -138,17 +138,17 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.commons</artifactId>
-        <version>1.9.0</version>
+        <version>1.10.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.parsys</artifactId>
-        <version>1.6.8</version>
+        <version>1.7.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.ui.granite</artifactId>
-        <version>1.9.8</version>
+        <version>1.9.14</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -158,44 +158,44 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.commons</artifactId>
-        <version>1.4.4</version>
+        <version>1.5.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.url</artifactId>
-        <version>1.9.0</version>
+        <version>1.10.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.media</artifactId>
-        <version>1.14.12</version>
+        <version>1.15.8</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.link</artifactId>
-        <version>1.9.2</version>
+        <version>1.10.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.handler.richtext</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.4</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.wcm.core.components</artifactId>
-        <version>1.12.0-2.20.0</version>
+        <version>1.14.0-2.23.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm.devops.conga.definitions</groupId>
         <artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
-        <version>1.13.0</version>
+        <version>2.0.2</version>
       </dependency>
 
       <!-- wcm.io Testing -->
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.testing.aem-mock.junit5</artifactId>
-        <version>5.1.0</version>
+        <version>5.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.apache.sling</groupId>
@@ -210,7 +210,7 @@
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
-        <version>1.4.0</version>
+        <version>1.5.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -220,7 +220,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.testing.wcm-io-mock.sling</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -237,7 +237,7 @@
       <dependency>
         <groupId>io.wcm.maven</groupId>
         <artifactId>io.wcm.maven.aem-dependencies</artifactId>
-        <version>6.5.0.0005</version>
+        <version>6.5.18.0000</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -278,19 +278,19 @@
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
-        <version>5.9.1</version>
+        <version>5.10.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>4.8.0</version>
+        <version>5.7.0</version>
       </dependency>
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-junit-jupiter</artifactId>
-        <version>4.8.0</version>
+        <version>5.7.0</version>
       </dependency>
 
     </dependencies>