Merge branch 'develop'

stefanseifert · stefanseifert · commit c31b6f6d1318 · 2023-07-03T12:05:49.000+02:00
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.0.0" date="2023-07-03">
+      <action type="add" dev="sseifert">
+        Role aem-dispatcher-cloud: Add httpd.headers.htmlExpirationTimeSec parameter to control the default expiration time for text/html responses.
+      </action>
+      <action type="remove" dev="sseifert">
+        Role aem-dispatcher-cloud: Remove httpd.headers.htmlExpirationTimeMin parameter which was interpreted incorrectly as seconds instead of minutes. Build will fail if this parameters is still in use.
+      </action>
+    </release>
+
     <release version="1.15.0" date="2023-03-17">
       <action type="add" dev="trichter" issue="88">
         Role aem-dispatcher-cloud: Introduce httpd.rewrites (ported from aem-dispatcher-ams role).
diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml
@@ -25,13 +25,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.definitions</groupId>
     <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-    <version>1.15.0</version>
+    <version>2.0.0</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <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>
   <packaging>config-definition</packaging>
 
   <name>CONGA AEM Definitions</name>
@@ -51,20 +51,20 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.14.6</version>
+        <version>1.16.0</version>
         <extensions>true</extensions>
         <dependencies>
 
           <!-- Activate further CONGA plugins for special file types -->
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.2</version>
           </dependency>
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-            <version>2.16.0</version>
+            <version>2.19.4</version>
           </dependency>
 
         </dependencies>
diff --git a/conga-aem-definitions/src/main/roles/aem-dispatcher-ams.yaml b/conga-aem-definitions/src/main/roles/aem-dispatcher-ams.yaml
@@ -298,8 +298,6 @@ config:
         # Cache AEM Clientlibs with long cache key for 1 year
         - locationMatch: "\\.lc-.*-lc\\.min\\.(css|js)$"
           directives: "max-age=31536000, public"
-      # Set the default experiation time for text/html responses (enabled by default in AEM Cloud Service webserver)
-      htmlExpirationTimeMin: 5
 
     # List of rewrite rules to include in the vhost
     rewriteIncludes:
@@ -382,7 +380,6 @@ config:
     #    serverAliasNames:
     #    - www.dev-alias3a.com
     #    - www.dev-alias3b.com
-    #    htmlExpirationTimeMin: 3
 
 
   dispatcher:
diff --git a/conga-aem-definitions/src/main/roles/aem-dispatcher-cloud.yaml b/conga-aem-definitions/src/main/roles/aem-dispatcher-cloud.yaml
@@ -357,7 +357,7 @@ config:
         - locationMatch: "\\.lc-.*-lc\\.min\\.(css|js)$"
           directives: "max-age=31536000, public"
       # Set the default experiation time for text/html responses (enabled by default in AEM Cloud Service webserver)
-      htmlExpirationTimeMin: 5
+      htmlExpirationTimeSec: 300
 
     # List of rewrite rules to include in the vhost
     rewriteIncludes:
@@ -411,7 +411,7 @@ config:
     #    serverAliasNames:
     #    - www.dev-alias3a.com
     #    - www.dev-alias3b.com
-    #    htmlExpirationTimeMin: 3
+    #    htmlExpirationTimeSec: 180
 
 
   dispatcher:
diff --git a/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/variables/global.vars.hbs b/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/variables/global.vars.hbs
@@ -1,3 +1,6 @@
+{{disallowProperty
+    "httpd.headers.htmlExpirationTimeMin" "Parameter 'httpd.headers.htmlExpirationTimeMin' is no longer supported, please use 'httpd.headers.htmlExpirationTimeSec' instead."
+~}}
 #
 # This file contains the variables defined for all virtual hosts
 #
