Skip to content

Commit fd32bd1

Browse files
committed
aem-contentpackage-properties plugin: Also support "jar" file extension for AEM content packages (but only when explicitly defined as post processor).
1 parent 7fd13d7 commit fd32bd1

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

changes.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424
<body>
2525

2626
<release version="1.8.14" date="not released">
27+
<action type="update" dev="sseifert">
28+
aem-contentpackage-properties plugin: Also support "jar" file extension for AEM content packages (but only when explicitly defined as post processor).
29+
</action>
2730
<action type="update" dev="sseifert">
2831
Update dependencies.
2932
</action>

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackagePropertiesPostProcessor.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ public class ContentPackagePropertiesPostProcessor extends AbstractPostProcessor
5252
public static final String MODEL_OPTIONS_PROPERTY = "aemContentPackageProperties";
5353

5454
private static final String FILE_EXTENSION = "zip";
55+
private static final String ALTERNATE_FILE_EXTENSION = "jar";
5556

5657
@Override
5758
public String getName() {
@@ -60,12 +61,18 @@ public String getName() {
6061

6162
@Override
6263
public boolean accepts(FileContext file, PostProcessorContext context) {
63-
return FileUtil.matchesExtension(file, FILE_EXTENSION);
64+
return FileUtil.matchesExtension(file, FILE_EXTENSION)
65+
|| FileUtil.matchesExtension(file, ALTERNATE_FILE_EXTENSION);
6466
}
6567

6668
@Override
6769
public ImplicitApplyOptions implicitApply(FileContext file, PostProcessorContext context) {
68-
return ImplicitApplyOptions.ALWAYS;
70+
if (FileUtil.matchesExtension(file, FILE_EXTENSION)) {
71+
return ImplicitApplyOptions.ALWAYS;
72+
}
73+
else {
74+
return ImplicitApplyOptions.NEVER;
75+
}
6976
}
7077

7178
@Override

0 commit comments

Comments
 (0)