Merge branch 'develop'

wcm-io-devops · Nov 10, 2022 · 9c08d0e · 9c08d0e
2 parents e895a4e + 928c5f6
commit 9c08d0e
Show file tree

Hide file tree

Showing 80 changed files with 929 additions and 261 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,14 @@
     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.0" date="2022-11-10">
+      <action type="add" dev="sseifert">
+        conga-aem-maven-plugin: Introduce new parameter "packageVersionMode" to "cloudmanager-all-package" goal, which allows to enable a special "RELEASE_SUFFIX_VERSION" mode.
+        If this is activated, all the versions of all content packages with a release version contained in the "all" package get a suffix consisting of the version of the POM the mojo is executed in.
+        This is useful when deploying to AMS with Cloud Manager.
+      </action>
+    </release>
+
     <release version="2.18.6" date="2022-10-17">
       <action type="update" dev="sseifert">
         conga-aem-maven-plugin: Make use of ${project.build.outputTimestamp} for reproducible builds for dispatcher configuration and processed packages in "all" package.

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.18.6</version>
+    <version>2.19.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.plugins</groupId>
   <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-  <version>2.18.6</version>
+  <version>2.19.0</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.18.6</version>
+  <version>2.19.0</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Plugin</name>

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.18.6</version>
+    <version>2.19.0</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.18.6</version>
+  <version>2.19.0</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.18.6</version>
+    <version>2.19.0</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.18.6</version>
+  <version>2.19.0</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.18.6</version>
+      <version>2.19.0</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.18.6</version>
+    <version>2.19.0</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.18.6</version>
+  <version>2.19.0</version>
 
   <name>CONGA AEM Maven Plugin</name>
   <description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>io.wcm.devops.conga.plugins</groupId>
       <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-      <version>2.18.6</version>
+      <version>2.19.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/archetype-params.txt b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/archetype-params.txt
@@ -1,7 +1,7 @@
 mvn org.apache.maven.plugins:maven-archetype-plugin:3.1.0:generate -DinteractiveMode=false \
   -DarchetypeGroupId=io.wcm.maven.archetypes \
   -DarchetypeArtifactId=io.wcm.maven.archetypes.aem \
-  -DarchetypeVersion=3.6.0-SNAPSHOT \
+  -DarchetypeVersion=3.6.7-SNAPSHOT \
   -DprojectName=wcmio-archetype-aem65 \
   -DgroupId=io.wcm.devops.conga.plugins.aem.it \
   -DartifactId=io.wcm.devops.conga.plugins.aem.it.aem65 \

diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/archetype.properties b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/archetype.properties
@@ -14,6 +14,7 @@ aemPublishPort=4503
 optionAemVersion=6.5
 optionJavaVersion=8
 optionAemServicePack=n
+optionAemServicePackAPI=n
 optionSlingModelsLatest=y
 optionSlingInitialContentBundle=y
 optionEditableTemplates=y
@@ -22,5 +23,5 @@ optionContextAwareConfig=y
 optionFrontend=n
 optionNodeJsPlugin=n
 optionWcmioHandler=y
-optionAcsCommons=n
+optionAcsCommons=y
 optionIntegrationTests=n
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
@@ -172,6 +172,11 @@
       <artifactId>core.wcm.components.core</artifactId>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>com.adobe.acs</groupId>
+      <artifactId>acs-aem-commons-bundle</artifactId>
+      <scope>compile</scope>
+    </dependency>
 
     <!-- AEM dependencies provided - so each project has full control about their positions (should always be last in the list). -->
     <dependency>

diff --git a/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/config-definition/pom.xml b/tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/config-definition/pom.xml
@@ -57,6 +57,20 @@
       <scope>compile</scope>
     </dependency>
 
+    <!-- ACS AEM Commons -->
+    <dependency>
+      <groupId>com.adobe.acs</groupId>
+      <artifactId>acs-aem-commons-ui.apps</artifactId>
+      <type>zip</type>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.adobe.acs</groupId>
+      <artifactId>acs-aem-commons-ui.content</artifactId>
+      <type>zip</type>
+      <scope>compile</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -80,6 +94,28 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>io.wcm.devops.conga.plugins</groupId>
+        <artifactId>conga-aem-maven-plugin</artifactId>
+        <executions>
+
+          <!-- Generate "all" packages including all packages from CONGA configuration for deployment via Adobe Cloud Manager -->
+          <execution>
+            <id>cloudmanager-all-package</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>cloudmanager-all-package</goal>
+            </goals>
+            <configuration>
+              <group>it</group>
+              <packageTypeValidation>WARN</packageTypeValidation>
+              <packageVersionMode>RELEASE_SUFFIX_VERSION</packageVersionMode>
+            </configuration>
+          </execution>
+
+        </executions>
+      </plugin>
+
       <!-- Do not generate eclipse project files -->
       <plugin>
         <groupId>io.wcm.devops.maven.plugins</groupId>

