Skip to content

Commit 9c08d0e

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents e895a4e + 928c5f6 commit 9c08d0e

File tree

80 files changed

+929
-261
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+929
-261
lines changed

‎changes.xml

+8
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@
2323
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
2424
<body>
2525

26+
<release version="2.19.0" date="2022-11-10">
27+
<action type="add" dev="sseifert">
28+
conga-aem-maven-plugin: Introduce new parameter "packageVersionMode" to "cloudmanager-all-package" goal, which allows to enable a special "RELEASE_SUFFIX_VERSION" mode.
29+
If this is activated, all the versions of all content packages with a release version contained in the "all" package get a suffix consisting of the version of the POM the mojo is executed in.
30+
This is useful when deploying to AMS with Cloud Manager.
31+
</action>
32+
</release>
33+
2634
<release version="2.18.6" date="2022-10-17">
2735
<action type="update" dev="sseifert">
2836
conga-aem-maven-plugin: Make use of ${project.build.outputTimestamp} for reproducible builds for dispatcher configuration and processed packages in "all" package.

‎conga-aem-plugin/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.18.6</version>
28+
<version>2.19.0</version>
2929
<relativePath>../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
34-
<version>2.18.6</version>
34+
<version>2.19.0</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
34-
<version>2.18.6</version>
34+
<version>2.19.0</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<parent>
2424
<groupId>io.wcm.devops.conga.plugins</groupId>
2525
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
26-
<version>2.18.6</version>
26+
<version>2.19.0</version>
2727
<relativePath>parent/pom.xml</relativePath>
2828
</parent>
2929

3030
<groupId>io.wcm.devops.conga.plugins</groupId>
3131
<artifactId>io.wcm.devops.conga.plugins.aem.root</artifactId>
32-
<version>2.18.6</version>
32+
<version>2.19.0</version>
3333
<packaging>pom</packaging>
3434

3535
<name>CONGA AEM Plugin</name>

‎tooling/conga-aem-crypto-cli/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.18.6</version>
28+
<version>2.19.0</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-crypto-cli</artifactId>
3434
<packaging>jar</packaging>
35-
<version>2.18.6</version>
35+
<version>2.19.0</version>
3636

3737
<name>CONGA AEM Crypto Command Line Interface</name>
3838
<description>Command line tool to generate Crypto keys for AEM.</description>
@@ -42,7 +42,7 @@
4242
<dependency>
4343
<groupId>io.wcm.devops.conga.plugins</groupId>
4444
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
45-
<version>2.18.6</version>
45+
<version>2.19.0</version>
4646
<scope>compile</scope>
4747
<exclusions>
4848
<!-- Exclude all deps - only crypto util classes are used -->

‎tooling/conga-aem-maven-plugin/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
<parent>
2626
<groupId>io.wcm.devops.conga.plugins</groupId>
2727
<artifactId>io.wcm.devops.conga.plugins.aem.parent</artifactId>
28-
<version>2.18.6</version>
28+
<version>2.19.0</version>
2929
<relativePath>../../parent/pom.xml</relativePath>
3030
</parent>
3131

3232
<groupId>io.wcm.devops.conga.plugins</groupId>
3333
<artifactId>conga-aem-maven-plugin</artifactId>
3434
<packaging>maven-plugin</packaging>
35-
<version>2.18.6</version>
35+
<version>2.19.0</version>
3636

3737
<name>CONGA AEM Maven Plugin</name>
3838
<description>wcm.io DevOps CONGA - CONfiguration GenerAtor Maven Plugin for AEM</description>
@@ -63,7 +63,7 @@
6363
<dependency>
6464
<groupId>io.wcm.devops.conga.plugins</groupId>
6565
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
66-
<version>2.18.6</version>
66+
<version>2.19.0</version>
6767
<scope>compile</scope>
6868
</dependency>
6969
<dependency>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/archetype-params.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
mvn org.apache.maven.plugins:maven-archetype-plugin:3.1.0:generate -DinteractiveMode=false \
22
-DarchetypeGroupId=io.wcm.maven.archetypes \
33
-DarchetypeArtifactId=io.wcm.maven.archetypes.aem \
4-
-DarchetypeVersion=3.6.0-SNAPSHOT \
4+
-DarchetypeVersion=3.6.7-SNAPSHOT \
55
-DprojectName=wcmio-archetype-aem65 \
66
-DgroupId=io.wcm.devops.conga.plugins.aem.it \
77
-DartifactId=io.wcm.devops.conga.plugins.aem.it.aem65 \

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/archetype.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ aemPublishPort=4503
1414
optionAemVersion=6.5
1515
optionJavaVersion=8
1616
optionAemServicePack=n
17+
optionAemServicePackAPI=n
1718
optionSlingModelsLatest=y
1819
optionSlingInitialContentBundle=y
1920
optionEditableTemplates=y
@@ -22,5 +23,5 @@ optionContextAwareConfig=y
2223
optionFrontend=n
2324
optionNodeJsPlugin=n
2425
optionWcmioHandler=y
25-
optionAcsCommons=n
26+
optionAcsCommons=y
2627
optionIntegrationTests=n

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/bundles/core/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,11 @@
172172
<artifactId>core.wcm.components.core</artifactId>
173173
<scope>compile</scope>
174174
</dependency>
175+
<dependency>
176+
<groupId>com.adobe.acs</groupId>
177+
<artifactId>acs-aem-commons-bundle</artifactId>
178+
<scope>compile</scope>
179+
</dependency>
175180

