Merge branch 'develop'

wcm-io · Jul 3, 2023 · fa25a94 · fa25a94
2 parents 48d1237 + 0e2117a
commit fa25a94
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,18 @@
     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="3.8.2" date="2023-07-03">
+      <action type="update" dev="sseifert"><![CDATA[
+        Dispatcher Configuration for AEMaaCS: Configure <code>httpd.headers.htmlExpirationTimeSec</code> conditionally per environment (DEV: 5 sec, STAGE/PROD: 300 sec by default).
+      ]]></action>
+      <action type="update" dev="sseifert">
+        Update to AEM 6.5 SP17.
+      </action>
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+    </release>
+
     <release version="3.8.0" date="2023-05-22">
       <action type="add" dev="sseifert"><![CDATA[
         Add new option "optionWcmioSiteApi" which allows to setup an AEM headless project based <a href="https://wcm.io/site-api/">wcm.io Site API</a>.

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.maven.archetypes</groupId>
   <artifactId>io.wcm.maven.archetypes.aem</artifactId>
-  <version>3.8.0</version>
+  <version>3.8.2</version>
   <packaging>maven-archetype</packaging>
 
   <name>wcm.io Maven Archetype for AEM</name>

diff --git a/src/main/resources/META-INF/archetype-post-generate.groovy b/src/main/resources/META-INF/archetype-post-generate.groovy
@@ -37,6 +37,9 @@ def integrationTests = new File(rootDir, "tests/integration")
 if ((optionAemServicePack=="y" || optionAemServicePackAPI=="y") && optionAemVersion == "cloud") {
   throw new RuntimeException("For AEMaaCS optionAemServicePack='y' or optionAemServicePackAPI='y' is not allowed - there are no service packs for the cloud.")
 }
+if (optionAemServicePackAPI != "y" && optionAemVersion != "cloud") {
+  throw new RuntimeException("For AEM 6.5 optionAemServicePackAPI='y' is mandatory. Also set optionAemServicePack='y' or deploy the service pack manually.")
+}
 if (optionMultiBundleLayout == "y" && optionSlingInitialContentBundle == "n") {
   throw new RuntimeException("Parameter optionMultiBundleLayout='y' is only supported with optionSlingInitialContentBundle='y'.")
 }

diff --git a/src/main/resources/archetype-resources/config-definition/src/main/environments/cloud.yaml b/src/main/resources/archetype-resources/config-definition/src/main/environments/cloud.yaml
@@ -66,9 +66,12 @@ config:
     sampleContent: true
 
   httpd:
-    headers:
-      # Set default expiration time for text/html responses (also affects dispatcher caching/invalidation)
-      htmlExpirationTimeMin: 0
+    # Set default expiration time for text/html responses (also affects dispatcher caching/invalidation)
+    # Configuration is different per dev/stage/prod environment
+    cloudManagerConditional:
+      dev.headers.htmlExpirationTimeSec: 5
+      stage.headers.htmlExpirationTimeSec: 300
+      prod.headers.htmlExpirationTimeSec: 300
 
   # Replication configuration not required for AEM cloud service
   replication:

diff --git a/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml b/...sources/archetype-resources/config-definition/src/main/roles/__projectName__-aem-cms.yaml
@@ -14,7 +14,7 @@ files:
 
 #if ( $optionAemVersion == '6.5' && $optionAemServicePack == 'y' )
 # AEM Service Pack
-- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.16.0/zip
+- url: mvn:adobe.binary.aem.65.servicepack/aem-service-pkg/6.5.17.0/zip
   dir: packages
   modelOptions:
     delayAfterInstallSec: 30

diff --git a/src/main/resources/archetype-resources/parent/pom.xml b/src/main/resources/archetype-resources/parent/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>io.wcm.maven</groupId>
     <artifactId>io.wcm.maven.aem-global-parent</artifactId>
-    <version>2.1.2</version>
+    <version>2.1.4</version>
     <relativePath/>
   </parent>
 
@@ -32,10 +32,10 @@
     <!-- Versions -->
 #end
 #if ( $optionAemVersion != "cloud" )
-    <core.wcm.components.version>2.22.6</core.wcm.components.version>
+    <core.wcm.components.version>2.22.10</core.wcm.components.version>
 #end
 #if( $optionAcsCommons == "y" )
-    <acs.aem.commons.version>6.0.8</acs.aem.commons.version>
+    <acs.aem.commons.version>6.0.10</acs.aem.commons.version>
 #end
 
     <!-- Enable reproducible builds -->
@@ -97,7 +97,7 @@
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.models.impl</artifactId>
-        <version>1.6.0</version>
+        <version>1.6.4</version>
       </dependency>
 
 #end
@@ -146,7 +146,7 @@
       <dependency>
         <groupId>io.wcm</groupId>
         <artifactId>io.wcm.sling.commons</artifactId>
-        <version>1.6.2</version>
+        <version>1.6.4</version>
       </dependency>
 #end
 #if ( $optionWcmioHandler == "y" )
@@ -226,7 +226,7 @@
       <dependency>
         <groupId>io.wcm.devops.conga.definitions</groupId>
         <artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
-        <version>1.15.0</version>
+        <version>2.0.0</version>
       </dependency>
 
       <!-- wcm.io Testing -->
@@ -259,7 +259,7 @@
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.testing.caconfig-mock-plugin</artifactId>
-        <version>1.5.0</version>
+        <version>1.5.2</version>
       </dependency>
       <dependency>
         <groupId>io.wcm</groupId>
@@ -304,7 +304,7 @@
       <dependency>
         <groupId>io.wcm.maven</groupId>
         <artifactId>io.wcm.maven.aem-dependencies</artifactId>
-        <version>#if($optionAemServicePack=="y" || $optionAemServicePackAPI=="y")6.5.16.0000#{else}6.5.0.0005#end</version>
+        <version>#if($optionAemServicePack=="y" || $optionAemServicePackAPI=="y")6.5.17.0001#{else}6.5.0.0005#end</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -356,7 +356,7 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-#set( $mockitoVersion = "5.3.1" )
+#set( $mockitoVersion = "5.4.0" )
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>