add debug logging for AllPackageBuilder

Author: stefanseifert

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

@@ -216,6 +216,7 @@ private AllPackageBuilder createBuilder(String packageName) {
 
   private void buildAllPackage(AllPackageBuilder builder) throws MojoExecutionException {
     try {
+      getLog().debug("Start generating " + getCanonicalPath(builder.getTargetFile()) + "...");
       if (builder.build(properties)) {
         getLog().info("Generated " + getCanonicalPath(builder.getTargetFile()));
         if (attachArtifact) {

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

@@ -339,6 +339,7 @@ private void addFileWithDependency(ContentPackage contentPackage, String path,
 
     // open original content package
     try (ZipFile zipFileIn = new ZipFile(pkg.getFile())) {
+      String dependenciesString = null;
 
       // iterate through entries and write them to the temp. zip file
       try (FileOutputStream fos = new FileOutputStream(tempFile);
@@ -356,7 +357,7 @@ private void addFileWithDependency(ContentPackage contentPackage, String path,
                 props.loadFromXML(is);
                 addSuffixToPackageName(props, pkg, environmentRunMode);
                 if (autoDependenciesMode != AutoDependenciesMode.OFF) {
-                  updateDependencies(props, previousPkg, environmentRunMode, allPackagesFromFileSets);
+                  dependenciesString = updateDependencies(props, previousPkg, environmentRunMode, allPackagesFromFileSets);
                 }
                 props.storeToXML(zipOut, null);
               }
@@ -370,6 +371,11 @@ private void addFileWithDependency(ContentPackage contentPackage, String path,
             zipOut.closeEntry();
           }
         }
+
+        if (log.isDebugEnabled()) {
+          log.debug("Adding package " + getCanonicalPath(pkg.getFile())
+              + (dependenciesString != null ? " with dependencies: " + dependenciesString : ""));
+        }
       }
 
       // add temp zip file to "all" content package
@@ -387,7 +393,7 @@ private void addFileWithDependency(ContentPackage contentPackage, String path,
    * @param allPackagesFromFileSets Set with all packages from all file sets as dependency instances
    * @throws IOException I/O exception
    */
-  private static void updateDependencies(Properties props, ContentPackageFile dependencyFile, String environmentRunMode,
+  private static String updateDependencies(Properties props, ContentPackageFile dependencyFile, String environmentRunMode,
       Set<Dependency> allPackagesFromFileSets) throws IOException {
     String[] existingDepsStrings = StringUtils.split(props.getProperty(NAME_DEPENDENCIES), ",");
     Dependency[] existingDeps = null;
@@ -429,7 +435,12 @@ private static void updateDependencies(Properties props, ContentPackageFile depe
     }
 
     if (deps != null) {
-      props.put(NAME_DEPENDENCIES, Dependency.toString(deps));
+      String dependenciesString = Dependency.toString(deps);
+      props.put(NAME_DEPENDENCIES, dependenciesString);
+      return dependenciesString;
+    }
+    else {
+      return null;
     }
   }