Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Apr 25, 2022
2 parents 27cd930 + b80ed15 commit f8af1ed
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<groupId>io.wcm.maven</groupId>
<artifactId>io.wcm.maven.aem-cloud-dependencies</artifactId>
<version>2022.3.6698.20220318T233218Z-220100.0000</version>
<version>2022.4.7100.20220421T124010Z-220400.0000</version>
<packaging>pom</packaging>

<name>AEM Cloud Service Dependencies</name>
Expand Down Expand Up @@ -68,7 +68,7 @@
<slf4j.version>1.7.32</slf4j.version>
<!-- update-aem-deps:bundle=org.apache.jackrabbit.jackrabbit-jcr-commons -->
<jackrabbit.version>2.20.0</jackrabbit.version>
<!-- update-aem-deps:derived-from=org.apache.jackrabbit.oak-core:1.42-T20220311080607-24c54e5 -->
<!-- update-aem-deps:derived-from=org.apache.jackrabbit.oak-core:1.42-T20220401090340-a7d9bc5 -->
<oak.version>1.42.0</oak.version>

<!-- repository settings -->
Expand All @@ -86,7 +86,7 @@
<groupId>com.adobe.aem</groupId>
<artifactId>aem-sdk-api</artifactId>
<!-- update-aem-deps:from-aem-sdk-api -->
<version>2022.3.6698.20220318T233218Z-220100</version>
<version>2022.4.7100.20220421T124010Z-220400</version>
</dependency>

<!-- OSGI (individual artifacts) -->
Expand All @@ -106,7 +106,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component</artifactId>
<!-- update-aem-deps:from-aem-sdk-api -->
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down Expand Up @@ -186,7 +186,7 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.component.annotations</artifactId>
<!-- update-aem-deps:from-aem-sdk-api -->
<version>1.4.0</version>
<version>1.5.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down Expand Up @@ -301,13 +301,13 @@
<dependency>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.core</artifactId>
<version>2.18.8</version>
<version>2.19.0</version>
</dependency>
<dependency>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.testing.aem-mock-plugin</artifactId>
<!-- update-aem-deps:bundle=com.adobe.cq.core.wcm.components.core -->
<version>2.18.8</version>
<version>2.19.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -471,7 +471,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
<version>2.24.0</version>
<version>2.25.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Expand Down Expand Up @@ -543,9 +543,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.core</artifactId>
<!-- Latest version not available on Maven Central -->
<!-- update-aem-deps:derived-from=org.apache.sling.scripting.core:2.4.6 -->
<version>2.4.4</version>
<version>2.4.6</version>
<exclusions>
<exclusion>
<groupId>org.osgi</groupId>
Expand All @@ -560,7 +558,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.scripting.sightly</artifactId>
<version>1.4.16-1.4.0</version>
<version>1.4.18-1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
Expand Down

0 comments on commit f8af1ed

Please sign in to comment.