From 7c72ad65fdd72ce6f9f6c13d7b074d911d471e45 Mon Sep 17 00:00:00 2001 From: Tobias Richter Date: Fri, 17 Mar 2023 13:20:40 +0100 Subject: [PATCH 1/4] [gitflow-maven-plugin] Update for next development version 1.15.1-SNAPSHOT --- conga-aem-definitions/pom.xml | 4 ++-- example/pom.xml | 4 ++-- parent/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml index 1e1a5a9..c574e4d 100644 --- a/conga-aem-definitions/pom.xml +++ b/conga-aem-definitions/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.15.0 + 1.15.1-SNAPSHOT ../parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.15.0 + 1.15.1-SNAPSHOT config-definition CONGA AEM Definitions diff --git a/example/pom.xml b/example/pom.xml index 51133ec..3aa2bf1 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -32,7 +32,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.example config - 1.15.0 + 1.15.1-SNAPSHOT CONGA AEM Definitions Example Example environment definition. @@ -43,7 +43,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.15.0 + 1.15.1-SNAPSHOT diff --git a/parent/pom.xml b/parent/pom.xml index e91b2b9..e705336 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.15.0 + 1.15.1-SNAPSHOT pom CONGA AEM Definitions diff --git a/pom.xml b/pom.xml index aef391d..d2be9a9 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.15.0 + 1.15.1-SNAPSHOT parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.root - 1.15.0 + 1.15.1-SNAPSHOT pom CONGA AEM Definitions From f23aa6703ef11c6cf61001cff4b5c9959a136920 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Tue, 27 Jun 2023 12:26:40 +0200 Subject: [PATCH 2/4] Introduce httpd.headers.htmlExpirationTimeSec as replacement of httpd.headers.htmlExpirationTimeMin (#89) Role aem-dispatcher-cloud: Add httpd.headers.htmlExpirationTimeSec parameter to control the default expiration time for text/html responses. Role aem-dispatcher-cloud: Remove httpd.headers.htmlExpirationTimeMin parameter which was interperted incorrectly as seconds instead of minutes. Build will fail if this parameters is still in use. also remove httpd.headers.htmlExpirationTimeMin from role aem-dispatcher-ams which was never used. --- changes.xml | 9 +++++++++ conga-aem-definitions/pom.xml | 10 +++++----- .../src/main/roles/aem-dispatcher-ams.yaml | 3 --- .../src/main/roles/aem-dispatcher-cloud.yaml | 4 ++-- .../conf.d/variables/global.vars.hbs | 7 +++++-- example/pom.xml | 14 +++++++------- example/src/main/environments/test.yaml | 3 +-- parent/pom.xml | 2 +- pom.xml | 4 ++-- 9 files changed, 32 insertions(+), 24 deletions(-) diff --git a/changes.xml b/changes.xml index 0bc49bb..5832ec8 100644 --- 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"> + + + Role aem-dispatcher-cloud: Add httpd.headers.htmlExpirationTimeSec parameter to control the default expiration time for text/html responses. + + + 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. + + + 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 index c574e4d..afee98a 100644 --- a/conga-aem-definitions/pom.xml +++ b/conga-aem-definitions/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.15.1-SNAPSHOT + 2.0.0-SNAPSHOT ../parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.15.1-SNAPSHOT + 2.0.0-SNAPSHOT config-definition CONGA AEM Definitions @@ -51,7 +51,7 @@ io.wcm.devops.conga conga-maven-plugin - 1.14.6 + 1.16.0-SNAPSHOT true @@ -59,12 +59,12 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.sling - 1.3.0 + 1.3.2 io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.16.0 + 2.19.4 diff --git a/conga-aem-definitions/src/main/roles/aem-dispatcher-ams.yaml b/conga-aem-definitions/src/main/roles/aem-dispatcher-ams.yaml index c9ef744..ab85f41 100644 --- 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 index 67699c2..a76b3c6 100644 --- 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 index 8e7d336..2831310 100644 --- 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 index 3aa2bf1..2ed1b29 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -32,7 +32,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.example config - 1.15.1-SNAPSHOT + 2.0.0-SNAPSHOT CONGA AEM Definitions Example Example environment definition. @@ -43,7 +43,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 1.15.1-SNAPSHOT + 2.0.0-SNAPSHOT @@ -55,7 +55,7 @@ io.wcm.devops.conga conga-maven-plugin - 1.14.6 + 1.16.0-SNAPSHOT true @@ -63,19 +63,19 @@ io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.sling - 1.3.0 + 1.3.2 io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.aem - 2.16.0 + 2.19.4 io.wcm.devops.conga.plugins io.wcm.devops.conga.plugins.ansible - 1.3.0 + 1.4.2 @@ -93,7 +93,7 @@ org.codehaus.mojo properties-maven-plugin - 1.0.0 + 1.1.0 set-properties diff --git a/example/src/main/environments/test.yaml b/example/src/main/environments/test.yaml index 5f862a8..ae03fc9 100644 --- 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 index e705336..31a030e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.15.1-SNAPSHOT + 2.0.0-SNAPSHOT pom CONGA AEM Definitions diff --git a/pom.xml b/pom.xml index d2be9a9..e6b6bba 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 1.15.1-SNAPSHOT + 2.0.0-SNAPSHOT parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.root - 1.15.1-SNAPSHOT + 2.0.0-SNAPSHOT pom CONGA AEM Definitions From ddd000147feceb9ec71a361015548207645abd20 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 3 Jul 2023 12:05:14 +0200 Subject: [PATCH 3/4] prepare release --- changes.xml | 2 +- conga-aem-definitions/pom.xml | 2 +- example/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/changes.xml b/changes.xml index 5832ec8..4d0e3a6 100644 --- a/changes.xml +++ b/changes.xml @@ -23,7 +23,7 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + Role aem-dispatcher-cloud: Add httpd.headers.htmlExpirationTimeSec parameter to control the default expiration time for text/html responses. diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml index afee98a..c6ce712 100644 --- a/conga-aem-definitions/pom.xml +++ b/conga-aem-definitions/pom.xml @@ -51,7 +51,7 @@ io.wcm.devops.conga conga-maven-plugin - 1.16.0-SNAPSHOT + 1.16.0 true diff --git a/example/pom.xml b/example/pom.xml index 2ed1b29..8f3003a 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -55,7 +55,7 @@ io.wcm.devops.conga conga-maven-plugin - 1.16.0-SNAPSHOT + 1.16.0 true From 9e787e87ab73a0e9abed573ba4c2ead7096b81ac Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Mon, 3 Jul 2023 12:05:49 +0200 Subject: [PATCH 4/4] [gitflow-maven-plugin] Update versions for release 2.0.0 --- conga-aem-definitions/pom.xml | 4 ++-- example/pom.xml | 4 ++-- parent/pom.xml | 2 +- pom.xml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conga-aem-definitions/pom.xml b/conga-aem-definitions/pom.xml index c6ce712..8931839 100644 --- a/conga-aem-definitions/pom.xml +++ b/conga-aem-definitions/pom.xml @@ -25,13 +25,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 2.0.0-SNAPSHOT + 2.0.0 ../parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 2.0.0-SNAPSHOT + 2.0.0 config-definition CONGA AEM Definitions diff --git a/example/pom.xml b/example/pom.xml index 8f3003a..7c688c8 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -32,7 +32,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.example config - 2.0.0-SNAPSHOT + 2.0.0 CONGA AEM Definitions Example Example environment definition. @@ -43,7 +43,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem - 2.0.0-SNAPSHOT + 2.0.0 diff --git a/parent/pom.xml b/parent/pom.xml index 31a030e..425b3c0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -31,7 +31,7 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 2.0.0-SNAPSHOT + 2.0.0 pom CONGA AEM Definitions diff --git a/pom.xml b/pom.xml index e6b6bba..0135a15 100644 --- a/pom.xml +++ b/pom.xml @@ -23,13 +23,13 @@ io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.parent - 2.0.0-SNAPSHOT + 2.0.0 parent/pom.xml io.wcm.devops.conga.definitions io.wcm.devops.conga.definitions.aem.root - 2.0.0-SNAPSHOT + 2.0.0 pom CONGA AEM Definitions