Merge branch 'develop'

wcm-io · Nov 6, 2024 · 23f4727 · 23f4727
2 parents 0054958 + 4ba2ee3
commit 23f4727
Showing 1 changed file with 37 additions and 32 deletions.
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>io.wcm.maven</groupId>
   <artifactId>io.wcm.maven.aem-cloud-dependencies</artifactId>
-  <version>2024.10.18311.20241017T104455Z-240900.0000</version>
+  <version>2024.10.18459.20241031T210302Z-241000.0000</version>
   <packaging>pom</packaging>
 
   <name>AEM Cloud Service Dependencies</name>
@@ -86,7 +86,7 @@
         <groupId>com.adobe.aem</groupId>
         <artifactId>aem-sdk-api</artifactId>
         <!-- update-aem-deps:from-aem-sdk-api -->
-        <version>2024.10.18311.20241017T104455Z-240900</version>
+        <version>2024.10.18459.20241031T210302Z-241000</version>
       </dependency>
 
       <!-- OSGI (individual artifacts) -->
@@ -96,6 +96,12 @@
         <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.framework -->
         <version>1.10.0</version>
       </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.dto</artifactId>
+        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.dto -->
+        <version>1.1.1</version>
+      </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
         <artifactId>org.osgi.resource</artifactId>
@@ -104,21 +110,21 @@
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.service.component</artifactId>
-        <!-- update-aem-deps:derived-from=org.osgi.service.component:1.5.0.202109301733 -->
-        <version>1.5.0</version>
+        <artifactId>org.osgi.service.cm</artifactId>
+        <!-- update-aem-deps:bundle-package=org.apache.felix.configadmin:org.osgi.service.cm -->
+        <version>1.6.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.service.metatype</artifactId>
-        <!-- update-aem-deps:bundle-package=org.apache.felix.metatype:org.osgi.service.metatype -->
-        <version>1.4.0</version>
+        <artifactId>org.osgi.service.component</artifactId>
+        <!-- update-aem-deps:derived-from=org.osgi.service.component:1.5.0.202109301733 -->
+        <version>1.5.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.service.cm</artifactId>
-        <!-- update-aem-deps:bundle-package=org.apache.felix.configadmin:org.osgi.service.cm -->
-        <version>1.6.0</version>
+        <artifactId>org.osgi.service.condition</artifactId>
+        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.service.condition -->
+        <version>1.0.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
@@ -146,39 +152,39 @@
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.util.converter</artifactId>
-        <!-- update-aem-deps:derived-from=org.osgi.util.converter:1.0.9.202202082230 -->
-        <version>1.0.9</version>
+        <artifactId>org.osgi.service.metatype</artifactId>
+        <!-- update-aem-deps:bundle-package=org.apache.felix.metatype:org.osgi.service.metatype -->
+        <version>1.4.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.util.function</artifactId>
-        <!-- update-aem-deps:derived-from=org.osgi.util.function:1.2.0.202109301733 -->
-        <version>1.2.0</version>
+        <artifactId>org.osgi.service.url</artifactId>
+        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.service.url -->
+        <version>1.0.1</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.util.tracker</artifactId>
-        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.util.tracker -->
-        <version>1.5.3</version>
+        <artifactId>org.osgi.util.converter</artifactId>
+        <!-- update-aem-deps:derived-from=org.osgi.util.converter:1.0.9.202202082230 -->
+        <version>1.0.9</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.dto</artifactId>
-        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.dto -->
-        <version>1.1.1</version>
+        <artifactId>org.osgi.util.function</artifactId>
+        <!-- update-aem-deps:derived-from=org.osgi.util.function:1.2.0.202109301733 -->
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.service.url</artifactId>
-        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.service.url -->
-        <version>1.0.1</version>
+        <artifactId>org.osgi.util.promise</artifactId>
+        <!-- update-aem-deps:derived-from=org.osgi.util.promise:1.2.0.202109301733 -->
+        <version>1.2.0</version>
       </dependency>
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.service.condition</artifactId>
-        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.service.condition -->
-        <version>1.0.0</version>
+        <artifactId>org.osgi.util.tracker</artifactId>
+        <!-- update-aem-deps:bundle-package=org.apache.felix.framework:org.osgi.util.tracker -->
+        <version>1.5.3</version>
       </dependency>
 
       <!-- OSGi annotations -->
@@ -614,13 +620,12 @@
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.models.api</artifactId>
-        <version>1.5.0</version>
+        <version>1.5.4</version>
       </dependency>
       <dependency>
         <groupId>org.apache.sling</groupId>
         <artifactId>org.apache.sling.models.impl</artifactId>
-        <!-- update-aem-deps:derived-from=org.apache.sling.models.impl:1.6.5-B0001 -->
-        <version>1.6.4</version>
+        <version>1.7.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.sling</groupId>