176181
<!-- AEM dependencies provided - so each project has full control about their positions (should always be last in the list). -->
177182
<dependency>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/config-definition/pom.xml

+36
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,20 @@
5757
<scope>compile</scope>
5858
</dependency>
5959

60+
<!-- ACS AEM Commons -->
61+
<dependency>
62+
<groupId>com.adobe.acs</groupId>
63+
<artifactId>acs-aem-commons-ui.apps</artifactId>
64+
<type>zip</type>
65+
<scope>compile</scope>
66+
</dependency>
67+
<dependency>
68+
<groupId>com.adobe.acs</groupId>
69+
<artifactId>acs-aem-commons-ui.content</artifactId>
70+
<type>zip</type>
71+
<scope>compile</scope>
72+
</dependency>
73+
6074
</dependencies>
6175

6276
<build>
@@ -80,6 +94,28 @@
8094
</executions>
8195
</plugin>
8296

97+
<plugin>
98+
<groupId>io.wcm.devops.conga.plugins</groupId>
99+
<artifactId>conga-aem-maven-plugin</artifactId>
100+
<executions>
101+
102+
<!-- Generate "all" packages including all packages from CONGA configuration for deployment via Adobe Cloud Manager -->
103+
<execution>
104+
<id>cloudmanager-all-package</id>
105+
<phase>generate-resources</phase>
106+
<goals>
107+
<goal>cloudmanager-all-package</goal>
108+
</goals>
109+
<configuration>
110+
<group>it</group>
111+
<packageTypeValidation>WARN</packageTypeValidation>
112+
<packageVersionMode>RELEASE_SUFFIX_VERSION</packageVersionMode>
113+
</configuration>
114+
</execution>
115+
116+
</executions>
117+
</plugin>
118+
83119
<!-- Do not generate eclipse project files -->
84120
<plugin>
85121
<groupId>io.wcm.devops.maven.plugins</groupId>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/config-definition/src/main/environments/local.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ nodes:
2121

2222
config:
2323
contentPackage.group: it
24+
2425
app:
2526
# Default log level for application code
2627
logLevel: info

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/config-definition/src/main/roles/wcmio-archetype-aem65-aem-cms.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,16 @@ files:
1717
- url: mvn:com.adobe.cq/core.wcm.components.all//zip
1818
dir: packages
1919

20+
# ACS AEM Commons
21+
- url: mvn:com.adobe.acs/acs-aem-commons-ui.apps//zip
22+
dir: packages
23+
postProcessorOptions:
24+
contentPackage.packageType: application
25+
- url: mvn:com.adobe.acs/acs-aem-commons-ui.content//zip
26+
dir: packages
27+
postProcessorOptions:
28+
contentPackage.packageType: content
29+
2030
# AEM OSGi System Configuration
2131
- file: wcmio-archetype-aem65-aem-cms-config.provisioning
2232
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

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"io.wcm.devops.conga.plugins.aem.it.aem65.config.impl.MediaFormatProviderImpl", \
4949
"io.wcm.devops.conga.plugins.aem.it.aem65.config.impl.MediaHandlerConfigImpl", \
5050
"io.wcm.caconfig.extensions.contextpath.impl.RootTemplateContextPathStrategy", \
51-
"io.wcm.caconfig.extensions.persistence.impl.PagePersistenceStrategy"]
51+
"io.wcm.caconfig.extensions.persistence.impl.PagePersistenceStrategy",
52+
"io.wcm.handler.mediasource.dam.impl.dynamicmedia.DynamicMediaSupportServiceImpl"]
5253

5354
[configurations runModes=author]
5455

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/complete/pom.xml

+17
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@
7878
<scope>provided</scope>
7979
</dependency>
8080

81+
<!-- ACS AEM Commons -->
82+
<dependency>
83+
<groupId>com.adobe.acs</groupId>
84+
<artifactId>acs-aem-commons-bundle</artifactId>
85+
<scope>compile</scope>
86+
</dependency>
87+
8188
</dependencies>
8289

