Skip to content

Commit fd1c0ef

Browse files
committed
Revert "ignore duplicate entries"
This reverts commit 444dcd8.
1 parent 444dcd8 commit fd1c0ef

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

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

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,6 @@ public boolean build(Map<String, String> properties) throws IOException {
297297

298298
// build content package
299299
// if auto dependencies is active: build separate "dependency chains" between mutable and immutable packages
300-
Set<String> packageFilePaths = new HashSet<>();
301300
try (ContentPackage contentPackage = builder.build(targetFile)) {
302301
for (ContentPackageFileSet fileSet : contentPackageFileSets) {
303302
for (String environmentRunMode : fileSet.getEnvironmentRunModes()) {
@@ -323,16 +322,9 @@ public boolean build(Map<String, String> properties) throws IOException {
323322
try {
324323
for (TemporaryContentPackageFile processedFile : processedFiles) {
325324
String path = buildPackagePath(processedFile, rootPath, environmentRunMode);
326-
if (packageFilePaths.add(path)) {
327-
contentPackage.addFile(path, processedFile.getFile());
328-
if (log.isDebugEnabled()) {
329-
log.debug(" Add " + processedFile.getPackageInfoWithDependencies());
330-
}
331-
}
332-
else {
333-
if (log.isDebugEnabled()) {
334-
log.debug(" Ignore duplicate: " + processedFile.getPackageInfoWithDependencies());
335-
}
325+
contentPackage.addFile(path, processedFile.getFile());
326+
if (log.isDebugEnabled()) {
327+
log.debug(" Add " + processedFile.getPackageInfoWithDependencies());
336328
}
337329
}
338330
}

0 commit comments

Comments
 (0)