Skip to content

Commit 04de65e

Browse files
committed
Merge branch 'develop'
2 parents c31b6f6 + 6bf90ef commit 04de65e

File tree

11 files changed

+149
-132
lines changed

11 files changed

+149
-132
lines changed

.github/workflows/maven-deploy.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
name: Deploy
44

5+
concurrency: ${{ github.workflow }}
6+
57
on:
68
push:
79
branches:

.mvn/wrapper/maven-wrapper.jar

3.73 KB
Binary file not shown.

.mvn/wrapper/maven-wrapper.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
# to you under the Apache License, Version 2.0 (the
66
# "License"); you may not use this file except in compliance
77
# with the License. You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing,
1212
# software distributed under the License is distributed on an
1313
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
17+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
18+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

changes.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,12 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="2.0.2" date="2023-09-08">
27+
<action type="fix" dev="trichter" issue="90">
28+
Role aem-dispatcher-cloud: Use https in rewriteHomepageRedirect to avoid unnecessary http redirect.
29+
</action>
30+
</release>
31+
2632
<release version="2.0.0" date="2023-07-03">
2733
<action type="add" dev="sseifert">
2834
Role aem-dispatcher-cloud: Add httpd.headers.htmlExpirationTimeSec parameter to control the default expiration time for text/html responses.

conga-aem-definitions/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.definitions</groupId>
2727
<artifactId>io.wcm.devops.conga.definitions.aem.parent</artifactId>
28-
<version>2.0.0</version>
28+
<version>2.0.2</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
34-
<version>2.0.0</version>
34+
<version>2.0.2</version>
3535
<packaging>config-definition</packaging>
3636

3737
<name>CONGA AEM Definitions</name>

conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ RewriteRule ^/(.+)$ /content/$1 [PT,L]
214214
{{~#block "rewriteHomepageRedirect"}}
215215
{{~#if httpd.rootRedirect.url}}
216216
# Root redirect to homepage
217-
RewriteRule ^/$ {{httpd.rootRedirect.url}} [R={{httpd.rootRedirect.httpStatus}},L]
217+
RewriteRule ^/$ https://%{HTTP_HOST}{{httpd.rootRedirect.url}} [R={{httpd.rootRedirect.httpStatus}},L]
218218
{{/if ~}}
219219
{{/block}}
220220

example/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<groupId>io.wcm.devops.conga.definitions</groupId>
3333
<artifactId>io.wcm.devops.conga.definitions.aem.example</artifactId>
3434
<packaging>config</packaging>
35-
<version>2.0.0</version>
35+
<version>2.0.2</version>
3636

3737
<name>CONGA AEM Definitions Example</name>
3838
<description>Example environment definition.</description>
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>io.wcm.devops.conga.definitions</groupId>
4545
<artifactId>io.wcm.devops.conga.definitions.aem</artifactId>
46-
<version>2.0.0</version>
46+
<version>2.0.2</version>
4747
</dependency>
4848

4949
</dependencies>

0 commit comments

Comments
 (0)