From af4fe32bcdb56cb8e6533e6172045845794eb7c3 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 15 Aug 2024 10:15:17 +0200 Subject: [PATCH 1/4] [gitflow-maven-plugin] Update for next development version 2024.8.17465.20240813T175259Z-240700.0001-SNAPSHOT --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adfaf34..ffa6597 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.wcm.maven io.wcm.maven.aem-cloud-dependencies - 2024.8.17465.20240813T175259Z-240700.0000 + 2024.8.17465.20240813T175259Z-240700.0001-SNAPSHOT pom AEM Cloud Service Dependencies From a1c04ccf2d908eb4678019cdb559a56ddd4621c7 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Thu, 15 Aug 2024 12:00:43 +0200 Subject: [PATCH 2/4] Obtain AEMaaCS SDK version from /system/console/productinfo --- update-aem-deps.groovy | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/update-aem-deps.groovy b/update-aem-deps.groovy index eed5d3a..a20f67e 100644 --- a/update-aem-deps.groovy +++ b/update-aem-deps.groovy @@ -143,8 +143,12 @@ def readAemUrl(relativeUrl) { // reads the AEM version from locale AEM instance and finds the matching AEM SDK version in the maven repository def resolveAemSdkVersion() { - // PLEASE NOTE: this works only when a valid 'license.properties' is located beneath the quickstart JAR file - def aemVersion = (readAemUrl('/system/console/status-productinfo.txt') =~ /Adobe Experience Manager \((.*)\)/)[0][1] + def productInfoUrl = '/system/console/productinfo' + def aemVersionMatcher = (readAemUrl(productInfoUrl) =~ /Adobe Experience Manager \((.*)\)/) + if (!aemVersionMatcher) { + throw new RuntimeException('Adobe Experience Manager version not present in product info from ' + productInfoUrl) + } + def aemVersion = aemVersionMatcher[0][1] // need to transform from a AEM version like '2020.4.2793.20200403T195013Z' to '2020.04.2793.20200403T195013Z-200130' def versionPattern = Pattern.compile(aemVersion.replaceAll('\\.','.*') + '-.*') From 91c89b7a833b4cea307dbab32f374721180db0c2 Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 28 Aug 2024 09:32:52 +0200 Subject: [PATCH 3/4] Update to 2024.8.17569.20240822T203847Z-240700 --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index ffa6597..6d27a1a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.wcm.maven io.wcm.maven.aem-cloud-dependencies - 2024.8.17465.20240813T175259Z-240700.0001-SNAPSHOT + 2024.8.17569.20240822T203847Z-240700.0000-SNAPSHOT pom AEM Cloud Service Dependencies @@ -86,7 +86,7 @@ com.adobe.aem aem-sdk-api - 2024.8.17465.20240813T175259Z-240700 + 2024.8.17569.20240822T203847Z-240700 @@ -410,7 +410,7 @@ commons-collections commons-collections - + 3.2.2 @@ -445,7 +445,7 @@ com.google.code.gson gson - 2.8.9 + 2.9.0 com.fasterxml.jackson.core @@ -470,7 +470,7 @@ com.github.jknack handlebars - 4.3.0 + 4.3.1 taglibs @@ -489,7 +489,7 @@ org.apache.sling org.apache.sling.api - 2.27.2 + 2.27.6 org.apache.sling @@ -499,7 +499,8 @@ org.apache.sling org.apache.sling.resourceresolver - 1.11.6 + + 1.12.0 org.apache.sling @@ -669,8 +670,7 @@ org.apache.jackrabbit.vault org.apache.jackrabbit.vault - - 3.7.2 + 3.8.0 org.slf4j From b4cbb4aaf4d158d403679b65b944c76b6e1af02d Mon Sep 17 00:00:00 2001 From: Stefan Seifert Date: Wed, 28 Aug 2024 09:35:54 +0200 Subject: [PATCH 4/4] [gitflow-maven-plugin] Update versions for release 2024.8.17569.20240822T203847Z-240700.0000 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6d27a1a..24d698a 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ io.wcm.maven io.wcm.maven.aem-cloud-dependencies - 2024.8.17569.20240822T203847Z-240700.0000-SNAPSHOT + 2024.8.17569.20240822T203847Z-240700.0000 pom AEM Cloud Service Dependencies