Skip to content

Commit 0fee5d2

Browse files
committed
conga-aem-maven-plugin: Add 'all-package' goal to build combined container package for deployment with Adobe Cloud Manager.
(and remove aem-contentpackage node model export plugin and 'copy-all-packages' goal)
1 parent ccbeed1 commit 0fee5d2

24 files changed

Lines changed: 944 additions & 550 deletions

File tree

changes.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@
3434
Add new config parameter 'cryptoSkip' that allows to skip crypto encryption in aemCryptoEncrypt expression.
3535
</action>
3636
<action type="add" dev="sseifert">
37-
Add "aem-contentpackage" node model export plugin to generate "all" content packages to be used by Adobe Cloud Manager.
38-
</action>
39-
<action type="add" dev="sseifert">
40-
conga-aem-maven-plugin: Add "copy-all-packages" goal to copy generated "all" content packages to the target directory so they can be picked up by Adobe Cloud Manager.
37+
conga-aem-maven-plugin: Add 'all-package' goal to build combined container package for deployment with Adobe Cloud Manager.
4138
</action>
4239
<action type="update" dev="sseifert">
4340
aem-contentpackage-osgiconfig post processor: Include only generated *.config files in AEM content package, no other .content files (exception the package is empty otherwise).

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/export/ContentPackageNodeModelExport.java

Lines changed: 0 additions & 131 deletions
This file was deleted.

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/export/EmbedPackage.java

Lines changed: 0 additions & 76 deletions
This file was deleted.

conga-aem-plugin/src/main/resources/META-INF/services/io.wcm.devops.conga.generator.spi.export.NodeModelExportPlugin

Lines changed: 0 additions & 1 deletion
This file was deleted.

conga-aem-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/export/ContentPackageNodeModelExportTest.java

Lines changed: 0 additions & 118 deletions
This file was deleted.

src/site/markdown/extensions.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@ File plugins:
1616

1717
Please note: Files with the extension `txt` are only managed as provisioning files if the contain the string "[feature " (heuristic).
1818

19-
#### Export plugins
20-
21-
| Plugin name | Description
22-
|---------------------------|-------------
23-
| `aem-contentpackage` | Generates "all" content packages to be used for deployment by Adobe Cloud Manager.
24-
2519

2620
### Generating AEM Content Packages
2721

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@
5454
<version>1.12.1-SNAPSHOT</version>
5555
<scope>compile</scope>
5656
</dependency>
57+
<dependency>
58+
<groupId>io.wcm.devops.conga.plugins</groupId>
59+
<artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
60+
<version>1.10.1-SNAPSHOT</version>
61+
<scope>compile</scope>
62+
</dependency>
5763
<dependency>
5864
<groupId>io.wcm.devops.conga.plugins</groupId>
5965
<artifactId>io.wcm.devops.conga.plugins.ansible</artifactId>
@@ -97,6 +103,14 @@
97103
<version>1.6.2</version>
98104
<scope>compile</scope>
99105
</dependency>
106+
107+
<dependency>
108+
<groupId>org.zeroturnaround</groupId>
109+
<artifactId>zt-zip</artifactId>
110+
<version>1.14</version>
111+
<scope>test</scope>
112+
</dependency>
113+
100114
</dependencies>
101115

102116
<build>

0 commit comments

Comments
 (0)