@@ -33,6 +36,6 @@ Define REWRITE_LOG_LEVEL {{httpd.logging.rewriteLogLevel}}
 
 
 {{#httpdCloudManagerConditional}}
-# Set the default expiration time for text/html responses (in minutes)
-Define EXPIRATION_TIME {{httpd.headers.htmlExpirationTimeMin}}
+# Set the default expiration time for text/html responses (in seconds)
+Define EXPIRATION_TIME {{httpd.headers.htmlExpirationTimeSec}}
 {{/httpdCloudManagerConditional}}
diff --git a/example/pom.xml b/example/pom.xml
@@ -32,7 +32,7 @@
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.example</artifactId>
   <packaging>config</packaging>
-  <version>1.15.0</version>
+  <version>2.0.0</version>
 
   <name>CONGA AEM Definitions Example</name>
   <description>Example environment definition.</description>
@@ -43,7 +43,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>
 
   </dependencies>
@@ -55,27 +55,27 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.14.6</version>
+        <version>1.16.0</version>
         <extensions>true</extensions>
         <dependencies>
 
           <!-- Activate further CONGA plugins for special file types -->
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.sling</artifactId>
-            <version>1.3.0</version>
+            <version>1.3.2</version>
           </dependency>
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-            <version>2.16.0</version>
+            <version>2.19.4</version>
           </dependency>
 
           <!-- Test with ansible encryption -->
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
-            <version>1.3.0</version>
+            <version>1.4.2</version>
           </dependency>
 
         </dependencies>
@@ -93,7 +93,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>properties-maven-plugin</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
         <executions>
           <execution>
             <id>set-properties</id>
diff --git a/example/src/main/environments/test.yaml b/example/src/main/environments/test.yaml
@@ -114,7 +114,7 @@ nodes:
             type: allow
           - _merge_
         headers:
-          htmlExpirationTimeMin: 3
+          htmlExpirationTimeSec: 180
           featurePolicy: "geolocation 'self' https://example.com; camera 'none';"
           permissionsPolicy: 'geolocation=(self "https://example.com"), camera=()'
       dispatcher:
@@ -164,7 +164,6 @@ nodes:
                 type: allow
               - _merge_
           headers:
-            htmlExpirationTimeMin: 6
             featurePolicy: 'geolocation *;'
             permissionsPolicy: 'geolocation=*'
 
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-  <version>1.15.0</version>
+  <version>2.0.0</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Definitions</name>
diff --git a/pom.xml b/pom.xml
@@ -23,13 +23,13 @@
   <parent>
     <groupId>io.wcm.devops.conga.definitions</groupId>
     <artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
-    <version>1.15.0</version>
+    <version>2.0.0</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
   <groupId>io.wcm.devops.conga.definitions</groupId>
   <artifactId>io.wcm.devops.conga.definitions.aem.root</artifactId>
-  <version>1.15.0</version>
+  <version>2.0.0</version>
   <packaging>pom</packaging>
 
   <name>CONGA AEM Definitions</name>

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,6 @@`
	`1`	`+{{disallowProperty`
	`2`	`+ "httpd.headers.htmlExpirationTimeMin" "Parameter 'httpd.headers.htmlExpirationTimeMin' is no longer supported, please use 'httpd.headers.htmlExpirationTimeSec' instead."`
	`3`	`+~}}`
`1`	`4`	`#`
`2`	`5`	`# This file contains the variables defined for all virtual hosts`
`3`	`6`	`#`
`@@ -33,6 +36,6 @@ Define REWRITE_LOG_LEVEL {{httpd.logging.rewriteLogLevel}}`
`33`	`36`
`34`	`37`
`35`	`38`	`{{#httpdCloudManagerConditional}}`
`36`		`-# Set the default expiration time for text/html responses (in minutes)`
`37`		`-Define EXPIRATION_TIME {{httpd.headers.htmlExpirationTimeMin}}`
	`39`	`+# Set the default expiration time for text/html responses (in seconds)`
	`40`	`+Define EXPIRATION_TIME {{httpd.headers.htmlExpirationTimeSec}}`
`38`	`41`	`{{/httpdCloudManagerConditional}}`