Skip to content

Commit 9c08d0e

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

80 files changed

Lines changed: 929 additions & 261 deletions

File tree

Some content is hidden

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

‎changes.xml‎

Lines changed: 8 additions & 0 deletions
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‎

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.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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 3 additions & 3 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 1 deletion
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‎

Lines changed: 5 additions & 0 deletions
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‎

Lines changed: 36 additions & 0 deletions
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>

0 commit comments

Comments
 (0)