update integration tests to latest archetype/versions

Author: stefanseifert

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 \

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

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>

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>

tooling/conga-aem-maven-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

tooling/conga-aem-maven-plugin/src/it/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

tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/config-definition/src/main/templates/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]
 

tooling/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>

tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/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">

tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/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>