Content Package Validator: Update to filevault-package-maven-plugin 1.1.8.

Content Package Validator: Load default node types for validation from biz.netcentric.aem:aem-nodetypes and io.wcm.tooling.nodetypes:io.wcm.tooling.nodetypes.wcmio.

Author: stefanseifert

changes.xml

@@ -27,6 +27,12 @@
       <action type="update" dev="sseifert">
         conga-aem-maven-plugin:cloudmanager-all-package: Ensure dependencies of sub packages are managed as well.
       </action>
+      <action type="update" dev="sseifert">
+        Content Package Validator: Update to filevault-package-maven-plugin 1.1.8.
+      </action>
+      <action type="update" dev="sseifert">
+        Content Package Validator: Load default node types for validation from biz.netcentric.aem:aem-nodetypes and io.wcm.tooling.nodetypes:io.wcm.tooling.nodetypes.wcmio.
+      </action>
     </release>
 
     <release version="1.14.6" date="2021-06-27">

conga-aem-plugin/pom.xml

@@ -92,6 +92,16 @@
         </exclusion>
       </exclusions>
     </dependency>
+    <dependency>
+      <groupId>biz.netcentric.aem</groupId>
+      <artifactId>aem-nodetypes</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>io.wcm.tooling.nodetypes</groupId>
+      <artifactId>io.wcm.tooling.nodetypes.wcmio</artifactId>
+      <scope>compile</scope>
+    </dependency>
 
     <dependency>
       <groupId>io.wcm.tooling.commons</groupId>

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/validator/ContentPackageValidator.java

@@ -35,13 +35,16 @@
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 
+import com.google.common.collect.ImmutableMap;
+
 import io.wcm.devops.conga.generator.spi.ImplicitApplyOptions;
 import io.wcm.devops.conga.generator.spi.ValidationException;
 import io.wcm.devops.conga.generator.spi.ValidatorPlugin;
 import io.wcm.devops.conga.generator.spi.context.FileContext;
 import io.wcm.devops.conga.generator.spi.context.ValidatorContext;
 import io.wcm.devops.conga.generator.util.FileUtil;
 import io.wcm.devops.conga.model.util.MapExpander;
+import io.wcm.devops.conga.model.util.MapMerger;
 import io.wcm.devops.conga.tooling.maven.plugin.util.MavenContext;
 import io.wcm.tooling.commons.packmgr.util.ContentPackageProperties;
 
@@ -59,6 +62,10 @@ public class ContentPackageValidator implements ValidatorPlugin {
 
   private static final String OPTION_VALIDATORS_SETTINGS = "contentPackage.validatorsSettings";
 
+  // apply default validation for AEM and wcm.io node types
+  private static final Map<String, Object> DEFAULT_VALIDATORS_SETTINGS = ImmutableMap.of("jackrabbit-nodetypes",
+      ImmutableMap.of("options", ImmutableMap.of("cnds", "tccl:aem.cnd,tccl:wcmio.cnd")));
+
   @Override
   public String getName() {
     return NAME;
@@ -114,9 +121,11 @@ private void validateContentPackage(File packageFile, ValidatorContext context,
     setProperty(mojo, "repositorySystem", mavenContext.getRepositorySystem());
     setProperty(mojo, "resolutionErrorHandler", mavenContext.getResolutionErrorHandler());
     setProperty(mojo, "buildContext", mavenContext.getBuildContext());
+    setProperty(mojo, "attachedArtifacts", Collections.emptyList());
 
     Object validatorsSettings = MapExpander.getDeep(context.getOptions(), OPTION_VALIDATORS_SETTINGS);
-    setProperty(mojo, "validatorsSettings", toValidatorsSettings(toMap(validatorsSettings)));
+    Map<String,Object> validatorSettingsMap = MapMerger.merge(toMap(validatorsSettings), DEFAULT_VALIDATORS_SETTINGS);
+    setProperty(mojo, "validatorsSettings", toValidatorsSettings(validatorSettingsMap));
 
     mojo.execute();
   }

example/pom.xml

@@ -65,7 +65,7 @@
           <dependency>
             <groupId>io.wcm.devops.conga.plugins</groupId>
             <artifactId>io.wcm.devops.conga.plugins.aem</artifactId>
-            <version>1.14.5-SNAPSHOT</version>
+            <version>1.14.7-SNAPSHOT</version>
           </dependency>
 
         </dependencies>

example/src/main/roles/aem.yaml

@@ -82,6 +82,24 @@ files:
       filters:
       - filter: /etc/replication/agents.author
 
+# Oak Index
+- file: aem-cms-oak-index.json
+  dir: packages
+  template: aem-cms-oak-index.json.hbs
+  postProcessors:
+    - aem-contentpackage
+  postProcessorOptions:
+    contentPackage:
+      name: schindler-aem-aem-cms-oak-index
+      packageType: application
+      rootPath: /oak:index
+      allowIndexDefinitions: true
+  validatorOptions:
+    contentPackage.validatorsSettings:
+      jackrabbit-packagetype:
+        options:
+          immutableRootNodeNames: apps,libs,oak:index
+
 # Download AEM content package and extract properties
 - url: mvn:io.wcm/io.wcm.caconfig.editor.package//zip
   dir: packages