diff --git a/...en-plugin/src/it/wcmio-archetype-aem65/config-definition/src/main/environments/local.yaml b/...en-plugin/src/it/wcmio-archetype-aem65/config-definition/src/main/environments/local.yaml
@@ -21,6 +21,7 @@ nodes:
 
 config:
   contentPackage.group: it
+
   app:
     # Default log level for application code
     logLevel: info

diff --git a/...wcmio-archetype-aem65/config-definition/src/main/roles/wcmio-archetype-aem65-aem-cms.yaml b/...wcmio-archetype-aem65/config-definition/src/main/roles/wcmio-archetype-aem65-aem-cms.yaml
@@ -17,6 +17,16 @@ files:
 - url: mvn:com.adobe.cq/core.wcm.components.all//zip
   dir: packages
 
+# ACS AEM Commons
+- url: mvn:com.adobe.acs/acs-aem-commons-ui.apps//zip
+  dir: packages
+  postProcessorOptions:
+    contentPackage.packageType: application
+- url: mvn:com.adobe.acs/acs-aem-commons-ui.content//zip
+  dir: packages
+  postProcessorOptions:
+    contentPackage.packageType: content
+
 # AEM OSGi System Configuration
 - file: wcmio-archetype-aem65-aem-cms-config.provisioning
   dir: packages

diff --git a/...lates/wcmio-archetype-aem65-aem-cms/wcmio-archetype-aem65-aem-cms-config.provisioning.hbs b/...lates/wcmio-archetype-aem65-aem-cms/wcmio-archetype-aem65-aem-cms-config.provisioning.hbs
@@ -48,7 +48,8 @@
       "io.wcm.devops.conga.plugins.aem.it.aem65.config.impl.MediaFormatProviderImpl", \
       "io.wcm.devops.conga.plugins.aem.it.aem65.config.impl.MediaHandlerConfigImpl", \
       "io.wcm.caconfig.extensions.contextpath.impl.RootTemplateContextPathStrategy", \
-      "io.wcm.caconfig.extensions.persistence.impl.PagePersistenceStrategy"]
+      "io.wcm.caconfig.extensions.persistence.impl.PagePersistenceStrategy",
+      "io.wcm.handler.mediasource.dam.impl.dynamicmedia.DynamicMediaSupportServiceImpl"]
 
 [configurations runModes=author]
 

diff --git a/...ing/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/complete/pom.xml b/...ing/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/complete/pom.xml
@@ -78,6 +78,13 @@
       <scope>provided</scope>
     </dependency>
 
+    <!-- ACS AEM Commons -->
+    <dependency>
+      <groupId>com.adobe.acs</groupId>
+      <artifactId>acs-aem-commons-bundle</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
@@ -135,6 +142,16 @@
               </artifactId>
               <type>jar</type>
             </embedded>
+            <!-- ACS AEM Commons -->
+            <embedded>
+              <groupId>
+                com.adobe.acs
+              </groupId>
+              <artifactId>
+                acs-aem-commons-bundle
+              </artifactId>
+              <type>jar</type>
+            </embedded>
           </embeddeds>
 
         </configuration>

diff --git a/...kages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/policies/.content.xml b/...kages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/policies/.content.xml
@@ -16,7 +16,7 @@
                             <jcr:content
                                 jcr:primaryType="nt:unstructured"
                                 jcr:mixinTypes="[cq:ReplicationStatus]"
-                                cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+                                cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
                                 cq:lastReplicationAction="Activate"/>
                         </root-container>
                         <experience-fragment
@@ -27,7 +27,7 @@
                             <jcr:content
                                 jcr:primaryType="nt:unstructured"
                                 jcr:mixinTypes="[cq:ReplicationStatus]"
-                                cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+                                cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
                                 cq:lastReplicationAction="Activate"/>
                             <cq:authoring jcr:primaryType="nt:unstructured">
                                 <assetToComponentMapping jcr:primaryType="nt:unstructured">
