Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanseifert committed Aug 22, 2022
2 parents 2586676 + 2e0926d commit dc0c4fa
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 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.7.8085.20220725T140323Z-220600.0000</version>
<version>2022.8.8316.20220818T100409Z-220700.0000</version>
<packaging>pom</packaging>

<name>AEM Cloud Service Dependencies</name>
Expand Down Expand Up @@ -68,8 +68,8 @@
<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-* -->
<oak.version>1.42.0</oak.version>
<!-- update-aem-deps:derived-from=org.apache.jackrabbit.oak-core:1.44-* -->
<oak.version>1.44.0</oak.version>

<!-- repository settings -->
<distribution.snapshotRepositoryId>ossrh</distribution.snapshotRepositoryId>
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.7.8085.20220725T140323Z-220600</version>
<version>2022.8.8316.20220818T100409Z-220700</version>
</dependency>

<!-- OSGI (individual artifacts) -->
Expand Down Expand Up @@ -302,18 +302,24 @@
<artifactId>com.adobe.granite.tagsoup</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jaxb-runtime</artifactId>
<!-- update-aem-deps:derived-from=org.apache.servicemix.bundles.jaxb-runtime:2.3.2 -->
<version>2.3.2_2</version>
</dependency>

<!-- Dependencies included in SDK API jar - but we keep them here for backward compatibility with older aem-dependencies versions -->
<dependency>
<groupId>com.adobe.cq</groupId>
<artifactId>core.wcm.components.core</artifactId>
<version>2.20.6</version>
<version>2.20.8</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.20.6</version>
<version>2.20.8</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down

0 comments on commit dc0c4fa

Please sign in to comment.