io.wcm.devops.conga.plugins
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerAllPackageMojo.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerAllPackageMojo.java
index 81538cf2..a8115e3a 100644
--- a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerAllPackageMojo.java
+++ b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/CloudManagerAllPackageMojo.java
@@ -86,16 +86,9 @@ public final class CloudManagerAllPackageMojo extends AbstractCloudManagerMojo {
/**
* Automatically generate dependencies between content packages based on file order in CONGA configuration.
*
- * Possible values:
+ * Possible options see
+ * AutoDependenciesMode.
*
- *
- * IMMUTABLE_MUTABLE_COMBINED: Generate a single dependency chain spanning both immutable and mutable
- * content packages.IMMUTABLE_MUTABLE_SEPARATE: Generate separate dependency chains for immutable and mutable content
- * packages.IMMUTABLE_ONLY: Generate a dependency chain only for immutable content packages.OFF: Do not generate dependencies between content packages.
*/
@Parameter(property = "conga.cloudManager.allPackage.autoDependenciesMode")
private AutoDependenciesMode autoDependenciesMode;
@@ -103,14 +96,9 @@ public final class CloudManagerAllPackageMojo extends AbstractCloudManagerMojo {
/**
* How to optimize author/publish run modes in resulting "all" package.
*
- * Possible values:
+ * Possible options see
+ * RunModeOptimization.
*
- *
- * OFF: No optimization takes place. Content packages and bundles are duplicated for author/publish
- * run modes to ensure strict following of dependency chain defined in CONGA.ELIMINATE_DUPLICATES: Eliminates duplicates to ensure that content packages and bundles that are
- * installed on both author and publish instances are contained only once in the "all" package.
*/
@Parameter(property = "conga.cloudManager.allPackage.runModeOptimization", defaultValue = "OFF")
private RunModeOptimization runModeOptimization;
@@ -118,18 +106,23 @@ public final class CloudManagerAllPackageMojo extends AbstractCloudManagerMojo {
/**
* How to validate package types to be included in "all" package.
*
- * Possible values:
+ * Possible options see
+ * PackageTypeValidation.
*
- *
- * STRICT: Strict mode: Ignores packages without content type (with warning), fails build if "mixed"
- * package types are used. For AEMaaCS it is mandatory to use this mode.WARN: Includes all packages, but generated warnings about packages without content type or "mixed"
- * package types.
*/
@Parameter(property = "conga.cloudManager.allPackage.packageTypeValidation", defaultValue = "STRICT")
private PackageTypeValidation packageTypeValidation;
+ /**
+ * How to handle versions of packages and sub-packages inside "all" package.
+ *
+ * Possible options see
+ * PackageVersionMode.
+ *
+ */
+ @Parameter(property = "conga.cloudManager.allPackage.packageVersionMode", defaultValue = "DEFAULT")
+ private PackageVersionMode packageVersionMode;
+
/**
* Automatically generate dependencies between content packages based on file order in CONGA configuration.
* @deprecated Please use autoDependenciesMode instead.
@@ -267,6 +260,7 @@ private AllPackageBuilder createBuilder(String packageName) {
.autoDependenciesMode(this.autoDependenciesMode)
.runModeOptimization(this.runModeOptimization)
.packageTypeValidation(this.packageTypeValidation)
+ .packageVersionMode(this.packageVersionMode)
.logger(getLog())
.buildOutputTimestamp(new BuildOutputTimestamp(outputTimestamp));
}
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/PackageVersionMode.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/PackageVersionMode.java
new file mode 100644
index 00000000..e160106e
--- /dev/null
+++ b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/PackageVersionMode.java
@@ -0,0 +1,47 @@
+/*
+ * #%L
+ * wcm.io
+ * %%
+ * Copyright (C) 2022 wcm.io
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package io.wcm.devops.conga.plugins.aem.maven;
+
+/**
+ * How to handle versions of packages and sub-packages inside "all" package.
+ */
+public enum PackageVersionMode {
+
+ /**
+ * Keep original versions.
+ */
+ DEFAULT,
+
+ /**
+ * Suffix the version number of all packages with a release version with the version of the POM the Mojo runs in.
+ * Within the version suffix, dots are replaced with underlines to avoid convision with the main version number.
+ * This is useful when deploying to AMS with Cloud Manager.
+ *
+ * Example:
+ *
+ *
+ * - Original package version: 2.5.0
+ * - POM version: 2022.1103.152749.0000000571
+ * - Resulting package version: 2.5.0-2022_1103_152749_0000000571
+ *
+ */
+ RELEASE_SUFFIX_VERSION
+
+}
diff --git a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java
index 66b52108..1e71a05b 100644
--- a/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java
+++ b/tooling/conga-aem-maven-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilder.java
@@ -29,6 +29,7 @@
import static org.apache.jackrabbit.vault.packaging.PackageProperties.NAME_DEPENDENCIES;
import static org.apache.jackrabbit.vault.packaging.PackageProperties.NAME_NAME;
import static org.apache.jackrabbit.vault.packaging.PackageProperties.NAME_PACKAGE_TYPE;
+import static org.apache.jackrabbit.vault.packaging.PackageProperties.NAME_VERSION;
import java.io.File;
import java.io.FileOutputStream;
@@ -57,6 +58,7 @@
import org.apache.jackrabbit.vault.packaging.DependencyUtil;
import org.apache.jackrabbit.vault.packaging.PackageType;
import org.apache.jackrabbit.vault.packaging.VersionRange;
+import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.logging.SystemStreamLog;
import org.jetbrains.annotations.NotNull;
@@ -67,6 +69,7 @@
import io.wcm.devops.conga.plugins.aem.maven.AutoDependenciesMode;
import io.wcm.devops.conga.plugins.aem.maven.BuildOutputTimestamp;
import io.wcm.devops.conga.plugins.aem.maven.PackageTypeValidation;
+import io.wcm.devops.conga.plugins.aem.maven.PackageVersionMode;
import io.wcm.devops.conga.plugins.aem.maven.RunModeOptimization;
import io.wcm.devops.conga.plugins.aem.maven.model.BundleFile;
import io.wcm.devops.conga.plugins.aem.maven.model.ContentPackageFile;
@@ -105,6 +108,7 @@ public final class AllPackageBuilder {
private AutoDependenciesMode autoDependenciesMode = AutoDependenciesMode.OFF;
private RunModeOptimization runModeOptimization = RunModeOptimization.OFF;
private PackageTypeValidation packageTypeValidation = PackageTypeValidation.STRICT;
+ private PackageVersionMode packageVersionMode = PackageVersionMode.DEFAULT;
private Log log;
private BuildOutputTimestamp buildOutputTimestamp;
@@ -113,6 +117,7 @@ public final class AllPackageBuilder {
PackageType.APPLICATION.name().toLowerCase(),
PackageType.CONTAINER.name().toLowerCase(),
PackageType.CONTENT.name().toLowerCase());
+ private static final String VERSION_SUFFIX_SEPARATOR = "-";
private final List contentPackageFileSets = new ArrayList<>();
private final List bundleFileSets = new ArrayList<>();
@@ -156,6 +161,15 @@ public AllPackageBuilder packageTypeValidation(PackageTypeValidation value) {
return this;
}
+ /**
+ * @param value How to handle versions of packages and sub-packages inside "all" package.
+ * @return this
+ */
+ public AllPackageBuilder packageVersionMode(PackageVersionMode value) {
+ this.packageVersionMode = value;
+ return this;
+ }
+
/**
* @param value Maven logger
* @return this
@@ -457,8 +471,8 @@ private static String buildRootPath(String groupName, String packageName) {
/**
* Generate suffix for instance and environment run modes.
- * @param file Content package
- * @return Package path
+ * @param file File
+ * @return Suffix string
*/
private static String buildRunModeSuffix(InstallableFile file, String environmentRunMode) {
StringBuilder runModeSuffix = new StringBuilder();
@@ -474,6 +488,26 @@ else if (isOnlyPublish(file)) {
return runModeSuffix.toString();
}
+ /**
+ * Generate suffix for versions of content packages.
+ * @param pkg Content package
+ * @param ignoreSnapshot Do not build version suffix for SNAPSHOT versions
+ * @return Suffix string
+ */
+ private String buildVersionSuffix(ContentPackageFile pkg, boolean ignoreSnapshot) {
+ StringBuilder versionSuffix = new StringBuilder();
+
+ if (this.packageVersionMode == PackageVersionMode.RELEASE_SUFFIX_VERSION
+ && (!ArtifactUtils.isSnapshot(pkg.getVersion()) || !ignoreSnapshot)
+ && this.version != null) {
+ versionSuffix.append(VERSION_SUFFIX_SEPARATOR)
+ // replace dots with underlines in version suffix to avoid confusion with main version number
+ .append(StringUtils.replace(this.version, ".", "_"));
+ }
+
+ return versionSuffix.toString();
+ }
+
/**
* Build path to be used for embedded package.
* @param pkg Package
@@ -492,7 +526,11 @@ private String buildPackagePath(ContentPackageFile pkg, String rootPath, String
String versionSuffix = "";
String packageVersion = pkg.getVersion();
- if (packageVersion != null && pkg.getFile().getName().contains(packageVersion)) {
+ String packageVersionWithoutSuffix = packageVersion;
+ if (this.packageVersionMode == PackageVersionMode.RELEASE_SUFFIX_VERSION && this.version != null) {
+ packageVersionWithoutSuffix = StringUtils.removeEnd(packageVersion, buildVersionSuffix(pkg, false));
+ }
+ if (packageVersion != null && pkg.getFile().getName().contains(packageVersionWithoutSuffix)) {
versionSuffix = "-" + packageVersion;
}
String fileName = pkg.getName() + versionSuffix
@@ -554,6 +592,7 @@ private List processContentPackage(ContentPackageFi
FileVaultProperties fileVaultProps = new FileVaultProperties(is);
Properties props = fileVaultProps.getProperties();
addSuffixToPackageName(props, pkg, environmentRunMode);
+ addSuffixToVersion(props, pkg);
// update package dependencies
ContentPackageFile dependencyFile = previousPkg;
@@ -562,7 +601,7 @@ private List processContentPackage(ContentPackageFi
}
updateDependencies(props, dependencyFile, environmentRunMode, allPackagesFromFileSets);
- // if package type is missing package properties, put in the type defined in model
+ // if package type is missing in package properties, put in the type defined in model
String packageType = pkg.getPackageType();
if (props.get(NAME_PACKAGE_TYPE) == null && packageType != null) {
props.put(NAME_PACKAGE_TYPE, packageType);
@@ -583,7 +622,7 @@ else if (StringUtils.equals(FilenameUtils.getExtension(zipInEntry.getName()), "z
}
// check if contained ZIP file is really a content package
- // then process it as well, remove if from the content package is was contained it
+ // then process it as well, remove if from the content package is was contained in
// and add it as "1st level package" to the all package
TemporaryContentPackageFile tempSubPackage = new TemporaryContentPackageFile(tempSubPackageFile, pkg.getVariants());
if (packageTypeValidation == PackageTypeValidation.STRICT && !isValidPackageType(tempSubPackage)) {
@@ -644,7 +683,7 @@ else if (in.getLastModifiedTime() != null) {
* @param dependencyFile Dependency package
* @param allPackagesFromFileSets Set with all packages from all file sets as dependency instances
*/
- private static void updateDependencies(Properties props, ContentPackageFile dependencyFile, String environmentRunMode,
+ private void updateDependencies(Properties props, ContentPackageFile dependencyFile, String environmentRunMode,
Set allPackagesFromFileSets) {
String[] existingDepsStrings = StringUtils.split(props.getProperty(NAME_DEPENDENCIES), ",");
Dependency[] existingDeps = null;
@@ -658,9 +697,10 @@ private static void updateDependencies(Properties props, ContentPackageFile depe
Dependency[] deps;
if (dependencyFile != null) {
String runModeSuffix = buildRunModeSuffix(dependencyFile, environmentRunMode);
+ String dependencyVersion = dependencyFile.getVersion() + buildVersionSuffix(dependencyFile, true);
Dependency newDependency = new Dependency(dependencyFile.getGroup(),
dependencyFile.getName() + runModeSuffix,
- VersionRange.fromString(dependencyFile.getVersion()));
+ VersionRange.fromString(dependencyVersion));
deps = addDependency(existingDeps, newDependency);
}
else {
@@ -688,6 +728,15 @@ private static void addSuffixToPackageName(Properties props, ContentPackageFile
props.put(NAME_NAME, packageName);
}
+ private void addSuffixToVersion(Properties props, ContentPackageFile pkg) {
+ // package version
+ if (StringUtils.isEmpty(pkg.getVersion())) {
+ return;
+ }
+ String suffixedVersion = pkg.getVersion() + buildVersionSuffix(pkg, true);
+ props.put(NAME_VERSION, suffixedVersion);
+ }
+
/**
* Removes existing references to packages contained in the list of packages to manage by this builder because
* they are added new (and probably with a different package name) during processing.
diff --git a/tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderPackageVersionModeTest.java b/tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderPackageVersionModeTest.java
new file mode 100644
index 00000000..2151eb77
--- /dev/null
+++ b/tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderPackageVersionModeTest.java
@@ -0,0 +1,286 @@
+/*
+ * #%L
+ * wcm.io
+ * %%
+ * Copyright (C) 2022 wcm.io
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package io.wcm.devops.conga.plugins.aem.maven.allpackage;
+
+import static io.wcm.devops.conga.plugins.aem.maven.allpackage.AllPackageBuilderTest.toInstallFolderNames;
+import static io.wcm.devops.conga.plugins.aem.maven.allpackage.FileTestUtil.assertDirectories;
+import static io.wcm.devops.conga.plugins.aem.maven.allpackage.FileTestUtil.assertFiles;
+import static io.wcm.devops.conga.plugins.aem.maven.allpackage.FileTestUtil.contentPackage;
+import static io.wcm.devops.conga.plugins.aem.maven.allpackage.FileTestUtil.dep;
+import static io.wcm.devops.conga.plugins.aem.maven.allpackage.FileTestUtil.file;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.io.FileUtils;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInfo;
+import org.zeroturnaround.zip.ZipUtil;
+
+import io.wcm.devops.conga.plugins.aem.maven.AutoDependenciesMode;
+import io.wcm.devops.conga.plugins.aem.maven.PackageVersionMode;
+import io.wcm.devops.conga.plugins.aem.maven.model.InstallableFile;
+import io.wcm.devops.conga.plugins.aem.maven.model.ModelParser;
+
+class AllPackageBuilderPackageVersionModeTest {
+
+ private File nodeDir;
+ private File targetDir;
+ private File targetUnpackDir;
+
+ @BeforeEach
+ void setUp(TestInfo testInfo) throws IOException {
+ nodeDir = new File("src/test/resources/node/aem-author");
+ targetDir = new File("target/test-" + getClass().getSimpleName() + "_" + testInfo.getDisplayName());
+ targetUnpackDir = new File(targetDir, "unpack");
+ FileUtils.deleteDirectory(targetDir);
+ targetDir.mkdirs();
+ targetUnpackDir.mkdirs();
+ }
+
+ @Test
+ void testBuild_DEFAULT() throws Exception {
+ List files = new ModelParser(nodeDir).getInstallableFilesForNode();
+ List runmodeSuffixes = Collections.singletonList(".author");
+ File targetFile = new File(targetDir, "all.zip");
+
+ AllPackageBuilder builder = new AllPackageBuilder(targetFile, "test-group", "test-pkg")
+ .autoDependenciesMode(AutoDependenciesMode.IMMUTABLE_MUTABLE_SEPARATE)
+ .version("99.99");
+ builder.add(files, Collections.emptySet());
+ assertTrue(builder.build(null));
+
+ ZipUtil.unpack(targetFile, targetUnpackDir);
+
+ File appsDir = new File(targetUnpackDir, "jcr_root/apps/test-group-test-pkg-packages");
+ assertDirectories(appsDir, "application", "content", "container");
+
+ File applicationDir = new File(appsDir, "application");
+ assertDirectories(applicationDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File applicationInstallDir = new File(applicationDir, "install" + runmodeSuffix);
+ assertFiles(applicationInstallDir, runmodeSuffix,
+ contentPackage("accesscontroltool-apps-package{runmode}", "3.0.0",
+ dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0")),
+ contentPackage("accesscontroltool-oakindex-package{runmode}", "3.0.0",
+ dep("Netcentric:accesscontroltool-package{runmode}:3.0.0")),
+ contentPackage("core.wcm.components.content{runmode}", "2.17.0",
+ dep("day/cq60/product:cq-platform-content:1.3.248"),
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0")),
+ contentPackage("core.wcm.components.extensions.amp.content{runmode}", "2.17.0",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0")),
+ contentPackage("acs-aem-commons-ui.apps{runmode}", "4.10.0",
+ dep("day/cq60/product:cq-content:6.3.64")),
+ contentPackage("aem-cms-system-config{runmode}",
+ dep("day/cq60/product:cq-ui-wcm-editor-content:1.1.224"),
+ dep("adobe/cq/product:cq-remotedam-client-ui-components:1.1.6"),
+ dep("adobe/cq60:core.wcm.components.all{runmode}:2.17.0")),
+ file("io.wcm.caconfig.editor-1.11.0.jar"),
+ file("io.wcm.wcm.ui.granite-1.9.2.jar"));
+ }
+
+ File contentDir = new File(appsDir, "content");
+ assertDirectories(contentDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File contentInstallDir = new File(contentDir, "install" + runmodeSuffix);
+ assertFiles(contentInstallDir, runmodeSuffix,
+ contentPackage("acs-aem-commons-ui.content{runmode}", "4.10.0"),
+ contentPackage("aem-cms-author-replicationagents{runmode}",
+ dep("adobe/consulting:acs-aem-commons-ui.content{runmode}:4.10.0")),
+ contentPackage("wcm-io-samples-sample-content{runmode}", "1.3.1-SNAPSHOT",
+ dep("wcm-io-samples:aem-cms-author-replicationagents{runmode}:1.3.1-SNAPSHOT")));
+ }
+
+ File containerDir = new File(appsDir, "container");
+ assertDirectories(containerDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File containerInstallDir = new File(containerDir, "install" + runmodeSuffix);
+ assertFiles(containerInstallDir, runmodeSuffix,
+ contentPackage("accesscontroltool-package{runmode}", "3.0.0",
+ dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0")),
+ contentPackage("core.wcm.components.all{runmode}", "2.17.0",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0")),
+ contentPackage("core.wcm.components.config{runmode}", "2.17.0",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0")),
+ contentPackage("wcm-io-samples-aem-cms-config{runmode}",
+ dep("wcm-io-samples:aem-cms-system-config{runmode}:1.3.1-SNAPSHOT")),
+ contentPackage("wcm-io-samples-complete{runmode}", "1.3.1-SNAPSHOT",
+ dep("wcm-io-samples:wcm-io-samples-aem-cms-config{runmode}:1.3.1-SNAPSHOT")));
+ }
+ }
+
+ @Test
+ void testBuild_RELEASE_SUFFIX_VERSION() throws Exception {
+ List files = new ModelParser(nodeDir).getInstallableFilesForNode();
+ List runmodeSuffixes = Collections.singletonList(".author");
+ File targetFile = new File(targetDir, "all.zip");
+
+ AllPackageBuilder builder = new AllPackageBuilder(targetFile, "test-group", "test-pkg")
+ .autoDependenciesMode(AutoDependenciesMode.IMMUTABLE_MUTABLE_SEPARATE)
+ .packageVersionMode(PackageVersionMode.RELEASE_SUFFIX_VERSION)
+ .version("99.99");
+ builder.add(files, Collections.emptySet());
+ assertTrue(builder.build(null));
+
+ ZipUtil.unpack(targetFile, targetUnpackDir);
+
+ File appsDir = new File(targetUnpackDir, "jcr_root/apps/test-group-test-pkg-packages");
+ assertDirectories(appsDir, "application", "content", "container");
+
+ File applicationDir = new File(appsDir, "application");
+ assertDirectories(applicationDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File applicationInstallDir = new File(applicationDir, "install" + runmodeSuffix);
+ assertFiles(applicationInstallDir, runmodeSuffix,
+ contentPackage("accesscontroltool-apps-package{runmode}", "3.0.0-99_99",
+ dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99")),
+ contentPackage("accesscontroltool-oakindex-package{runmode}", "3.0.0-99_99",
+ dep("Netcentric:accesscontroltool-package{runmode}:3.0.0-99_99")),
+ contentPackage("core.wcm.components.content{runmode}", "2.17.0-99_99",
+ dep("day/cq60/product:cq-platform-content:1.3.248"),
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
+ contentPackage("core.wcm.components.extensions.amp.content{runmode}", "2.17.0-99_99",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
+ contentPackage("acs-aem-commons-ui.apps{runmode}", "4.10.0-99_99",
+ dep("day/cq60/product:cq-content:6.3.64")),
+ contentPackage("aem-cms-system-config{runmode}",
+ dep("day/cq60/product:cq-ui-wcm-editor-content:1.1.224"),
+ dep("adobe/cq/product:cq-remotedam-client-ui-components:1.1.6"),
+ dep("adobe/cq60:core.wcm.components.all{runmode}:2.17.0-99_99")),
+ file("io.wcm.caconfig.editor-1.11.0.jar"),
+ file("io.wcm.wcm.ui.granite-1.9.2.jar"));
+ }
+
+ File contentDir = new File(appsDir, "content");
+ assertDirectories(contentDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File contentInstallDir = new File(contentDir, "install" + runmodeSuffix);
+ assertFiles(contentInstallDir, runmodeSuffix,
+ contentPackage("acs-aem-commons-ui.content{runmode}", "4.10.0-99_99"),
+ contentPackage("aem-cms-author-replicationagents{runmode}",
+ dep("adobe/consulting:acs-aem-commons-ui.content{runmode}:4.10.0-99_99")),
+ contentPackage("wcm-io-samples-sample-content{runmode}", "1.3.1-SNAPSHOT",
+ dep("wcm-io-samples:aem-cms-author-replicationagents{runmode}:1.3.1-SNAPSHOT")));
+ }
+
+ File containerDir = new File(appsDir, "container");
+ assertDirectories(containerDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File containerInstallDir = new File(containerDir, "install" + runmodeSuffix);
+ assertFiles(containerInstallDir, runmodeSuffix,
+ contentPackage("accesscontroltool-package{runmode}", "3.0.0-99_99",
+ dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99")),
+ contentPackage("core.wcm.components.all{runmode}", "2.17.0-99_99",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
+ contentPackage("core.wcm.components.config{runmode}", "2.17.0-99_99",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
+ contentPackage("wcm-io-samples-aem-cms-config{runmode}",
+ dep("wcm-io-samples:aem-cms-system-config{runmode}:1.3.1-SNAPSHOT")),
+ contentPackage("wcm-io-samples-complete{runmode}", "1.3.1-SNAPSHOT",
+ dep("wcm-io-samples:wcm-io-samples-aem-cms-config{runmode}:1.3.1-SNAPSHOT")));
+ }
+ }
+
+ @Test
+ void testBuild_RELEASE_SUFFIX_VERSION_SNAPSHOT() throws Exception {
+ List files = new ModelParser(nodeDir).getInstallableFilesForNode();
+ List runmodeSuffixes = Collections.singletonList(".author");
+ File targetFile = new File(targetDir, "all.zip");
+
+ AllPackageBuilder builder = new AllPackageBuilder(targetFile, "test-group", "test-pkg")
+ .autoDependenciesMode(AutoDependenciesMode.IMMUTABLE_MUTABLE_SEPARATE)
+ .packageVersionMode(PackageVersionMode.RELEASE_SUFFIX_VERSION)
+ .version("99.99-SNAPSHOT");
+ builder.add(files, Collections.emptySet());
+ assertTrue(builder.build(null));
+
+ ZipUtil.unpack(targetFile, targetUnpackDir);
+
+ File appsDir = new File(targetUnpackDir, "jcr_root/apps/test-group-test-pkg-packages");
+ assertDirectories(appsDir, "application", "content", "container");
+
+ File applicationDir = new File(appsDir, "application");
+ assertDirectories(applicationDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File applicationInstallDir = new File(applicationDir, "install" + runmodeSuffix);
+ assertFiles(applicationInstallDir, runmodeSuffix,
+ contentPackage("accesscontroltool-apps-package{runmode}", "3.0.0-99_99-SNAPSHOT",
+ dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99-SNAPSHOT")),
+ contentPackage("accesscontroltool-oakindex-package{runmode}", "3.0.0-99_99-SNAPSHOT",
+ dep("Netcentric:accesscontroltool-package{runmode}:3.0.0-99_99-SNAPSHOT")),
+ contentPackage("core.wcm.components.content{runmode}", "2.17.0-99_99-SNAPSHOT",
+ dep("day/cq60/product:cq-platform-content:1.3.248"),
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
+ contentPackage("core.wcm.components.extensions.amp.content{runmode}", "2.17.0-99_99-SNAPSHOT",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
+ contentPackage("acs-aem-commons-ui.apps{runmode}", "4.10.0-99_99-SNAPSHOT",
+ dep("day/cq60/product:cq-content:6.3.64")),
+ contentPackage("aem-cms-system-config{runmode}",
+ dep("day/cq60/product:cq-ui-wcm-editor-content:1.1.224"),
+ dep("adobe/cq/product:cq-remotedam-client-ui-components:1.1.6"),
+ dep("adobe/cq60:core.wcm.components.all{runmode}:2.17.0-99_99-SNAPSHOT")),
+ file("io.wcm.caconfig.editor-1.11.0.jar"),
+ file("io.wcm.wcm.ui.granite-1.9.2.jar"));
+ }
+
+ File contentDir = new File(appsDir, "content");
+ assertDirectories(contentDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File contentInstallDir = new File(contentDir, "install" + runmodeSuffix);
+ assertFiles(contentInstallDir, runmodeSuffix,
+ contentPackage("acs-aem-commons-ui.content{runmode}", "4.10.0-99_99-SNAPSHOT"),
+ contentPackage("aem-cms-author-replicationagents{runmode}",
+ dep("adobe/consulting:acs-aem-commons-ui.content{runmode}:4.10.0-99_99-SNAPSHOT")),
+ contentPackage("wcm-io-samples-sample-content{runmode}", "1.3.1-SNAPSHOT",
+ dep("wcm-io-samples:aem-cms-author-replicationagents{runmode}:1.3.1-SNAPSHOT")));
+ }
+
+ File containerDir = new File(appsDir, "container");
+ assertDirectories(containerDir, toInstallFolderNames("install", runmodeSuffixes));
+
+ for (String runmodeSuffix : runmodeSuffixes) {
+ File containerInstallDir = new File(containerDir, "install" + runmodeSuffix);
+ assertFiles(containerInstallDir, runmodeSuffix,
+ contentPackage("accesscontroltool-package{runmode}", "3.0.0-99_99-SNAPSHOT",
+ dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99-SNAPSHOT")),
+ contentPackage("core.wcm.components.all{runmode}", "2.17.0-99_99-SNAPSHOT",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
+ contentPackage("core.wcm.components.config{runmode}", "2.17.0-99_99-SNAPSHOT",
+ dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
+ contentPackage("wcm-io-samples-aem-cms-config{runmode}",
+ dep("wcm-io-samples:aem-cms-system-config{runmode}:1.3.1-SNAPSHOT")),
+ contentPackage("wcm-io-samples-complete{runmode}", "1.3.1-SNAPSHOT",
+ dep("wcm-io-samples:wcm-io-samples-aem-cms-config{runmode}:1.3.1-SNAPSHOT")));
+ }
+ }
+
+}
diff --git a/tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java b/tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java
index e3be4a19..41652868 100644
--- a/tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java
+++ b/tooling/conga-aem-maven-plugin/src/test/java/io/wcm/devops/conga/plugins/aem/maven/allpackage/AllPackageBuilderTest.java
@@ -352,7 +352,7 @@ void testBuild_IMMUTABLE_ONLY(Set cloudManagerTarget, List runmo
}
}
- private String[] toInstallFolderNames(String baseName, List runmodeSuffixes) {
+ static String[] toInstallFolderNames(String baseName, List runmodeSuffixes) {
return runmodeSuffixes.stream()
.map(suffix -> baseName + suffix)
.toArray(size -> new String[size]);