Skip to content

Commit c0bd4e0

Browse files
stefanseifertstefanseifert
authored
packageVersionMode=RELEASE_SUFFIX_VERSION: avoid duplication of version with version suffix (#18)
1 parent ca15315 commit c0bd4e0

3 files changed

Lines changed: 43 additions & 39 deletions

File tree

‎changes.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<action type="update" dev="sseifert">
2828
Switch to Java 11 as minimum version.
2929
</action>
30+
<action type="fix" dev="sseifert">
31+
conga-aem-maven-plugin: Avoid duplicating version when adding release version suffix with packageVersionMode=RELEASE_SUFFIX_VERSION mode.
32+
</action>
3033
</release>
3134

3235
<release version="2.19.0" date="2022-11-10">

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,7 @@ private String buildVersionSuffix(ContentPackageFile pkg, boolean ignoreSnapshot
499499

500500
if (this.packageVersionMode == PackageVersionMode.RELEASE_SUFFIX_VERSION
501501
&& (!ArtifactUtils.isSnapshot(pkg.getVersion()) || !ignoreSnapshot)
502+
&& !StringUtils.equals(pkg.getVersion(), this.version)
502503
&& this.version != null) {
503504
versionSuffix.append(VERSION_SUFFIX_SEPARATOR)
504505
// replace dots with underlines in version suffix to avoid confusion with main version number

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void testBuild_DEFAULT() throws Exception {
6767

6868
AllPackageBuilder builder = new AllPackageBuilder(targetFile, "test-group", "test-pkg")
6969
.autoDependenciesMode(AutoDependenciesMode.IMMUTABLE_MUTABLE_SEPARATE)
70-
.version("99.99");
70+
.version("4.10.0");
7171
builder.add(files, Collections.emptySet());
7272
assertTrue(builder.build(null));
7373

@@ -142,7 +142,7 @@ void testBuild_RELEASE_SUFFIX_VERSION() throws Exception {
142142
AllPackageBuilder builder = new AllPackageBuilder(targetFile, "test-group", "test-pkg")
143143
.autoDependenciesMode(AutoDependenciesMode.IMMUTABLE_MUTABLE_SEPARATE)
144144
.packageVersionMode(PackageVersionMode.RELEASE_SUFFIX_VERSION)
145-
.version("99.99");
145+
.version("4.10.0");
146146
builder.add(files, Collections.emptySet());
147147
assertTrue(builder.build(null));
148148

@@ -157,21 +157,21 @@ void testBuild_RELEASE_SUFFIX_VERSION() throws Exception {
157157
for (String runmodeSuffix : runmodeSuffixes) {
158158
File applicationInstallDir = new File(applicationDir, "install" + runmodeSuffix);
159159
assertFiles(applicationInstallDir, runmodeSuffix,
160-
contentPackage("accesscontroltool-apps-package{runmode}", "3.0.0-99_99",
161-
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99")),
162-
contentPackage("accesscontroltool-oakindex-package{runmode}", "3.0.0-99_99",
163-
dep("Netcentric:accesscontroltool-package{runmode}:3.0.0-99_99")),
164-
contentPackage("core.wcm.components.content{runmode}", "2.17.0-99_99",
160+
contentPackage("accesscontroltool-apps-package{runmode}", "3.0.0-4_10_0",
161+
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0")),
162+
contentPackage("accesscontroltool-oakindex-package{runmode}", "3.0.0-4_10_0",
163+
dep("Netcentric:accesscontroltool-package{runmode}:3.0.0-4_10_0")),
164+
contentPackage("core.wcm.components.content{runmode}", "2.17.0-4_10_0",
165165
dep("day/cq60/product:cq-platform-content:1.3.248"),
166-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
167-
contentPackage("core.wcm.components.extensions.amp.content{runmode}", "2.17.0-99_99",
168-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
169-
contentPackage("acs-aem-commons-ui.apps{runmode}", "4.10.0-99_99",
166+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0")),
167+
contentPackage("core.wcm.components.extensions.amp.content{runmode}", "2.17.0-4_10_0",
168+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0")),
169+
contentPackage("acs-aem-commons-ui.apps{runmode}", "4.10.0",
170170
dep("day/cq60/product:cq-content:6.3.64")),
171171
contentPackage("aem-cms-system-config{runmode}",
172172
dep("day/cq60/product:cq-ui-wcm-editor-content:1.1.224"),
173173
dep("adobe/cq/product:cq-remotedam-client-ui-components:1.1.6"),
174-
dep("adobe/cq60:core.wcm.components.all{runmode}:2.17.0-99_99")),
174+
dep("adobe/cq60:core.wcm.components.all{runmode}:2.17.0-4_10_0")),
175175
file("io.wcm.caconfig.editor-1.11.0.jar"),
176176
file("io.wcm.wcm.ui.granite-1.9.2.jar"));
177177
}
@@ -182,9 +182,9 @@ void testBuild_RELEASE_SUFFIX_VERSION() throws Exception {
182182
for (String runmodeSuffix : runmodeSuffixes) {
183183
File contentInstallDir = new File(contentDir, "install" + runmodeSuffix);
184184
assertFiles(contentInstallDir, runmodeSuffix,
185-
contentPackage("acs-aem-commons-ui.content{runmode}", "4.10.0-99_99"),
185+
contentPackage("acs-aem-commons-ui.content{runmode}", "4.10.0"),
186186
contentPackage("aem-cms-author-replicationagents{runmode}",
187-
dep("adobe/consulting:acs-aem-commons-ui.content{runmode}:4.10.0-99_99")),
187+
dep("adobe/consulting:acs-aem-commons-ui.content{runmode}:4.10.0")),
188188
contentPackage("wcm-io-samples-sample-content{runmode}", "1.3.1-SNAPSHOT",
189189
dep("wcm-io-samples:aem-cms-author-replicationagents{runmode}:1.3.1-SNAPSHOT")));
190190
}
@@ -195,12 +195,12 @@ void testBuild_RELEASE_SUFFIX_VERSION() throws Exception {
195195
for (String runmodeSuffix : runmodeSuffixes) {
196196
File containerInstallDir = new File(containerDir, "install" + runmodeSuffix);
197197
assertFiles(containerInstallDir, runmodeSuffix,
198-
contentPackage("accesscontroltool-package{runmode}", "3.0.0-99_99",
199-
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99")),
200-
contentPackage("core.wcm.components.all{runmode}", "2.17.0-99_99",
201-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
202-
contentPackage("core.wcm.components.config{runmode}", "2.17.0-99_99",
203-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99")),
198+
contentPackage("accesscontroltool-package{runmode}", "3.0.0-4_10_0",
199+
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0")),
200+
contentPackage("core.wcm.components.all{runmode}", "2.17.0-4_10_0",
201+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0")),
202+
contentPackage("core.wcm.components.config{runmode}", "2.17.0-4_10_0",
203+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0")),
204204
contentPackage("wcm-io-samples-aem-cms-config{runmode}",
205205
dep("wcm-io-samples:aem-cms-system-config{runmode}:1.3.1-SNAPSHOT")),
206206
contentPackage("wcm-io-samples-complete{runmode}", "1.3.1-SNAPSHOT",
@@ -217,7 +217,7 @@ void testBuild_RELEASE_SUFFIX_VERSION_SNAPSHOT() throws Exception {
217217
AllPackageBuilder builder = new AllPackageBuilder(targetFile, "test-group", "test-pkg")
218218
.autoDependenciesMode(AutoDependenciesMode.IMMUTABLE_MUTABLE_SEPARATE)
219219
.packageVersionMode(PackageVersionMode.RELEASE_SUFFIX_VERSION)
220-
.version("99.99-SNAPSHOT");
220+
.version("4.10.0-SNAPSHOT");
221221
builder.add(files, Collections.emptySet());
222222
assertTrue(builder.build(null));
223223

@@ -232,21 +232,21 @@ void testBuild_RELEASE_SUFFIX_VERSION_SNAPSHOT() throws Exception {
232232
for (String runmodeSuffix : runmodeSuffixes) {
233233
File applicationInstallDir = new File(applicationDir, "install" + runmodeSuffix);
234234
assertFiles(applicationInstallDir, runmodeSuffix,
235-
contentPackage("accesscontroltool-apps-package{runmode}", "3.0.0-99_99-SNAPSHOT",
236-
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99-SNAPSHOT")),
237-
contentPackage("accesscontroltool-oakindex-package{runmode}", "3.0.0-99_99-SNAPSHOT",
238-
dep("Netcentric:accesscontroltool-package{runmode}:3.0.0-99_99-SNAPSHOT")),
239-
contentPackage("core.wcm.components.content{runmode}", "2.17.0-99_99-SNAPSHOT",
235+
contentPackage("accesscontroltool-apps-package{runmode}", "3.0.0-4_10_0-SNAPSHOT",
236+
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-4_10_0-SNAPSHOT")),
237+
contentPackage("accesscontroltool-oakindex-package{runmode}", "3.0.0-4_10_0-SNAPSHOT",
238+
dep("Netcentric:accesscontroltool-package{runmode}:3.0.0-4_10_0-SNAPSHOT")),
239+
contentPackage("core.wcm.components.content{runmode}", "2.17.0-4_10_0-SNAPSHOT",
240240
dep("day/cq60/product:cq-platform-content:1.3.248"),
241-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
242-
contentPackage("core.wcm.components.extensions.amp.content{runmode}", "2.17.0-99_99-SNAPSHOT",
243-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
244-
contentPackage("acs-aem-commons-ui.apps{runmode}", "4.10.0-99_99-SNAPSHOT",
241+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0-SNAPSHOT")),
242+
contentPackage("core.wcm.components.extensions.amp.content{runmode}", "2.17.0-4_10_0-SNAPSHOT",
243+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0-SNAPSHOT")),
244+
contentPackage("acs-aem-commons-ui.apps{runmode}", "4.10.0-4_10_0-SNAPSHOT",
245245
dep("day/cq60/product:cq-content:6.3.64")),
246246
contentPackage("aem-cms-system-config{runmode}",
247247
dep("day/cq60/product:cq-ui-wcm-editor-content:1.1.224"),
248248
dep("adobe/cq/product:cq-remotedam-client-ui-components:1.1.6"),
249-
dep("adobe/cq60:core.wcm.components.all{runmode}:2.17.0-99_99-SNAPSHOT")),
249+
dep("adobe/cq60:core.wcm.components.all{runmode}:2.17.0-4_10_0-SNAPSHOT")),
250250
file("io.wcm.caconfig.editor-1.11.0.jar"),
251251
file("io.wcm.wcm.ui.granite-1.9.2.jar"));
252252
}
@@ -257,9 +257,9 @@ void testBuild_RELEASE_SUFFIX_VERSION_SNAPSHOT() throws Exception {
257257
for (String runmodeSuffix : runmodeSuffixes) {
258258
File contentInstallDir = new File(contentDir, "install" + runmodeSuffix);
259259
assertFiles(contentInstallDir, runmodeSuffix,
260-
contentPackage("acs-aem-commons-ui.content{runmode}", "4.10.0-99_99-SNAPSHOT"),
260+
contentPackage("acs-aem-commons-ui.content{runmode}", "4.10.0-4_10_0-SNAPSHOT"),
261261
contentPackage("aem-cms-author-replicationagents{runmode}",
262-
dep("adobe/consulting:acs-aem-commons-ui.content{runmode}:4.10.0-99_99-SNAPSHOT")),
262+
dep("adobe/consulting:acs-aem-commons-ui.content{runmode}:4.10.0-4_10_0-SNAPSHOT")),
263263
contentPackage("wcm-io-samples-sample-content{runmode}", "1.3.1-SNAPSHOT",
264264
dep("wcm-io-samples:aem-cms-author-replicationagents{runmode}:1.3.1-SNAPSHOT")));
265265
}
@@ -270,12 +270,12 @@ void testBuild_RELEASE_SUFFIX_VERSION_SNAPSHOT() throws Exception {
270270
for (String runmodeSuffix : runmodeSuffixes) {
271271
File containerInstallDir = new File(containerDir, "install" + runmodeSuffix);
272272
assertFiles(containerInstallDir, runmodeSuffix,
273-
contentPackage("accesscontroltool-package{runmode}", "3.0.0-99_99-SNAPSHOT",
274-
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-99_99-SNAPSHOT")),
275-
contentPackage("core.wcm.components.all{runmode}", "2.17.0-99_99-SNAPSHOT",
276-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
277-
contentPackage("core.wcm.components.config{runmode}", "2.17.0-99_99-SNAPSHOT",
278-
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-99_99-SNAPSHOT")),
273+
contentPackage("accesscontroltool-package{runmode}", "3.0.0-4_10_0-SNAPSHOT",
274+
dep("adobe/consulting:acs-aem-commons-ui.apps{runmode}:4.10.0-4_10_0-SNAPSHOT")),
275+
contentPackage("core.wcm.components.all{runmode}", "2.17.0-4_10_0-SNAPSHOT",
276+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0-SNAPSHOT")),
277+
contentPackage("core.wcm.components.config{runmode}", "2.17.0-4_10_0-SNAPSHOT",
278+
dep("Netcentric:accesscontroltool-oakindex-package{runmode}:3.0.0-4_10_0-SNAPSHOT")),
279279
contentPackage("wcm-io-samples-aem-cms-config{runmode}",
280280
dep("wcm-io-samples:aem-cms-system-config{runmode}:1.3.1-SNAPSHOT")),
281281
contentPackage("wcm-io-samples-complete{runmode}", "1.3.1-SNAPSHOT",

0 commit comments

Comments
 (0)