wcm-io-devops
diff --git a/‎changes.xml‎
Lines changed: 6 additions & 0 deletions b/‎changes.xml‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java‎
Lines changed: 23 additions & 4 deletions b/‎tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java‎
Lines changed: 23 additions & 4 deletions
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.14.8" date="not released">
+      <action type="update" dev="sseifert">
+        conga-aem-maven-plugin:cloudmanager-all-package: Ensure dependencies of sub packages are managed as well.
+      </action>
+    </release>
+
     <release version="1.14.6" date="2021-06-27">
       <action type="update" dev="sseifert">
         conga-aem-maven-plugin:cloudmanager-all-package: Extract nested sub packages and treat them in the same way as the other packages (managing dependencies and run modes).
 
@@ -221,7 +221,7 @@ public boolean build(Map<String, String> properties) throws IOException {
     Set<Dependency> allPackagesFromFileSets = new HashSet<>();
     for (ContentPackageFileSet fileSet : fileSets) {
       for (ContentPackageFile pkg : fileSet.getContentPackages()) {
-        allPackagesFromFileSets.add(new Dependency(pkg.getGroup(), pkg.getName(), VersionRange.fromString(pkg.getVersion())));
+        addDependencyInformation(allPackagesFromFileSets, pkg);
       }
     }
 
@@ -364,6 +364,7 @@ private List<TemporaryContentPackageFile> processContentPackage(ContentPackageFi
       Set<Dependency> allPackagesFromFileSets) throws IOException {
 
     List<TemporaryContentPackageFile> result = new ArrayList<>();
+    List<TemporaryContentPackageFile> subPackages = new ArrayList<>();
 
     // create temp zip file to create rewritten copy of package
     File tempFile = File.createTempFile(FilenameUtils.getBaseName(pkg.getFile().getName()), ".zip");
@@ -386,9 +387,13 @@ private List<TemporaryContentPackageFile> processContentPackage(ContentPackageFi
                 Properties props = new Properties();
                 props.loadFromXML(is);
                 addSuffixToPackageName(props, pkg, environmentRunMode);
-                if (autoDependenciesMode != AutoDependenciesMode.OFF) {
-                  updateDependencies(props, previousPkg, environmentRunMode, allPackagesFromFileSets);
+
+                // update package dependencies
+                ContentPackageFile dependencyFile = previousPkg;
+                if (autoDependenciesMode == AutoDependenciesMode.OFF) {
+                  dependencyFile = null;
                 }
+                updateDependencies(props, dependencyFile, environmentRunMode, allPackagesFromFileSets);
 
                 // if package type is missing package properties, put in the type defined in model
                 if (props.get(NAME_PACKAGE_TYPE) == null) {
@@ -417,7 +422,7 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
                       + " with invalid package type: '" + StringUtils.defaultString(tempSubPackage.getPackageType()) + "'");
                 }
                 if (StringUtils.isNoneBlank(tempSubPackage.getGroup(), tempSubPackage.getName())) {
-                  result.addAll(processContentPackage(tempSubPackage, previousPkg, environmentRunMode, allPackagesFromFileSets));
+                  subPackages.add(tempSubPackage);
                   processedEntry = true;
                 }
                 else {
@@ -438,6 +443,16 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
         }
       }
 
+      // add sub package metadata to set with dependency information
+      for (TemporaryContentPackageFile tempSubPackage : subPackages) {
+        addDependencyInformation(allPackagesFromFileSets, tempSubPackage);
+      }
+
+      // process sub packages and add to result
+      for (TemporaryContentPackageFile tempSubPackage : subPackages) {
+        result.addAll(processContentPackage(tempSubPackage, previousPkg, environmentRunMode, allPackagesFromFileSets));
+      }
+
       result.add(new TemporaryContentPackageFile(tempFile, pkg.getVariants()));
     }
     return result;
@@ -506,6 +521,10 @@ private static Dependency[] removeReferencesToManagedPackages(Dependency[] deps,
         .toArray(size -> new Dependency[size]);
   }
 
+  private static void addDependencyInformation(Set<Dependency> allPackagesFromFileSets, ContentPackageFile pkg) {
+    allPackagesFromFileSets.add(new Dependency(pkg.getGroup(), pkg.getName(), VersionRange.fromString(pkg.getVersion())));
+  }
+
   public String getGroupName() {
     return this.groupName;
   }