8390
<build>
@@ -135,6 +142,16 @@
135142
</artifactId>
136143
<type>jar</type>
137144
</embedded>
145+
<!-- ACS AEM Commons -->
146+
<embedded>
147+
<groupId>
148+
com.adobe.acs
149+
</groupId>
150+
<artifactId>
151+
acs-aem-commons-bundle
152+
</artifactId>
153+
<type>jar</type>
154+
</embedded>
138155
</embeddeds>
139156

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<jcr:content
1717
jcr:primaryType="nt:unstructured"
1818
jcr:mixinTypes="[cq:ReplicationStatus]"
19-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
19+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
2020
cq:lastReplicationAction="Activate"/>
2121
</root-container>
2222
<experience-fragment
@@ -27,7 +27,7 @@
2727
<jcr:content
2828
jcr:primaryType="nt:unstructured"
2929
jcr:mixinTypes="[cq:ReplicationStatus]"
30-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
30+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
3131
cq:lastReplicationAction="Activate"/>
3232
<cq:authoring jcr:primaryType="nt:unstructured">
3333
<assetToComponentMapping jcr:primaryType="nt:unstructured">
@@ -48,7 +48,7 @@
4848
<jcr:content
4949
jcr:primaryType="nt:unstructured"
5050
jcr:mixinTypes="[cq:ReplicationStatus]"
51-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
51+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
5252
cq:lastReplicationAction="Activate"/>
5353
<cq:authoring jcr:primaryType="nt:unstructured">
5454
<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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
ranking="{Long}10"
1010
status="enabled"
1111
jcr:mixinTypes="[cq:ReplicationStatus]"
12-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
12+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
1313
cq:lastReplicationAction="Activate"/>
1414
</jcr:root>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/policies/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
jcr:primaryType="nt:unstructured"
66
sling:resourceType="wcm/core/components/policies/mappings"
77
jcr:mixinTypes="[cq:ReplicationStatus]"
8-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
8+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
99
cq:lastReplicationAction="Activate">
1010
<root
1111
cq:policy="wcmio-archetype-aem65/core/components/container/container/root-container"

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/contentpage/structure/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
jcr:primaryType="cq:PageContent"
88
sling:resourceType="wcmio-archetype-aem65/core/components/global/page"
99
jcr:mixinTypes="[cq:ReplicationStatus]"
10-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
10+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
1111
cq:lastReplicationAction="Activate">
1212
<root
1313
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/experience-fragment-web-variation/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
ranking="{Long}10"
99
status="enabled"
1010
jcr:mixinTypes="[cq:ReplicationStatus]"
11-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
11+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
1212
cq:lastReplicationAction="Activate"/>
1313
</jcr:root>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/experience-fragment-web-variation/policies/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
jcr:primaryType="nt:unstructured"
66
sling:resourceType="wcm/core/components/policies/mappings"
77
jcr:mixinTypes="[cq:ReplicationStatus]"
8-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
8+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
99
cq:lastReplicationAction="Activate">
1010
<root
1111
cq:policy="wcmio-archetype-aem65/core/components/container/container/experience-fragment"

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/experience-fragment-web-variation/structure/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
jcr:primaryType="cq:PageContent"
88
sling:resourceType="wcmio-archetype-aem65/core/components/global/page"
99
jcr:mixinTypes="[cq:ReplicationStatus]"
10-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
10+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
1111
cq:lastReplicationAction="Activate">
1212
<root
1313
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/homepage/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
ranking="{Long}20"
1010
status="enabled"
1111
jcr:mixinTypes="[cq:ReplicationStatus]"
12-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
12+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
1313
cq:lastReplicationAction="Activate"/>
1414
</jcr:root>

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/policies/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
jcr:primaryType="nt:unstructured"
66
sling:resourceType="wcm/core/components/policies/mappings"
77
jcr:mixinTypes="[cq:ReplicationStatus]"
8-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
8+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
99
cq:lastReplicationAction="Activate">
1010
<root
1111
cq:policy="wcmio-archetype-aem65/core/components/container/container/root-container"

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/jcr_root/conf/wcmio-archetype-aem65/settings/wcm/templates/homepage/structure/.content.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
jcr:primaryType="cq:PageContent"
88
sling:resourceType="wcmio-archetype-aem65/core/components/global/page"
99
jcr:mixinTypes="[cq:ReplicationStatus]"
10-
cq:lastReplicated="{Date}2022-05-05T00:00:00.000+02:00"
10+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
1111
cq:lastReplicationAction="Activate">
1212
<root
1313
jcr:primaryType="nt:unstructured"

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/conf-content/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
<path>^/conf/.+/settings/wcm/policies/.+/jcr:content$</path>
7070
<path>^/conf/.+/settings/wcm/templates/[^/]+(/policies|/structure)?/jcr:content$</path>
7171
</markReplicationActivatedIncludeNodes>
72-
<dateLastReplicated>2022-05-05T00:00:00.000+02:00</dateLastReplicated>
72+
<dateLastReplicated>2022-10-18T00:00:00.000+02:00</dateLastReplicated>
7373
</configuration>
7474
</plugin>
7575

‎tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/content-packages/sample-content/jcr_root/conf/wcmio-archetype-aem65/en/_sling_configs/com.adobe.cq.wcm.core.components.internal.DataLayerConfig/.content.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,8 @@
44
<jcr:content
55
jcr:primaryType="cq:PageContent"
66
sling:configPropertyInherit="{Boolean}false"
7-
enabled="{Boolean}true"/>
7+
enabled="{Boolean}true"
8+
jcr:mixinTypes="[cq:ReplicationStatus]"
9+
cq:lastReplicated="{Date}2022-10-18T00:00:00.000+02:00"
10+
cq:lastReplicationAction="Activate"/>
811
</jcr:root>

0 commit comments

Comments
 (0)