From 99235baccc78e41441c261055530a72a180c1d15 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 3 Jun 2022 08:52:17 +0200 Subject: [PATCH 01/21] updating poms for 6.0.3-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.groovyconsole/pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index e48403b4..0f56c44a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index fb5cc6cb..b60ba524 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index c4ab4098..5c93fa18 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 36988be7..4c1434e3 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 2ce9c525..6dadd852 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index 31f862d3..ca813ec4 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 0ece31aa..28152bcf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index 6e5de5e3..694e9d3c 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 400cf69b..64a04f7f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.groovyconsole/pom.xml b/ui.apps.groovyconsole/pom.xml index 6cd0a746..f666689b 100644 --- a/ui.apps.groovyconsole/pom.xml +++ b/ui.apps.groovyconsole/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.ui.apps.groovyconsole diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index bd9539b5..ac3002db 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index cd8e938c..05782496 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index cf71cb9b..03f8c06f 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2-SNAPSHOT + 6.0.3-SNAPSHOT aecu.ui.content From b113a988ab0985916181a6f9c45cea2838289c76 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 3 Jun 2022 08:57:26 +0200 Subject: [PATCH 02/21] 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.groovyconsole/pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 0f56c44a..2cc4dd3c 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index b60ba524..22c849b9 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 5c93fa18..73f2ad79 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 4c1434e3..f3739f1e 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 6dadd852..a1df1c76 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index ca813ec4..cd214422 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 28152bcf..515afeb5 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index 694e9d3c..3a92c9f9 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.oak.index diff --git a/pom.xml b/pom.xml index 64a04f7f..5b4312a3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.0.3-SNAPSHOT + 6.0.2 AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.groovyconsole/pom.xml b/ui.apps.groovyconsole/pom.xml index f666689b..57add362 100644 --- a/ui.apps.groovyconsole/pom.xml +++ b/ui.apps.groovyconsole/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.ui.apps.groovyconsole diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index ac3002db..2add7abd 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 05782496..39be2e13 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 03f8c06f..2b4d2f52 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.2 aecu.ui.content From 76479a191360e9ba57aa81a9b58963573f221ba0 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Fri, 3 Jun 2022 08:57:27 +0200 Subject: [PATCH 03/21] 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.groovyconsole/pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 2cc4dd3c..0f56c44a 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index 22c849b9..b60ba524 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 73f2ad79..5c93fa18 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index f3739f1e..4c1434e3 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index a1df1c76..6dadd852 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index cd214422..ca813ec4 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 515afeb5..28152bcf 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index 3a92c9f9..694e9d3c 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index 5b4312a3..64a04f7f 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.0.2 + 6.0.3-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.groovyconsole/pom.xml b/ui.apps.groovyconsole/pom.xml index 57add362..f666689b 100644 --- a/ui.apps.groovyconsole/pom.xml +++ b/ui.apps.groovyconsole/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.ui.apps.groovyconsole diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index 2add7abd..ac3002db 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 39be2e13..05782496 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 2b4d2f52..03f8c06f 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.2 + 6.0.3-SNAPSHOT aecu.ui.content From 80db88ecf3491660be01f318a783015109f5d8e1 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 8 Jun 2022 10:24:01 +0200 Subject: [PATCH 04/21] 190 moved execution to extra thread to unblock activation --- .../startuphook/AecuCloudStartupService.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 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 d0ae3f02..6d87b068 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 @@ -58,8 +58,8 @@ public class AecuCloudStartupService { private static final Logger LOGGER = LoggerFactory.getLogger(AecuCloudStartupService.class); - private static final int WAIT_PERIOD = 10; - private static final int WAIT_INTERVALS = 30; + private static final int WAIT_PERIOD = 30; + private static final int WAIT_INTERVALS = 10; // migration timeout in seconds private static final int MIGRATION_TIMEOUT = 1800; @@ -71,7 +71,16 @@ public class AecuCloudStartupService { private ServiceComponentRuntime serviceComponentRuntime; @Activate - public void checkAndRunMigration() { + public void activate() { + Runnable runnable = this::checkAndRunMigration; + Thread thread = new Thread(runnable); + thread.start(); + } + + /** + * Checks if the components are ready and starts the migration process. + */ + protected void checkAndRunMigration() { ResourceResolver resourceResolver = getResourceResolver(); Session session = resourceResolver.adaptTo(Session.class); boolean isCompositeNodeStore = RuntimeHelper.isCompositeNodeStore(session); @@ -81,7 +90,7 @@ public void checkAndRunMigration() { LOGGER.error("Groovy extension services seem to be not bound"); throw new IllegalStateException("Groovy extension services seem to be not bound"); } - Thread.sleep(1000L * WAIT_PERIOD); + Thread.sleep(1000L * WAIT_PERIOD * 2); startAecuMigration(); } catch (InterruptedException e) { LOGGER.error("Interrupted", e); From 665dffaf2f8368559229046d67e4bb50d8a6f78e Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 8 Jun 2022 13:41:12 +0200 Subject: [PATCH 05/21] list content --- .../apps/aecu-scripts/aecu-examples/1_start.always.groovy | 7 ++++++- .../apps/aecu-scripts/aecu-examples/2_listContent.groovy | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/1_start.always.groovy b/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/1_start.always.groovy index 77706395..6e54b5d7 100644 --- a/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/1_start.always.groovy +++ b/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/1_start.always.groovy @@ -1 +1,6 @@ -println "AECU migration started" \ No newline at end of file +println "AECU migration started" + +aecu.contentUpgradeBuilder() + .forChildResourcesOf("/content/") + .printPath() + .run() diff --git a/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/2_listContent.groovy b/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/2_listContent.groovy index 038da3ee..248eb5ca 100644 --- a/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/2_listContent.groovy +++ b/examples-cloud/src/main/content/jcr_root/apps/aecu-scripts/aecu-examples/2_listContent.groovy @@ -1,4 +1,4 @@ aecu.contentUpgradeBuilder() .forChildResourcesOf("/content/") - .printPath() - .run() \ No newline at end of file + .printJson() + .run() From 710b0915b849c1c8025e4aa6bc497715f0c552b7 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 08:51:58 +0200 Subject: [PATCH 06/21] new config format --- ...pl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config | 2 +- ...serMapperImpl.amended-valtechAecuAdminUserStartupHook.config | 2 +- ...UserMapperImpl.amended-valtechAecuContentMigratorUser.config | 2 +- ...l.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config | 2 +- ...pl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config | 2 +- ...UserMapperImpl.amended-valtechAecuContentMigratorUser.config | 2 +- ...l.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config index 77efe852..7ba07bc9 100644 --- a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config +++ b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config @@ -1 +1 @@ -user.mapping=["de.valtech.aecu.core:aecu-admin\=aecu-admin"] \ No newline at end of file +user.mapping=["de.valtech.aecu.core:aecu-admin\=[aecu-admin]"] \ No newline at end of file diff --git a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUserStartupHook.config b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUserStartupHook.config index e2fa3d12..37f597a1 100644 --- a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUserStartupHook.config +++ b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUserStartupHook.config @@ -1 +1 @@ -user.mapping=["de.valtech.aecu.cloud.startup.hook:aecu-admin\=aecu-admin"] \ No newline at end of file +user.mapping=["de.valtech.aecu.cloud.startup.hook:aecu-admin\=[aecu-admin]"] \ No newline at end of file diff --git a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config index 91811d89..46c6bf6f 100644 --- a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config +++ b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config @@ -1 +1 @@ -user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=aecu-content-migrator"] \ No newline at end of file +user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=[aecu-content-migrator]"] \ No newline at end of file diff --git a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config index cc15e955..22d8a3ce 100644 --- a/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config +++ b/complete-cloud/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config @@ -1 +1 @@ -user.mapping=["de.valtech.aecu.core:aecu\=aecu-service"] \ No newline at end of file +user.mapping=["de.valtech.aecu.core:aecu\=[aecu-service]"] \ No newline at end of file diff --git a/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config b/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config index 77efe852..7ba07bc9 100644 --- a/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config +++ b/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuAdminUser.config @@ -1 +1 @@ -user.mapping=["de.valtech.aecu.core:aecu-admin\=aecu-admin"] \ No newline at end of file +user.mapping=["de.valtech.aecu.core:aecu-admin\=[aecu-admin]"] \ No newline at end of file diff --git a/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config b/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config index 91811d89..46c6bf6f 100644 --- a/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config +++ b/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuContentMigratorUser.config @@ -1 +1 @@ -user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=aecu-content-migrator"] \ No newline at end of file +user.mapping=["de.valtech.aecu.core:aecu-content-migrator\=[aecu-content-migrator]"] \ No newline at end of file diff --git a/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config b/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config index cc15e955..22d8a3ce 100644 --- a/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config +++ b/complete/src/main/content/jcr_root/apps/valtech/aecu-complete/config/org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl.amended-valtechAecuSystemUser.config @@ -1 +1 @@ -user.mapping=["de.valtech.aecu.core:aecu\=aecu-service"] \ No newline at end of file +user.mapping=["de.valtech.aecu.core:aecu\=[aecu-service]"] \ No newline at end of file From a267626c9b5a14b4dc0209e5eab1c2db00047d32 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 08:57:18 +0200 Subject: [PATCH 07/21] CI build --- .github/workflows/maven.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 00000000..8af8c0a4 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,37 @@ +# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Java CI with Maven + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + cache: maven + - name: Cache SonarCloud packages + uses: actions/cache@v1 + with: + path: ~/.sonar/cache + key: ${{ runner.os }}-sonar + restore-keys: ${{ runner.os }}-sonar + - name: Build with Maven + run: mvn clean install javadoc:javadoc + - name: Build and analyze + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=aecu From 2e200ae4bd1fd3ed057b6834e123d798d547ec0d Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 09:00:03 +0200 Subject: [PATCH 08/21] 6.0.3 --- HISTORY | 3 +++ 1 file changed, 3 insertions(+) diff --git a/HISTORY b/HISTORY index 38c6abec..078aa846 100644 --- a/HISTORY +++ b/HISTORY @@ -1,3 +1,6 @@ +6.0.3 + - Improvements to cloud startup hook (190) + 2022-06-03 6.0.2 - Improvements to cloud startup hook to avoid double execution and execution before Groovy Console is ready From 4ec81e5f3efb66303c064e687755f407828c8cbb Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 09:02:13 +0200 Subject: [PATCH 09/21] CI --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 8af8c0a4..d4330838 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -5,9 +5,9 @@ name: Java CI with Maven on: push: - branches: [ main ] + branches: [ develop ] pull_request: - branches: [ main ] + branches: [ develop ] jobs: build: From 299c65a1f16eaaab0e6f1b33efb9e19ae2ef0483 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 09:02:55 +0200 Subject: [PATCH 10/21] 6.0.3 --- .travis.yml | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 23dd99d6..00000000 --- a/.travis.yml +++ /dev/null @@ -1,19 +0,0 @@ -language: java - -jdk: - - oraclejdk11 - -addons: - sonarcloud: - organization: "valtech_aecu" - token: - secure: v0L2WG1NtMt4bXGRipEY9X23Glmz5ZldVCw7LaIUbUwKOB2AVghhUttZAsI0FBntsF0jRHJDk3L/4g45UZWSZOMRMl3lPm8NTHZLC4TmeDb00H/JXirh5ZghX+9KDiL1X8IF5xX6HRU8WO2XFnPhNR9kdh6JKSBwM2wEXADl8WNWLP7I8hB4hQ+gBdil1zOcT5vnyhc29zSU5EuBp4uZanlNhjry12tIOp/pZpdDO/pzF6m8T0DvGsgvlkZNWF16a0kazsLVWOYZ7QmjM8YDt6jVCNVQ+cImY/YPoq42OdvbIUfTazxiMS+P68Wel7ulH9FqzfHmz+SYPxQ1TfAQ2ltZO05ubQ5C2TScC+mipUkfbgqRr9RJUPkret+nUJ1WaQdf6+W3oZ6pTvn27s+XZFlWTbj6CcmgTPN8cCL5D+A9huvDOD2wWHkP7cquGSIuqh+Nc33K/EWR/BhY4ec2Xk/bjfoPTIE4tOuVyIZQLf64RxL0sRyitj4dZz+aRqhKiCaVKRtELqh8JoteYon+QPw/MF4UOalq+/QAFWvmgMeCouGxLwh2EPlK+3kXFO5tebRv67zLVesfVFCZgKWshTvUJ02kxKqy8HpocMTmoaIsRUHi2E5ucpbMxzKuJitpetrOHIjMNJQhfi0oW17zeB8i/oDwMIdNUGXPAU2MF1g= - -script: - - mvn clean install javadoc:javadoc -B - - sonar-scanner - -cache: - directories: - - '$HOME/.sonar/cache' - - '$HOME/.m2' From b82890f2d510fe97be8fb992bdded1ab2514d6d5 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 09:12:00 +0200 Subject: [PATCH 11/21] 6.0.3 --- pom.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pom.xml b/pom.xml index 64a04f7f..a807b9ae 100644 --- a/pom.xml +++ b/pom.xml @@ -36,6 +36,9 @@ UTF-8 UTF-8 + valtech_aecu + https://sonarcloud.io + From f86bb479ac6fda84be42713af01acb1cb0fbf0c9 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 09:18:11 +0200 Subject: [PATCH 12/21] 6.0.3 --- .github/workflows/maven.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index d4330838..c61fddd9 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -16,20 +16,31 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Set up JDK 11 uses: actions/setup-java@v3 with: java-version: '11' distribution: 'temurin' cache: maven + - name: Cache SonarCloud packages uses: actions/cache@v1 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar + + - name: Cache Maven packages + uses: actions/cache@v1 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build with Maven run: mvn clean install javadoc:javadoc + - name: Build and analyze env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 9baf92287b69edaccc10e39ed9637221f26616a0 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 10:10:30 +0200 Subject: [PATCH 13/21] refactoring --- .../console/bindings/impl/ContentUpgradeImpl.java | 2 +- .../java/de/valtech/aecu/core/history/HistoryUtil.java | 10 +++++----- .../aecu/core/installhook/AecuTrackerListener.java | 2 +- .../aecu/core/model/execute/ExecuteDataSource.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) 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 8c2605b9..a582c5c8 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 @@ -165,7 +165,7 @@ public ContentUpgrade forResourcesByPropertyQuery(@Nonnull String path, Map { if (key == null || value == null) { - LOG.warn("Null key or value provided: Key: " + key + " Value: " + value); + LOG.warn("Null key or value provided: Key: {} Value: {}", key, value); return; } if (value.contains("%")) { diff --git a/core/src/main/java/de/valtech/aecu/core/history/HistoryUtil.java b/core/src/main/java/de/valtech/aecu/core/history/HistoryUtil.java index 3106d368..3f16c533 100644 --- a/core/src/main/java/de/valtech/aecu/core/history/HistoryUtil.java +++ b/core/src/main/java/de/valtech/aecu/core/history/HistoryUtil.java @@ -418,7 +418,7 @@ public void purgeHistory(ResourceResolver resolver, int daysToKeep) throws Persi Resource base = resolver.getResource(HISTORY_BASE); Calendar calendar = new GregorianCalendar(); calendar.add(Calendar.DAY_OF_MONTH, -daysToKeep); - LOG.debug("Starting purge with limit " + calendar.getTime().toString()); + LOG.debug("Starting purge with limit {}", calendar.getTime()); deleteRecursive(base.listChildren(), calendar, new int[] {Calendar.YEAR, Calendar.MONTH, Calendar.DAY_OF_MONTH}); } @@ -437,7 +437,7 @@ private void deleteRecursive(Iterator resources, Calendar calendar, in String name = resource.getName(); // skip extra nodes such as ACLs if (!StringUtils.isNumeric(name)) { - LOG.debug("Skipping purge of other node: " + resource.getPath()); + LOG.debug("Skipping purge of other node: {}", resource.getPath()); continue; } int nodeValue = Integer.parseInt(name); @@ -447,9 +447,9 @@ private void deleteRecursive(Iterator resources, Calendar calendar, in limit++; } if (nodeValue > limit) { - LOG.debug("Skipping purge of too young node: " + resource.getPath()); + LOG.debug("Skipping purge of too young node: {}", resource.getPath()); } else if (nodeValue == limit) { - LOG.debug("Skipping purge of too young node: " + resource.getPath()); + LOG.debug("Skipping purge of too young node: {}", resource.getPath()); // check next level if (fields.length == 1) { return; @@ -458,7 +458,7 @@ private void deleteRecursive(Iterator resources, Calendar calendar, in System.arraycopy(fields, 1, fieldsNew, 0, fieldsNew.length); deleteRecursive(resource.listChildren(), calendar, fieldsNew); } else { - LOG.debug("Purging node: " + resource.getPath()); + LOG.debug("Purging node: {}", resource.getPath()); BatchResourceRemover remover = ResourceUtil.getBatchResourceRemover(1000); remover.delete(resource); } diff --git a/core/src/main/java/de/valtech/aecu/core/installhook/AecuTrackerListener.java b/core/src/main/java/de/valtech/aecu/core/installhook/AecuTrackerListener.java index 638bff56..37242fd4 100644 --- a/core/src/main/java/de/valtech/aecu/core/installhook/AecuTrackerListener.java +++ b/core/src/main/java/de/valtech/aecu/core/installhook/AecuTrackerListener.java @@ -108,7 +108,7 @@ public void onMessage(Mode mode, String action, String path) { } if (!ACTIONS.contains(action) && isValid(path)) { - LOG.debug(String.format("Skipping %s due to non matching action '%s'", path, action)); + LOG.debug("Skipping {} due to non matching action '{}'", path, action); return; } diff --git a/core/src/main/java/de/valtech/aecu/core/model/execute/ExecuteDataSource.java b/core/src/main/java/de/valtech/aecu/core/model/execute/ExecuteDataSource.java index c96a6164..c7c87794 100644 --- a/core/src/main/java/de/valtech/aecu/core/model/execute/ExecuteDataSource.java +++ b/core/src/main/java/de/valtech/aecu/core/model/execute/ExecuteDataSource.java @@ -73,7 +73,7 @@ public void setup() throws AecuException { List allowedScripts = aecuService.getFiles(path); ResourceResolver resourceResolver = request.getResourceResolver(); for (String scriptPath : allowedScripts) { - entries.add(new ValueMapResource(resourceResolver, scriptPath, ITEM_TYPE, null)); + entries.add(new ValueMapResource(resourceResolver, scriptPath, ITEM_TYPE)); } } From 683f848bb09640d28ec46a8952bca350d5582c35 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Thu, 9 Jun 2022 10:20:20 +0200 Subject: [PATCH 14/21] 6.0.3 --- api/pom.xml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/api/pom.xml b/api/pom.xml index 0f56c44a..5aeba306 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -45,6 +45,36 @@ org.apache.maven.plugins maven-javadoc-plugin + + org.jacoco + jacoco-maven-plugin + + + prepare-agent + + prepare-agent + + + + report + prepare-package + + report + + + + post-unit-test + test + + report + + + + + + org.owasp + dependency-check-maven + From 9b864c556726ab9760a072042cb5096cb8cf1283 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 14 Jun 2022 14:05:21 +0200 Subject: [PATCH 15/21] CI --- .github/codeql/codeql-config.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .github/codeql/codeql-config.yml diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml new file mode 100644 index 00000000..97e7b2b8 --- /dev/null +++ b/.github/codeql/codeql-config.yml @@ -0,0 +1,7 @@ +name: "AECU CodeQL config" + +queries: + - uses: security-and-quality + +paths-ignore: + - '**/ui.apps.groovyconsole/**/*.*' From 2e9a5ccc460b0bf6f2250520e4d306b0fd6787bf Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 14 Jun 2022 14:09:05 +0200 Subject: [PATCH 16/21] CI --- .github/workflows/codeql-analysis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 754ac3b0..1bc5cfba 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,9 +39,10 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v1 + uses: github/codeql-action/init@v2 with: languages: ${{ matrix.language }} + config-file: ./.github/codeql/codeql-config.yml # If you wish to specify custom queries, you can do so here or in a config file. # By default, queries listed here will override any specified in a config file. # Prefix the list here with "+" to use these queries and those in the config file. @@ -63,4 +64,4 @@ jobs: mvn clean install - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 + uses: github/codeql-action/analyze@v2 From a71bcd49f5330be538ac7b35783332fed28488b0 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 14 Jun 2022 14:11:49 +0200 Subject: [PATCH 17/21] CI --- .github/workflows/codeql-analysis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1bc5cfba..6a97dd5f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -35,7 +35,14 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 + + - name: Cache Maven packages + uses: actions/cache@v1 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL From ad37c7c38cee8eb64b9f5d7b40baec7fd8612a61 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 14 Jun 2022 14:23:48 +0200 Subject: [PATCH 18/21] CI --- .github/codeql/codeql-config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index 97e7b2b8..163ca1ef 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -5,3 +5,4 @@ queries: paths-ignore: - '**/ui.apps.groovyconsole/**/*.*' + - '**/target/**/*.*' From e07d1bb94b7431a910d6a0537045fead79a6d3bd Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Tue, 14 Jun 2022 14:36:33 +0200 Subject: [PATCH 19/21] refactoring --- .../aecu/core/groovy/console/bindings/filters/TestFilters.java | 2 +- .../groovy/console/bindings/actions/page/SetPageTagsAction.java | 1 - .../de/valtech/aecu/core/security/AccessValidationService.java | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/TestFilters.java b/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/TestFilters.java index 77a3cd92..2e3b9476 100644 --- a/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/TestFilters.java +++ b/api/src/test/java/de/valtech/aecu/core/groovy/console/bindings/filters/TestFilters.java @@ -159,7 +159,7 @@ public void filter_whenMultiValueFieldMatch_thenTrue() { Map properties_multiValue_same_int = new HashMap<>(); properties_multiValue_same_int.put("testMultiValueInt", new Integer[] {1, 2, 3}); - assertTrue(new FilterByProperties(properties_multiValue_same).filter(resource, new StringBuilder())); + assertTrue(new FilterByProperties(properties_multiValue_same_int).filter(resource, new StringBuilder())); Map properties_multiValue_2 = new HashMap<>(); properties_multiValue_2.put("testMultiValue", new String[] {"val_1", "val_2"}); diff --git a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/page/SetPageTagsAction.java b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/page/SetPageTagsAction.java index b1368e02..8401b20f 100644 --- a/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/page/SetPageTagsAction.java +++ b/core/src/main/java/de/valtech/aecu/core/groovy/console/bindings/actions/page/SetPageTagsAction.java @@ -71,7 +71,6 @@ public String doAction(Resource resource) throws PersistenceException { /** * Returns the tags that need to be added. * - * @param oldTags list of existing tags * @return tags to add * @throws PersistenceException invalid tag found */ diff --git a/core/src/main/java/de/valtech/aecu/core/security/AccessValidationService.java b/core/src/main/java/de/valtech/aecu/core/security/AccessValidationService.java index 2382d16b..1cc9cce0 100644 --- a/core/src/main/java/de/valtech/aecu/core/security/AccessValidationService.java +++ b/core/src/main/java/de/valtech/aecu/core/security/AccessValidationService.java @@ -116,7 +116,7 @@ private String getUserName(SlingHttpServletRequest request) { /** * Returns the AEM groups that belong to the user. * - * @param user user + * @param request request * @return group names */ private List getUserGroupNames(SlingHttpServletRequest request) { From 865a756aa8a3c0abae62b240d6216a7f9269c731 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 15 Jun 2022 09:57:41 +0200 Subject: [PATCH 20/21] updating poms for 6.0.3 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.groovyconsole/pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 5aeba306..83e86375 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index b60ba524..c7daf6c2 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 5c93fa18..5d5dae52 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 4c1434e3..7b757e01 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 6dadd852..1533fddc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index ca813ec4..f0a18014 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 28152bcf..1e8da61d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index 694e9d3c..b56e7e16 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.oak.index diff --git a/pom.xml b/pom.xml index a807b9ae..e2063603 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.groovyconsole/pom.xml b/ui.apps.groovyconsole/pom.xml index f666689b..7320edc2 100644 --- a/ui.apps.groovyconsole/pom.xml +++ b/ui.apps.groovyconsole/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.ui.apps.groovyconsole diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index ac3002db..7ca8eee1 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 05782496..50e7ed55 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index 03f8c06f..fd9b1098 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-SNAPSHOT + 6.0.3-rc-SNAPSHOT aecu.ui.content From c17933e2c3a14e7340a21b419650cb34b2655638 Mon Sep 17 00:00:00 2001 From: Roland Gruber Date: Wed, 15 Jun 2022 09:57:59 +0200 Subject: [PATCH 21/21] updating poms for branch'release/6.0.3' 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.groovyconsole/pom.xml | 2 +- ui.apps.structure/pom.xml | 2 +- ui.apps/pom.xml | 2 +- ui.content/pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 83e86375..e11bb17f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.api diff --git a/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml index c7daf6c2..5051703e 100644 --- a/cloud.startup.hook/pom.xml +++ b/cloud.startup.hook/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.cloud.startup.hook diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml index 5d5dae52..02d078e5 100644 --- a/complete-cloud/pom.xml +++ b/complete-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.complete.cloud diff --git a/complete/pom.xml b/complete/pom.xml index 7b757e01..23b17798 100644 --- a/complete/pom.xml +++ b/complete/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.complete diff --git a/core/pom.xml b/core/pom.xml index 1533fddc..eb997fd7 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.core diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml index f0a18014..c7624ce5 100644 --- a/examples-cloud/pom.xml +++ b/examples-cloud/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.examples-cloud diff --git a/examples/pom.xml b/examples/pom.xml index 1e8da61d..09c1306a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.examples diff --git a/oak.index/pom.xml b/oak.index/pom.xml index b56e7e16..14c9bc98 100644 --- a/oak.index/pom.xml +++ b/oak.index/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.oak.index diff --git a/pom.xml b/pom.xml index e2063603..c6690ed2 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ de.valtech.aecu aecu pom - 6.0.3-rc-SNAPSHOT + 6.0.3 AECU AEM Easy Content Upgrade https://github.com/valtech/aem-easy-content-upgrade diff --git a/ui.apps.groovyconsole/pom.xml b/ui.apps.groovyconsole/pom.xml index 7320edc2..7cd8f407 100644 --- a/ui.apps.groovyconsole/pom.xml +++ b/ui.apps.groovyconsole/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.ui.apps.groovyconsole diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml index 7ca8eee1..29cfcf33 100644 --- a/ui.apps.structure/pom.xml +++ b/ui.apps.structure/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.ui.apps.structure diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml index 50e7ed55..1e748ebd 100644 --- a/ui.apps/pom.xml +++ b/ui.apps/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.ui.apps diff --git a/ui.content/pom.xml b/ui.content/pom.xml index fd9b1098..c61b258b 100644 --- a/ui.content/pom.xml +++ b/ui.content/pom.xml @@ -5,7 +5,7 @@ de.valtech.aecu aecu - 6.0.3-rc-SNAPSHOT + 6.0.3 aecu.ui.content