Skip to content

Commit 84b1747

Browse files
committed
validate sub package types only in STRICT mode
1 parent b1ca217 commit 84b1747

3 files changed

Lines changed: 9 additions & 1 deletion

File tree

tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
512512
// then process it as well, remove if from the content package is was contained it
513513
// and add it as "1st level package" to the all package
514514
TemporaryContentPackageFile tempSubPackage = new TemporaryContentPackageFile(tempSubPackageFile, pkg.getVariants());
515-
if (!isValidPackageType(tempSubPackage)) {
515+
if (packageTypeValidation == PackageTypeValidation.STRICT && !isValidPackageType(tempSubPackage)) {
516516
throw new IllegalArgumentException("Package " + pkg.getPackageInfo() + " contains sub package " + tempSubPackage.getPackageInfo()
517517
+ " with invalid package type: '" + StringUtils.defaultString(tempSubPackage.getPackageType()) + "'");
518518
}

tooling/conga-aem-maven-plugin/src/test/resources/node-mixed-package/model.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,11 @@ roles:
3434
group: adobe/consulting, groupId: com.adobe.acs, name: acs-aem-commons-ui.content,
3535
path: /etc/packages/adobe/consulting/acs-aem-commons-ui.content.zip, requiresRoot: false,
3636
version: 5.0.10}
37+
- path: packages/assetshare.ui.apps-1.9.4.zip
38+
postProcessors: [aem-contentpackage-properties]
39+
aemContentPackageProperties: {acHandling: merge_preserve, artifactId: assetshare.ui.apps,
40+
created: '2020-03-04T21:00:48.654-0500', createdBy: dgonzale, dependencies: '',
41+
description: Asset Share Commons is an open-source asset share implementation
42+
for Adobe Experience Manager. This requires a minimum of AEM 6.3 SP1., group: asset-share-commons,
43+
groupId: com.adobe.aem.commons, name: asset-share-commons.ui.apps, path: /etc/packages/asset-share-commons/asset-share-commons.ui.apps.zip,
44+
requiresRoot: false, version: 1.9.4}

0 commit comments

Comments
 (0)