From 2dbf94967843b61eb6a4993130792130d1ecb2f3 Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Thu, 23 Feb 2023 14:52:04 +0100 Subject: [PATCH 01/11] updating poms for 6.3.1-SNAPSHOT development --- api/pom.xml | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 0b7afb1a..05e9dbf3 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index 879a9898..d4b58663 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 7cc7b338..8ea17526 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 84da3393..e5c5ca65 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 06a0972f..6af56659 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index 3eee12ad..4ad13d07 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 286c1fd3..e13f414f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index 92ce40d1..b678b551 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 65266d12..7b21bcf4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index 5f35faaf..a0ec5bd8 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index a4c18e9e..d510100c 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index b494447e..7c9c97e1 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0-SNAPSHOT + 6.3.1-SNAPSHOT aecu.ui.content From d2f770062909c8f11395aaba8d5310d93f211604 Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Thu, 23 Feb 2023 15:02:44 +0100 Subject: [PATCH 02/11] updating develop poms to master versions to avoid merge conflicts --- api/pom.xml | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 05e9dbf3..52902982 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index d4b58663..f7c8531b 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 8ea17526..061b6224 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index e5c5ca65..3f38cb5a 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 6af56659..93186c75 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index 4ad13d07..9cf97bba 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index e13f414f..7dad660c 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index b678b551..2cb0b7df 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.oak.index diff --git a/pom.xml b/pom.xml index 7b21bcf4..1125fa20 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.3.1-SNAPSHOT + 6.3.0 AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index a0ec5bd8..c1ed1745 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index d510100c..feb62881 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 7c9c97e1..a85a8e7d 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.3.0 aecu.ui.content From 0c914b2487b767feb2784458ffe8e603b760ac64 Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Thu, 23 Feb 2023 15:02:48 +0100 Subject: [PATCH 03/11] Updating develop poms back to pre merge state --- api/pom.xml | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 52902982..05e9dbf3 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index f7c8531b..d4b58663 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 061b6224..8ea17526 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 3f38cb5a..e5c5ca65 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 93186c75..6af56659 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index 9cf97bba..4ad13d07 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 7dad660c..e13f414f 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index 2cb0b7df..b678b551 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 1125fa20..7b21bcf4 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.3.0 + 6.3.1-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index c1ed1745..a0ec5bd8 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index feb62881..d510100c 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index a85a8e7d..7c9c97e1 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.0 + 6.3.1-SNAPSHOT aecu.ui.content From 3707132689ab21bb99ffe95618237ec0cb713eba Mon Sep 17 00:00:00 2001 From: "Brouns, R" Date: Wed, 15 Mar 2023 11:26:41 +0100 Subject: [PATCH 04/11] [210] Fix for loading the right groovy-console implementation bundle --- .../startuphook/AecuCloudStartupService.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java b/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java index 6884261b..9c5bddc3 100644 --- a/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java +++ b/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java @@ -18,16 +18,19 @@ */ package de.valtech.aecu.startuphook; +import de.valtech.aecu.api.service.AecuException; +import de.valtech.aecu.api.service.AecuService; +import de.valtech.aecu.api.service.HistoryEntry; +import de.valtech.aecu.api.service.HistoryEntry.STATE; +import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.List; - import javax.jcr.Session; - import org.apache.sling.api.resource.LoginException; import org.apache.sling.api.resource.ResourceResolver; import org.osgi.framework.Bundle; -import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.BundleContext; import org.osgi.service.component.annotations.Activate; import org.osgi.service.component.annotations.Component; import org.osgi.service.component.annotations.Reference; @@ -38,19 +41,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import be.orbinson.aem.groovy.console.api.BindingExtensionProvider; - -import de.valtech.aecu.api.service.AecuException; -import de.valtech.aecu.api.service.AecuService; -import de.valtech.aecu.api.service.HistoryEntry; -import de.valtech.aecu.api.service.HistoryEntry.STATE; - /** * Service that executes the AECU migration if the node store type is composite (AEM Cloud). */ @Component(service = AecuCloudStartupService.class, immediate = true, name = "AECU cloud startup hook") public class AecuCloudStartupService { + private static final String GROOVY_CONSOLE_BUNDLE_SYMBOLIC_NAME = "aem-groovy-console-bundle"; private static final String STAR_IMPORT_EXTENSION_PROVIDER = "StarImportExtensionProvider"; private static final String BINDING_EXTENSION_PROVIDER = "BindingExtensionProvider"; private static final String DEFAULT_EXTENSION_SERVICE = @@ -70,8 +67,11 @@ public class AecuCloudStartupService { @Reference private ServiceComponentRuntime serviceComponentRuntime; + private BundleContext bundleContext; + @Activate - public void activate() { + public void activate(final BundleContext bundleContext) { + this.bundleContext = bundleContext; Runnable runnable = this::checkAndRunMigration; Thread thread = new Thread(runnable); thread.start(); @@ -101,7 +101,7 @@ protected void checkAndRunMigration() { /** * Checks if an AECU migration is already in progress. If AECU history tells migration is in * progress then wait max. for MIGRATION_TIMEOUT. - * + * * @return migration in progress */ protected boolean isMigrationInProgress() { @@ -121,7 +121,7 @@ protected boolean isMigrationInProgress() { /** * Waits till Groovy Console took up our services. - * + * * @return services are ok * @throws InterruptedException sleep failed */ @@ -140,7 +140,9 @@ protected boolean waitForServices() throws InterruptedException { * Checks if our services are already injected. */ private boolean servicesAreOk() { - Bundle bundle = FrameworkUtil.getBundle(BindingExtensionProvider.class); + Bundle bundle = Arrays.stream(bundleContext.getBundles()) + .filter(b -> GROOVY_CONSOLE_BUNDLE_SYMBOLIC_NAME.equals(b.getSymbolicName())) + .findFirst().orElse(null); ComponentDescriptionDTO componentDescription = serviceComponentRuntime.getComponentDescriptionDTO(bundle, DEFAULT_EXTENSION_SERVICE); if ((componentDescription == null) || !serviceComponentRuntime.isComponentEnabled(componentDescription)) { @@ -176,7 +178,7 @@ void startAecuMigration() { /** * Returns the resource resolver to be used - * + * * @return the resource resolver */ private ResourceResolver getResourceResolver() { From c9a92657e480c5ec55d4c4dcd390a4cb106367f5 Mon Sep 17 00:00:00 2001 From: "Brouns, R" Date: Thu, 16 Mar 2023 10:32:15 +0100 Subject: [PATCH 05/11] [210] Add null check to see if the groovy console bundle was found or not --- .../de/valtech/aecu/startuphook/AecuCloudStartupService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java b/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java index 9c5bddc3..a8a3e5c4 100644 --- a/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java +++ b/cloud.startup.hook/src/main/java/de/valtech/aecu/startuphook/AecuCloudStartupService.java @@ -143,6 +143,9 @@ private boolean servicesAreOk() { Bundle bundle = Arrays.stream(bundleContext.getBundles()) .filter(b -> GROOVY_CONSOLE_BUNDLE_SYMBOLIC_NAME.equals(b.getSymbolicName())) .findFirst().orElse(null); + if (bundle == null) { + return false; + } ComponentDescriptionDTO componentDescription = serviceComponentRuntime.getComponentDescriptionDTO(bundle, DEFAULT_EXTENSION_SERVICE); if ((componentDescription == null) || !serviceComponentRuntime.isComponentEnabled(componentDescription)) { From a10d34fde9ca03982df7880dd1d92167f5f0bcdd Mon Sep 17 00:00:00 2001 From: Bart Thierens Date: Fri, 24 Feb 2023 09:10:35 +0100 Subject: [PATCH 06/11] Add feature to update mixins during content upgrade --- Readme.md | 15 ++++ api/pom.xml | 2 +- .../console/bindings/ContentUpgrade.java | 17 ++++ .../groovy/console/bindings/package-info.java | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- .../bindings/actions/resource/AddMixin.java | 49 +++++++++++ .../actions/resource/RemoveMixin.java | 50 +++++++++++ .../bindings/actions/util/MixinUtil.java | 43 ++++++++++ .../bindings/impl/ContentUpgradeImpl.java | 14 ++++ .../actions/resource/AddMixinTest.java | 83 +++++++++++++++++++ .../actions/resource/RemoveMixinTest.java | 65 +++++++++++++++ examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 22 files changed, 350 insertions(+), 14 deletions(-) create mode 100644 core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixin.java create mode 100644 core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixin.java create mode 100644 core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/util/MixinUtil.java create mode 100644 core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixinTest.java create mode 100644 core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixinTest.java diff --git a/Readme.md b/Readme.md index cc59ea7f..00d8072f 100644 --- a/Readme.md +++ b/Readme.md @@ -512,6 +512,21 @@ aecu.contentUpgradeBuilder() .run() ``` +#### Update Mixins + +* doAddMixin(String mixinName): adds a mixin to a node if the mixin is valid +* doRemoveMixin(String mixinName): removes a mixin from a node if the mixin is present + +```java +aecu.contentUpgradeBuilder() + .forChildResourcesOf("/content/we-retail/ca/en") + .filterByNodeName("jcr:content") + .doAddMixin("mix:versionable") + .doAddMixin("mix:mymixin") + .doRemoveMixin("mix:lockable") + .run() +``` + #### Copy and Move Properties This will copy or move a property to a subnode. You can also change the property name. diff --git a/api/pom.xml b/api/pom.xml index 05e9dbf3..e1056491 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.api diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java index 83773db6..0c9f65f3 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/ContentUpgrade.java @@ -704,6 +704,23 @@ public interface ContentUpgrade { */ ContentUpgrade doCheckPageRendering(String textPresent, String textNotPresent); + + /** + * Adds a mixin + * + * @param mixinName valid mixin name + * @return upgrade object + */ + ContentUpgrade doAddMixin(String mixinName); + + /** + * Removes a mixin + * + * @param mixinName valid mixin name present on the node + * @return upgrade object + */ + ContentUpgrade doRemoveMixin(String mixinName); + /** * Print path * diff --git a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java index 09601dda..283837de 100644 --- a/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java +++ b/api/src/main/java/de/valtech/aecu/api/groovy/console/bindings/package-info.java @@ -22,7 +22,7 @@ * * @author Roxana Muresan */ -@Version("4.9.0") +@Version("4.10.0") package de.valtech.aecu.api.groovy.console.bindings; import org.osgi.annotation.versioning.Version; diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index d4b58663..7dedb622 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 8ea17526..6f1f27cd 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index e5c5ca65..dc192bd7 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 6af56659..4a88cadd 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.core diff --git a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixin.java b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixin.java new file mode 100644 index 00000000..3668d316 --- /dev/null +++ b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixin.java @@ -0,0 +1,49 @@ +package de.valtech.aecu.core.groovy.console.bindings.actions.resource; + +import de.valtech.aecu.core.groovy.console.bindings.actions.Action; +import de.valtech.aecu.core.groovy.console.bindings.actions.util.MixinUtil; +import javax.annotation.Nonnull; +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import javax.jcr.nodetype.NoSuchNodeTypeException; +import org.apache.commons.lang3.StringUtils; +import org.apache.sling.api.resource.PersistenceException; +import org.apache.sling.api.resource.Resource; + +/** + * Adds a mixin to a resource/node if the mixin exists. + * + * @author Bart Thierens + * @author Eric Manzi + */ +public class AddMixin implements Action { + + private final String mixinName; + + public AddMixin(String mixinName) { + this.mixinName = mixinName; + } + + @Override + public String doAction(@Nonnull Resource resource) throws PersistenceException { + if (StringUtils.isBlank(mixinName)) { + return "WARNING: mixin name is empty"; + } + + Node node = resource.adaptTo(Node.class); + if (node == null) { + return "WARNING: could not get node for " + resource.getPath(); + } + + try { + MixinUtil.ensureMixin(node, mixinName); + return String.format("Adding mixin %s to %s", mixinName, resource.getPath()); + } catch (NoSuchNodeTypeException nsnte) { + return "WARNING: non-existing mixin: " + mixinName; + } + catch (RepositoryException re) { + throw new PersistenceException("Problem when adding mixin to node", re); + } + } + +} diff --git a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixin.java b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixin.java new file mode 100644 index 00000000..bed1d967 --- /dev/null +++ b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixin.java @@ -0,0 +1,50 @@ +package de.valtech.aecu.core.groovy.console.bindings.actions.resource; + +import de.valtech.aecu.core.groovy.console.bindings.actions.Action; +import de.valtech.aecu.core.groovy.console.bindings.actions.util.MixinUtil; +import javax.annotation.Nonnull; +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import javax.jcr.nodetype.NoSuchNodeTypeException; +import org.apache.commons.lang3.StringUtils; +import org.apache.sling.api.resource.PersistenceException; +import org.apache.sling.api.resource.Resource; + +/** + * Removes a mixin from a resource/node if the mixin is present. + * + * @author Bart Thierens + * @author Eric Manzi + */ +public class RemoveMixin implements Action { + + private final String mixinName; + + public RemoveMixin(String mixinName) { + this.mixinName = mixinName; + } + + @Override + public String doAction(@Nonnull Resource resource) throws PersistenceException { + if (StringUtils.isBlank(mixinName)) { + return "WARNING: mixin name is empty"; + } + Node node = resource.adaptTo(Node.class); + if (node == null) { + return "WARNING: could not get node for " + resource.getPath(); + } + + try { + if (MixinUtil.hasMixin(node, mixinName)) { + node.removeMixin(mixinName); + return String.format("Removing mixin %s from %s", mixinName, resource.getPath()); + } + return String.format("No mixin %s present on %s", mixinName, resource.getPath()); + } catch (NoSuchNodeTypeException nsnte) { + return "WARNING: non-existing mixin: " + mixinName; + } catch (RepositoryException re) { + throw new PersistenceException("Problem when removing mixin from node", re); + } + } + +} diff --git a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/util/MixinUtil.java b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/util/MixinUtil.java new file mode 100644 index 00000000..0bba329e --- /dev/null +++ b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/util/MixinUtil.java @@ -0,0 +1,43 @@ +package de.valtech.aecu.core.groovy.console.bindings.actions.util; + +import java.util.Arrays; +import javax.annotation.Nonnull; +import javax.jcr.Node; +import javax.jcr.RepositoryException; + +/** + * Utility class for mixin related actions + * + * @author Bart Thierens + */ +public class MixinUtil { + + private MixinUtil() { + throw new UnsupportedOperationException("Cannot instantiate MixinUtil"); + } + + /** + * Checks if a mixin is present on a node + * @param node the non-null node to check + * @param mixin the non-null mixin to check (can be a non-existing mixin type) + * @return true if the mixin is present on the node, otherwise false + * @throws RepositoryException if an exception occurs while performing repository operations + */ + public static boolean hasMixin(@Nonnull Node node, @Nonnull String mixin) throws RepositoryException { + return Arrays.stream(node.getMixinNodeTypes()) + .anyMatch(nodeType -> nodeType.isNodeType(mixin)); + } + + /** + * Ensures a mixin is set on a node if it wasn't already + * @param node the non-null node to add the mixin to + * @param mixin the non-null mixin to add + * @throws RepositoryException if an exception occurs while performing repository operations + */ + public static void ensureMixin(@Nonnull Node node, @Nonnull String mixin) throws RepositoryException { + if (!hasMixin(node, mixin) && node.canAddMixin(mixin)) { + node.addMixin(mixin); + } + } + +} diff --git a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java index da876311..4eb477db 100644 --- a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java +++ b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/impl/ContentUpgradeImpl.java @@ -74,6 +74,7 @@ import de.valtech.aecu.core.groovy.console.bindings.actions.properties.MovePropertyToRelativePath; import de.valtech.aecu.core.groovy.console.bindings.actions.properties.RenameProperty; import de.valtech.aecu.core.groovy.console.bindings.actions.properties.SetProperty; +import de.valtech.aecu.core.groovy.console.bindings.actions.resource.AddMixin; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.ChangePrimaryType; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.CopyResourceToRelativePath; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.CreateResource; @@ -81,6 +82,7 @@ import de.valtech.aecu.core.groovy.console.bindings.actions.resource.DeleteResource; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.MoveResourceToPathRegex; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.MoveResourceToRelativePath; +import de.valtech.aecu.core.groovy.console.bindings.actions.resource.RemoveMixin; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.RenameResource; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.ReorderNode; import de.valtech.aecu.core.groovy.console.bindings.actions.resource.ReplaceResourcePropertyValues; @@ -642,6 +644,18 @@ public ContentUpgrade doCheckPageRendering(String textPresent, String textNotPre return this; } + @Override + public ContentUpgrade doAddMixin(String mixinName) { + actions.add(new AddMixin(mixinName)); + return this; + } + + @Override + public ContentUpgrade doRemoveMixin(String mixinName) { + actions.add(new RemoveMixin(mixinName)); + return this; + } + @Override public ContentUpgrade printPath() { LOG.debug("printPath"); diff --git a/core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixinTest.java b/core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixinTest.java new file mode 100644 index 00000000..0d8b0644 --- /dev/null +++ b/core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/AddMixinTest.java @@ -0,0 +1,83 @@ +package de.valtech.aecu.core.groovy.console.bindings.actions.resource; + +import javax.jcr.Node; +import javax.jcr.nodetype.NoSuchNodeTypeException; +import javax.jcr.nodetype.NodeType; +import org.apache.jackrabbit.JcrConstants; +import org.apache.sling.api.resource.Resource; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * Tests AddMixin + * + * @author Bart Thierens + */ +@ExtendWith(MockitoExtension.class) +class AddMixinTest { + + @Mock + private Resource resource; + + @Mock + private Node node; + + @Mock + private NodeType versionableNodeType; + + @Test + void testDoAddMixin() throws Exception { + when(resource.adaptTo(Node.class)).thenReturn(node); + when(node.getMixinNodeTypes()).thenReturn(new NodeType[0]); + doNothing().when(node).addMixin(JcrConstants.MIX_VERSIONABLE); + when(node.canAddMixin(JcrConstants.MIX_VERSIONABLE)).thenReturn(true); + + AddMixin action = new AddMixin(JcrConstants.MIX_VERSIONABLE); + action.doAction(resource); + verify(node, times(1)).canAddMixin(JcrConstants.MIX_VERSIONABLE); + verify(node, times(1)).addMixin(JcrConstants.MIX_VERSIONABLE); + } + + @Test + void testDoAddEmptyMixin() throws Exception { + AddMixin action = new AddMixin(null); + assertEquals("WARNING: mixin name is empty", action.doAction(resource)); + verify(node, times(0)).canAddMixin(JcrConstants.MIX_VERSIONABLE); + verify(node, times(0)).addMixin(JcrConstants.MIX_VERSIONABLE); + } + + @Test + void testAddPresentMixin() throws Exception { + when(versionableNodeType.isNodeType(JcrConstants.MIX_VERSIONABLE)).thenReturn(true); + when(resource.adaptTo(Node.class)).thenReturn(node); + when(node.getMixinNodeTypes()).thenReturn(new NodeType[]{versionableNodeType}); + + AddMixin action = new AddMixin(JcrConstants.MIX_VERSIONABLE); + action.doAction(resource); + verify(node, times(0)).canAddMixin(JcrConstants.MIX_VERSIONABLE); + verify(node, times(0)).addMixin(JcrConstants.MIX_VERSIONABLE); + } + + @Test + void testAddNonExistingMixin() throws Exception { + when(resource.adaptTo(Node.class)).thenReturn(node); + when(node.getMixinNodeTypes()).thenReturn(new NodeType[0]); + when(node.canAddMixin(anyString())).thenReturn(true); + doThrow(NoSuchNodeTypeException.class).when(node).addMixin(anyString()); + + String nonExistingMixin = "mix:max"; + AddMixin action = new AddMixin(nonExistingMixin); + assertEquals("WARNING: non-existing mixin: " + nonExistingMixin, action.doAction(resource)); + } + +} \ No newline at end of file diff --git a/core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixinTest.java b/core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixinTest.java new file mode 100644 index 00000000..e7e9750d --- /dev/null +++ b/core/src/test/java/de/valtech/aecu/core/groovy/console/bindings/actions/resource/RemoveMixinTest.java @@ -0,0 +1,65 @@ +package de.valtech.aecu.core.groovy.console.bindings.actions.resource; + +import javax.jcr.Node; +import javax.jcr.nodetype.NodeType; +import org.apache.jackrabbit.JcrConstants; +import org.apache.sling.api.resource.Resource; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +/** + * Tests RemoveMixin + * + * @author Bart Thierens + */ +@ExtendWith(MockitoExtension.class) +class RemoveMixinTest { + + @Mock + private Resource resource; + + @Mock + private Node node; + + @Mock + private NodeType versionableNodeType; + + @Test + void testDoRemoveMixin() throws Exception { + when(resource.adaptTo(Node.class)).thenReturn(node); + when(versionableNodeType.isNodeType(JcrConstants.MIX_VERSIONABLE)).thenReturn(true); + when(node.getMixinNodeTypes()).thenReturn(new NodeType[]{versionableNodeType}); + doNothing().when(node).removeMixin(JcrConstants.MIX_VERSIONABLE); + + RemoveMixin action = new RemoveMixin(JcrConstants.MIX_VERSIONABLE); + action.doAction(resource); + verify(node, times(1)).removeMixin(JcrConstants.MIX_VERSIONABLE); + } + + @Test + void testDoRemoveEmptyMixin() throws Exception { + RemoveMixin action = new RemoveMixin(null); + assertEquals("WARNING: mixin name is empty", action.doAction(resource)); + verify(node, times(0)).removeMixin(JcrConstants.MIX_VERSIONABLE); + } + + @Test + void testRemoveNotPresentMixin() throws Exception { + when(resource.adaptTo(Node.class)).thenReturn(node); + when(resource.getPath()).thenReturn("/content/some/path"); + when(node.getMixinNodeTypes()).thenReturn(new NodeType[0]); + + RemoveMixin action = new RemoveMixin(JcrConstants.MIX_VERSIONABLE); + assertEquals(String.format("No mixin %s present on %s", JcrConstants.MIX_VERSIONABLE, resource.getPath()), action.doAction(resource)); + verify(node, times(0)).removeMixin(JcrConstants.MIX_VERSIONABLE); + } + +} \ No newline at end of file diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index 4ad13d07..8c5ef3f4 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index e13f414f..0da119b0 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index b678b551..0bbfc191 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 7b21bcf4..d1ddbf7d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/sonar-project.properties b/sonar-project.properties index 4b8dc60b..356dd758 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=aecu # this is the name and version displayed in the SonarQube UI. Was mandatory prior to SonarQube 6.1. sonar.projectName=AEM Easy Content Upgrade -sonar.projectVersion=6.3.0-SNAPSHOT +sonar.projectVersion=6.4.0-SNAPSHOT # Encoding of the source code. Default is default system encoding sonar.sourceEncoding=UTF-8 diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index a0ec5bd8..2d574f57 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index d510100c..3036adc7 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 7c9c97e1..86ddad3c 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.3.1-SNAPSHOT + 6.4.0-SNAPSHOT aecu.ui.content From b1bb34ee63697d38cecffbb73f6c6930f27ba107 Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Mon, 20 Mar 2023 18:33:38 +0100 Subject: [PATCH 07/11] docs: added history --- HISTORY | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/HISTORY b/HISTORY index 610db740..9ce617b1 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,7 @@ +2023-03-20 6.3.0 + - Resource Action: New actions to add / remove mixins (#209) + - AEMaaCS doesn't start AECU Migration, due to wrong check in AecuCloudStartupService (#210) + 2023-02-23 6.2.1 - Upgrade of Orbinson Groovy Console to version 19.0.3 (#205, #208) - New filter method: filterByNodeRootPaths() (#204) From edd0042b37c5056395f00edb314cbd8d968d4705 Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Mon, 20 Mar 2023 18:38:12 +0100 Subject: [PATCH 08/11] docs: added history for 6.4.0 --- HISTORY | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/HISTORY b/HISTORY index 9ce617b1..d1ff6034 100644 --- a/HISTORY +++ b/HISTORY @@ -1,8 +1,8 @@ -2023-03-20 6.3.0 +2023-03-20 6.4.0 - Resource Action: New actions to add / remove mixins (#209) - AEMaaCS doesn't start AECU Migration, due to wrong check in AecuCloudStartupService (#210) -2023-02-23 6.2.1 +2023-02-23 6.3.0 - Upgrade of Orbinson Groovy Console to version 19.0.3 (#205, #208) - New filter method: filterByNodeRootPaths() (#204) - AecuService: added new execute(String path, String data) method which accepts a JSON data string to be used within scipts (#204) From 45ab6c2f4a252d0596766cfea814732067742872 Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Mon, 20 Mar 2023 19:08:06 +0100 Subject: [PATCH 09/11] chore: upgraded maven dependency check --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1ddbf7d..42bea79d 100644 --- a/pom.xml +++ b/pom.xml @@ -390,7 +390,7 @@ org.owasp dependency-check-maven - 7.4.4 + 8.1.2 0 true From 0d1a1c8257c2c0656d9c277cf11d32b2fe2457b1 Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Mon, 20 Mar 2023 19:08:31 +0100 Subject: [PATCH 10/11] updating poms for 6.4.0 branch with snapshot versions --- api/pom.xml | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index e1056491..a7a842d0 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index 7dedb622..3188e7cb 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 6f1f27cd..0091ebc7 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index dc192bd7..b8a7f992 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 4a88cadd..2d64fb32 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index 8c5ef3f4..d80532a4 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 0da119b0..c77e4641 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index 0bbfc191..c08f12cd 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 42bea79d..f6b856ae 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index 2d574f57..fc008507 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 3036adc7..733356be 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 86ddad3c..13ccbc9b 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-SNAPSHOT + 6.4.0-rc-SNAPSHOT aecu.ui.content From 6b47346ac8528c51078e707debcd79cd9945242c Mon Sep 17 00:00:00 2001 From: Nicolas Hirrle Date: Mon, 20 Mar 2023 19:14:52 +0100 Subject: [PATCH 11/11] updating poms for branch'release/6.4.0' with non-snapshot versions --- api/pom.xml | 2 +- cloud.startup.hook/pom.xml | 2 +- complete-cloud/pom.xml | 2 +- complete/pom.xml | 2 +- core/pom.xml | 2 +- examples-cloud/pom.xml | 2 +- examples/pom.xml | 2 +- oak.index/pom.xml | 2 +- pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index a7a842d0..f26cfd34 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index 3188e7cb..5bae48bb 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 0091ebc7..1eebbdcb 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index b8a7f992..2c41250c 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 2d64fb32..0af477a3 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index d80532a4..7faa0b6d 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index c77e4641..a9c318af 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index c08f12cd..f98504f8 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.oak.index diff --git a/pom.xml b/pom.xml index f6b856ae..125d5562 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.4.0-rc-SNAPSHOT + 6.4.0 AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index fc008507..509f160f 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 733356be..48db504e 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 13ccbc9b..8381a340 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.4.0-rc-SNAPSHOT + 6.4.0 aecu.ui.content