diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 00000000..163ca1ef
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,8 @@
+name: "AECU CodeQL config"
+
+queries:
+ - uses: security-and-quality
+
+paths-ignore:
+ - '**/ui.apps.groovyconsole/**/*.*'
+ - '**/target/**/*.*'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 754ac3b0..6a97dd5f 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -35,13 +35,21 @@ 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
- 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 +71,4 @@ jobs:
mvn clean install
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
new file mode 100644
index 00000000..c61fddd9
--- /dev/null
+++ b/.github/workflows/maven.yml
@@ -0,0 +1,48 @@
+# 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: [ develop ]
+ pull_request:
+ branches: [ develop ]
+
+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: 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 }}
+ SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+ run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=aecu
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'
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
diff --git a/api/pom.xml b/api/pom.xml
index 2cc4dd3c..e11bb17f 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -4,7 +4,7 @@
de.valtech.aecu
aecu
- 6.0.2
+ 6.0.3
aecu.api
@@ -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
+
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/cloud.startup.hook/pom.xml b/cloud.startup.hook/pom.xml
index 22c849b9..5051703e 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
aecu.cloud.startup.hook
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);
diff --git a/complete-cloud/pom.xml b/complete-cloud/pom.xml
index 73f2ad79..02d078e5 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
aecu.complete.cloud
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/pom.xml b/complete/pom.xml
index f3739f1e..23b17798 100644
--- a/complete/pom.xml
+++ b/complete/pom.xml
@@ -5,7 +5,7 @@
de.valtech.aecu
aecu
- 6.0.2
+ 6.0.3
aecu.complete
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
diff --git a/core/pom.xml b/core/pom.xml
index a1df1c76..eb997fd7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -4,7 +4,7 @@
de.valtech.aecu
aecu
- 6.0.2
+ 6.0.3
aecu.core
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/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));
}
}
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) {
diff --git a/examples-cloud/pom.xml b/examples-cloud/pom.xml
index cd214422..c7624ce5 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
aecu.examples-cloud
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()
diff --git a/examples/pom.xml b/examples/pom.xml
index 515afeb5..09c1306a 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -5,7 +5,7 @@
de.valtech.aecu
aecu
- 6.0.2
+ 6.0.3
aecu.examples
diff --git a/oak.index/pom.xml b/oak.index/pom.xml
index 3a92c9f9..14c9bc98 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
aecu.oak.index
diff --git a/pom.xml b/pom.xml
index 5b4312a3..c6690ed2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
de.valtech.aecu
aecu
pom
- 6.0.2
+ 6.0.3
AECU
AEM Easy Content Upgrade
https://github.com/valtech/aem-easy-content-upgrade
@@ -36,6 +36,9 @@
UTF-8
UTF-8
+ valtech_aecu
+ https://sonarcloud.io
+
diff --git a/ui.apps.groovyconsole/pom.xml b/ui.apps.groovyconsole/pom.xml
index 57add362..7cd8f407 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
aecu.ui.apps.groovyconsole
diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml
index 2add7abd..29cfcf33 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
aecu.ui.apps.structure
diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
index 39be2e13..1e748ebd 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
aecu.ui.apps
diff --git a/ui.content/pom.xml b/ui.content/pom.xml
index 2b4d2f52..c61b258b 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
aecu.ui.content