Skip to content

Commit 2ece74a

Browse files
stefanseifertstefanseifert
committed
Merge branch 'develop'
2 parents 7d93dce + 164b8dd commit 2ece74a

63 files changed

Lines changed: 1714 additions & 485 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: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,16 @@
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.18.0" date="2022-06-16">
27+
<action type="add" dev="sseifert">
28+
conga-aem-maven-plugin: Add parameter "runModeOptimization" to "cloudmanager-all-package" goal, set by default to OFF.
29+
When set to ELIMINATE_DUPLICATES, only one content package is built per environment, including author and publish runmodes, eliminating duplicates between those two modes as much as possible.
30+
</action>
31+
<action type="add" dev="sseifert">
32+
conga-aem-maven-plugin: Check package manager installstatus.jsp before and after installation of content package to make sure packager manager is also completed with installing embedded packages.
33+
</action>
34+
</release>
35+
2636
<release version="2.17.0" date="2022-05-11">
2737
<action type="add" dev="sseifert">
2838
conga-aem-maven-plugin: Add new parameter packageTypeValidation which controls how to handle packages with invalid or without package types.

‎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.17.0</version>
28+
<version>2.18.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.17.0</version>
34+
<version>2.18.0</version>
3535
<packaging>jar</packaging>
3636

3737
<name>CONGA AEM Plugin</name>

‎parent/pom.xml‎

Lines changed: 2 additions & 2 deletions
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.17.0</version>
34+
<version>2.18.0</version>
3535
<packaging>pom</packaging>
3636

3737
<name>CONGA AEM Plugin</name>
@@ -75,7 +75,7 @@
7575
<dependency>
7676
<groupId>io.wcm.tooling.commons</groupId>
7777
<artifactId>io.wcm.tooling.commons.crx-packmgr-helper</artifactId>
78-
<version>2.0.4</version>
78+
<version>2.1.0</version>
7979
</dependency>
8080

8181
<dependency>

‎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.17.0</version>
26+
<version>2.18.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.17.0</version>
32+
<version>2.18.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.17.0</version>
28+
<version>2.18.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.17.0</version>
35+
<version>2.18.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.17.0</version>
45+
<version>2.18.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.17.0</version>
28+
<version>2.18.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.17.0</version>
35+
<version>2.18.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.17.0</version>
66+
<version>2.18.0</version>
6767
<scope>compile</scope>
6868
</dependency>
6969
<dependency>

‎tooling/conga-aem-maven-plugin/src/it/example/pom.xml‎

Lines changed: 50 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,22 @@
4444
<dependency>
4545
<groupId>io.wcm</groupId>
4646
<artifactId>io.wcm.caconfig.editor.package</artifactId>
47-
<version>1.0.0</version>
47+
<version>1.12.0</version>
4848
<type>zip</type>
4949
</dependency>
5050

5151
<!-- ACS AEM Commons -->
5252
<dependency>
5353
<groupId>com.adobe.acs</groupId>
5454
<artifactId>acs-aem-commons-ui.apps</artifactId>
55-
<classifier>min</classifier>
56-
<version>5.0.10</version>
55+
<version>5.3.0</version>
5756
<type>zip</type>
5857
<scope>compile</scope>
5958
</dependency>
6059
<dependency>
6160
<groupId>com.adobe.acs</groupId>
6261
<artifactId>acs-aem-commons-ui.content</artifactId>
63-
<classifier>min</classifier>
64-
<version>5.0.10</version>
62+
<version>5.3.0</version>
6563
<type>zip</type>
6664
<scope>compile</scope>
6765
</dependency>
@@ -97,24 +95,54 @@
9795
</configuration>
9896
</plugin>
9997

