From 42bb6c2f85e8cfb546f4797afd05819869e6affe Mon Sep 17 00:00:00 2001
From: Stefan Seifert <stefanseifert@users.noreply.github.com>
Date: Thu, 5 May 2022 18:41:51 +0200
Subject: [PATCH] update to AEM Cloud dependencies with mixin for JSONP 1.1
 allow to set AEMaaCS version via maven property
 aem-cloud-dependencies.version

---
 core/pom.xml                                  |  8 +++---
 .../test/resources/simplelogger.properties    |  5 ++++
 junit4/pom.xml                                |  8 +++---
 .../test/resources/simplelogger.properties    |  5 ++++
 junit5/pom.xml                                |  8 +++---
 .../test/resources/simplelogger.properties    |  5 ++++
 parent/pom.xml                                | 26 ++++++++++++++++++-
 7 files changed, 52 insertions(+), 13 deletions(-)
 create mode 100644 core/src/test/resources/simplelogger.properties
 create mode 100644 junit4/src/test/resources/simplelogger.properties
 create mode 100644 junit5/src/test/resources/simplelogger.properties

diff --git a/core/pom.xml b/core/pom.xml
index be720259..233616b0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -225,7 +225,7 @@
     <!-- Include AEM APIs in 'provided' scope to let the consuming project decide which to use -->
     <dependency>
       <groupId>com.adobe.aem</groupId>
-      <artifactId>uber-jar</artifactId>
+      <artifactId>aem-sdk-api</artifactId>
       <scope>provided</scope>
     </dependency>
     
@@ -276,9 +276,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.wcm</groupId>
-      <artifactId>io.wcm.testing.logging.logback</artifactId>
-      <version>${logging-logback.version}</version>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+      <version>${logging-mock.version}</version>
       <scope>test</scope>
     </dependency>
 
diff --git a/core/src/test/resources/simplelogger.properties b/core/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..e927e61a
--- /dev/null
+++ b/core/src/test/resources/simplelogger.properties
@@ -0,0 +1,5 @@
+org.slf4j.simpleLogger.defaultLogLevel=WARN
+
+org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=WARN
+org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=WARN
+org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=WARN
\ No newline at end of file
diff --git a/junit4/pom.xml b/junit4/pom.xml
index 6290f6e9..007695b8 100644
--- a/junit4/pom.xml
+++ b/junit4/pom.xml
@@ -96,7 +96,7 @@
     <!-- (other versions of this APIs use other artifact ids) -->
     <dependency>
       <groupId>com.adobe.aem</groupId>
-      <artifactId>uber-jar</artifactId>
+      <artifactId>aem-sdk-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -120,9 +120,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.wcm</groupId>
-      <artifactId>io.wcm.testing.logging.logback</artifactId>
-      <version>${logging-logback.version}</version>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+      <version>${logging-mock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/junit4/src/test/resources/simplelogger.properties b/junit4/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..e927e61a
--- /dev/null
+++ b/junit4/src/test/resources/simplelogger.properties
@@ -0,0 +1,5 @@
+org.slf4j.simpleLogger.defaultLogLevel=WARN
+
+org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=WARN
+org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=WARN
+org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=WARN
\ No newline at end of file
diff --git a/junit5/pom.xml b/junit5/pom.xml
index 95d3a332..636c5aa9 100644
--- a/junit5/pom.xml
+++ b/junit5/pom.xml
@@ -70,7 +70,7 @@
     <!-- (other versions of this APIs use other artifact ids) -->
     <dependency>
       <groupId>com.adobe.aem</groupId>
-      <artifactId>uber-jar</artifactId>
+      <artifactId>aem-sdk-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -107,9 +107,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>io.wcm</groupId>
-      <artifactId>io.wcm.testing.logging.logback</artifactId>
-      <version>${logging-logback.version}</version>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.testing.logging-mock</artifactId>
+      <version>${logging-mock.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/junit5/src/test/resources/simplelogger.properties b/junit5/src/test/resources/simplelogger.properties
new file mode 100644
index 000000000..e927e61a
--- /dev/null
+++ b/junit5/src/test/resources/simplelogger.properties
@@ -0,0 +1,5 @@
+org.slf4j.simpleLogger.defaultLogLevel=WARN
+
+org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.osgi=WARN
+org.slf4j.simpleLogger.log.org.apache.sling.testing.mock.sling=WARN
+org.slf4j.simpleLogger.log.io.wcm.testing.mock.aem=WARN
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index 6ab24955..dde43708 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,13 +68,37 @@
     <sling-mock-oak.version>4.0.0-1.62.0</sling-mock-oak.version>
 
     <!-- Loggin in unit tests (testing dependency only) -->
-    <logging-logback.version>1.0.0</logging-logback.version>
+    <logging-mock.version>2.0.0</logging-mock.version>
 
     <!-- Enable reproducible builds -->
     <project.build.outputTimestamp>2024-04-23T13:24:04Z</project.build.outputTimestamp>
 
+    <!-- Test against this AEMaaCS version -->
+    <aem-cloud-dependencies.version>2024.7.17098.20240711T134106Z-240600.0000</aem-cloud-dependencies.version>
+
   </properties>
 
+  <dependencyManagement>
+    <dependencies>
+
+      <dependency>
+        <groupId>io.wcm.maven</groupId>
+        <artifactId>io.wcm.maven.aem-cloud-dependencies-mixin-jsonp11</artifactId>
+        <version>1.0.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+      <dependency>
+        <groupId>io.wcm.maven</groupId>
+        <artifactId>io.wcm.maven.aem-cloud-dependencies</artifactId>
+        <version>${aem-cloud-dependencies.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
+
   <build>
     <plugins>