do not generate additional dependencies for sub packages

Author: stefanseifert

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

@@ -378,7 +378,7 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
                 try (FileOutputStream subPackageFos = new FileOutputStream(tempSubPackageFile)) {
                   IOUtils.copy(is, subPackageFos);
                 }
-                File resultSubPackageFile = processContentPackage(tempSubPackageFile, pkg, previousPkg, environmentRunMode, allPackagesFromFileSets);
+                File resultSubPackageFile = processContentPackage(tempSubPackageFile, pkg, null, environmentRunMode, allPackagesFromFileSets);
                 try (FileInputStream subPackageFis = new FileInputStream(resultSubPackageFile)) {
                   ZipEntry zipOutEntry = new ZipEntry(path + basename + runModeSuffix + ".zip");
                   zipOut.putNextEntry(zipOutEntry);

tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java

@@ -216,8 +216,7 @@ void testBuild_IMMUTABLE_MUTABLE_COMBINED(Set<String> cloudManagerTarget, List<S
           "adobe/consulting:acs-aem-commons-ui.content" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
           "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
-          "accesscontroltool-apps-package" + runmodeSuffix,
-          "adobe/consulting:acs-aem-commons-ui.content" + runmodeSuffix + ":4.10.0");
+          "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix,
           "wcm-io-samples:aem-cms-system-config" + runmodeSuffix + ":1.3.1-SNAPSHOT");
@@ -295,8 +294,7 @@ void testBuild_IMMUTABLE_MUTABLE_SEPARATE(Set<String> cloudManagerTarget, List<S
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
           "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
-          "accesscontroltool-apps-package" + runmodeSuffix,
-          "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
+          "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix,
           "wcm-io-samples:aem-cms-system-config" + runmodeSuffix + ":1.3.1-SNAPSHOT");
@@ -372,8 +370,7 @@ void testBuild_IMMUTABLE_ONLY(Set<String> cloudManagerTarget, List<String> runmo
           "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
       assertNameDependenciesSubPackage(containerInstallDir, "accesscontroltool-package" + runmodeSuffix + "-3.0.0.zip",
           "jcr_root/apps/netcentric/actool/install/accesscontroltool-apps-package-3.0.0" + runmodeSuffix + ".zip",
-          "accesscontroltool-apps-package" + runmodeSuffix,
-          "adobe/consulting:acs-aem-commons-ui.apps" + runmodeSuffix + ":4.10.0");
+          "accesscontroltool-apps-package" + runmodeSuffix);
       assertNameDependencies(containerInstallDir, "wcm-io-samples-aem-cms-config" + runmodeSuffix + ".zip",
           "wcm-io-samples-aem-cms-config" + runmodeSuffix,
           "wcm-io-samples:aem-cms-system-config" + runmodeSuffix + ":1.3.1-SNAPSHOT");