100-
<!-- do not deploy this example into maven repository -->
10198
<plugin>
102-
<groupId>org.apache.maven.plugins</groupId>
103-
<artifactId>maven-deploy-plugin</artifactId>
104-
<inherited>false</inherited>
105-
<configuration>
106-
<skip>true</skip>
107-
</configuration>
108-
</plugin>
109-
110-
<!-- do not generate site for this project -->
111-
<plugin>
112-
<groupId>org.apache.maven.plugins</groupId>
113-
<artifactId>maven-site-plugin</artifactId>
114-
<configuration>
115-
<skip>true</skip>
116-
<skipDeploy>true</skipDeploy>
117-
</configuration>
99+
<groupId>io.wcm.devops.conga.plugins</groupId>
100+
<artifactId>conga-aem-maven-plugin</artifactId>
101+
<version>@project.version@</version>
102+
<executions>
103+
104+
<!-- Generate variants of "all" packages (for testing purposes) -->
105+
<execution>
106+
<id>all-default</id>
107+
<phase>generate-resources</phase>
108+
<goals>
109+
<goal>cloudmanager-all-package</goal>
110+
</goals>
111+
<configuration>
112+
<group>it</group>
113+
<packageTypeValidation>WARN</packageTypeValidation>
114+
<target>${project.build.directory}/all/default</target>
115+
</configuration>
116+
</execution>
117+
<execution>
118+
<id>all-runmode-optimization</id>
119+
<phase>generate-resources</phase>
120+
<goals>
121+
<goal>cloudmanager-all-package</goal>
122+
</goals>
123+
<configuration>
124+
<group>it</group>
125+
<runModeOptimization>ELIMINATE_DUPLICATES</runModeOptimization>
126+
<packageTypeValidation>WARN</packageTypeValidation>
127+
<target>${project.build.directory}/all/runmode-optimization</target>
128+
</configuration>
129+
</execution>
130+
<execution>
131+
<id>all-single</id>
132+
<phase>generate-resources</phase>
133+
<goals>
134+
<goal>cloudmanager-all-package</goal>
135+
</goals>
136+
<configuration>
137+
<group>it</group>
138+
<singlePackage>true</singlePackage>
139+
<runModeOptimization>ELIMINATE_DUPLICATES</runModeOptimization>
140+
<packageTypeValidation>WARN</packageTypeValidation>
141+
<target>${project.build.directory}/all/single</target>
142+
</configuration>
143+
</execution>
144+
145+
</executions>
118146
</plugin>
119147

120148
</plugins>

‎tooling/conga-aem-maven-plugin/src/it/example/src/main/environments/dev.yaml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# Defines an environment
2+
3+
nodes:
4+
5+
# Example nodes
6+
- node: aem-author
7+
roles:
8+
- role: aem
9+
variant: aem-author
10+
- node: aem-publish
11+
roles:
12+
- role: aem
13+
variant: aem-publish
14+
- node: webserver
15+
roles:
16+
- role: webserver
17+
18+
# Tenant defintions
19+
tenants:
20+
21+
# Tenant with two tenant roles (can be used for filtering file multiply)
22+
- tenant: tenant1
23+
roles:
24+
- website
25+
- application
26+
config:
27+
domain: dev.mysite.de
28+
httpd:
29+
serverPort: 8080
30+
serverPortSsl: 8443
31+
enforceSsl: true
32+
33+
# Tenant with one tenant roles
34+
- tenant: tenant2
35+
roles:
36+
- website
37+
config:
38+
domain: dev.mysite.fr
39+
40+
config:
41+
replication:
42+
author:
43+
publishTargets:
44+
- name: publish1
45+
url: http://localhost:4503
46+
transportUser: myuser
47+
transportPassword: mypassword
48+
49+
cloudManager.target:
50+
- dev

‎tooling/conga-aem-maven-plugin/src/it/example/src/main/environments/prod.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
nodes:
44

55
# Example nodes
6-
- node: aem
6+
- node: aem-author
77
roles:
88
- role: aem
9+
variant: aem-author
10+
- node: aem-publish
11+
roles:
12+
- role: aem
13+
variant: aem-publish
914
- node: webserver
1015
roles:
1116
- role: webserver
@@ -42,3 +47,6 @@ config:
4247
url: http://localhost:4503
4348
transportUser: myuser
4449
transportPassword: mypassword
50+
51+
cloudManager.target:
52+
- prod

‎tooling/conga-aem-maven-plugin/src/it/example/src/main/roles/aem.yaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
templateDir: aem
22

3+
variants:
4+
- variant: aem-author
5+
- variant: aem-publish
6+
37
files:
48

59
# Define a AEM content package containing OSGi configurations from a Sling Provisioning file
@@ -45,6 +49,8 @@ files:
4549
pattern: /etc/map/http/.*
4650
- rule: exclude
4751
pattern: /etc/map/http/AppMeasurementBridge
52+
variants:
53+
- aem-publish
4854

4955
# AEM Systems users with ACLs
5056
- file: aem-systemusers.json
@@ -90,7 +96,7 @@ files:
9096
- aem-contentpackage
9197
postProcessorOptions:
9298
contentPackage:
93-
name: schindler-aem-aem-cms-oak-index
99+
name: aem-aem-cms-oak-index
94100
packageType: application
95101
rootPath: /oak:index
96102
allowIndexDefinitions: true
@@ -134,10 +140,14 @@ files:
134140
custom.property2: 123
135141

136142
# ACS AEM Commons
137-
- url: mvn:com.adobe.acs/acs-aem-commons-ui.apps//zip/min
143+
- url: mvn:com.adobe.acs/acs-aem-commons-ui.apps//zip
138144
dir: packages
139-
- url: mvn:com.adobe.acs/acs-aem-commons-ui.content//zip/min
145+
postProcessorOptions:
146+
contentPackage.packageType: application
147+
- url: mvn:com.adobe.acs/acs-aem-commons-ui.content//zip
140148
dir: packages
149+
postProcessorOptions:
150+
contentPackage.packageType: content
141151

142152

143153
# Defines configuration parameters and default values

0 commit comments

Comments
 (0)