@@ -48,7 +48,7 @@
                             <jcr:content
                                 jcr:primaryType="nt:unstructured"
                                 jcr:mixinTypes="[cq:ReplicationStatus]"
-                                cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+                                cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
                                 cq:lastReplicationAction="Activate"/>
                             <cq:authoring jcr:primaryType="nt:unstructured">
                                 <assetToComponentMapping jcr:primaryType="nt:unstructured">

diff --git a/...ntent/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/.content.xml b/...ntent/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/.content.xml
@@ -9,6 +9,6 @@
         ranking="{Long}10"
         status="enabled"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate"/>
 </jcr:root>
diff --git a/..._root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/policies/.content.xml b/..._root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/policies/.content.xml
@@ -5,7 +5,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate">
         <root
             cq:policy="wcmio-archetype-aem65/core/components/container/container/root-container"

diff --git a/...root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/structure/.content.xml b/...root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/structure/.content.xml
@@ -7,7 +7,7 @@
         jcr:primaryType="cq:PageContent"
         sling:resourceType="wcmio-archetype-aem65/core/components/global/page"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate">
         <root
             jcr:primaryType="nt:unstructured"

diff --git a/...mio-archetype-aem65/settings/wcm/templates/experience-fragment-web-variation/.content.xml b/...mio-archetype-aem65/settings/wcm/templates/experience-fragment-web-variation/.content.xml
@@ -8,6 +8,6 @@
         ranking="{Long}10"
         status="enabled"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate"/>
 </jcr:root>
diff --git a/...type-aem65/settings/wcm/templates/experience-fragment-web-variation/policies/.content.xml b/...type-aem65/settings/wcm/templates/experience-fragment-web-variation/policies/.content.xml
@@ -5,7 +5,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate">
         <root
             cq:policy="wcmio-archetype-aem65/core/components/container/container/experience-fragment"

diff --git a/...ype-aem65/settings/wcm/templates/experience-fragment-web-variation/structure/.content.xml b/...ype-aem65/settings/wcm/templates/experience-fragment-web-variation/structure/.content.xml
@@ -7,7 +7,7 @@
         jcr:primaryType="cq:PageContent"
         sling:resourceType="wcmio-archetype-aem65/core/components/global/page"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate">
         <root
             jcr:primaryType="nt:unstructured"

diff --git a/...-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/.content.xml b/...-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/.content.xml
@@ -9,6 +9,6 @@
         ranking="{Long}20"
         status="enabled"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate"/>
 </jcr:root>
diff --git a/...jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/policies/.content.xml b/...jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/policies/.content.xml
@@ -5,7 +5,7 @@
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate">
         <root
             cq:policy="wcmio-archetype-aem65/core/components/container/container/root-container"

diff --git a/...cr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/structure/.content.xml b/...cr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/structure/.content.xml
@@ -7,7 +7,7 @@
         jcr:primaryType="cq:PageContent"
         sling:resourceType="wcmio-archetype-aem65/core/components/global/page"
         jcr:mixinTypes="[cq:ReplicationStatus]"
-        cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
         cq:lastReplicationAction="Activate">
         <root
             jcr:primaryType="nt:unstructured"

diff --git a/...conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/pom.xml b/...conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/pom.xml
@@ -69,7 +69,7 @@
             <path>^/conf/.+/settings/wcm/policies/.+/jcr:content$</path>
             <path>^/conf/.+/settings/wcm/templates/[^/]+(/policies|/structure)?/jcr:content$</path>
           </markReplicationActivatedIncludeNodes>
-          <dateLastReplicated>2022-05-05T00:00:00.000+02:00</dateLastReplicated>
+          <dateLastReplicated>2022-10-18T00:00:00.000+02:00</dateLastReplicated>
         </configuration>
       </plugin>
 

diff --git a/.../en/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml b/.../en/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml
@@ -4,5 +4,8 @@
     <jcr:content
         jcr:primaryType="cq:PageContent"
         sling:configPropertyInherit="{Boolean}false"
-        enabled="{Boolean}true"/>
+        enabled="{Boolean}true"
+        jcr:mixinTypes="[cq:ReplicationStatus]"
+        cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
+        cq:lastReplicationAction="Activate"/>
 </jcr:root>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,7 @@ nodes: @@
     config:
       contentPackage.group: it
       app:
         # Default log level for application code
         logLevel: info
@@ Expand Down @@