From b24b4721abd379fb186e99ff6a60364fc13b81a0 Mon Sep 17 00:00:00 2001
From: Stefan Seifert <stefanseifert@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:34:22 +0100
Subject: [PATCH 1/5] Renable parallel unit tests

---
 pom.xml | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index f55cf8ad..b6eb244a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -363,24 +363,6 @@
       </plugin>
 
     </plugins>
-    <pluginManagement>
-    
-      <!-- Disable parallel unit tests for all environment -->
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <properties>
-              <configurationParameters>
-                junit.jupiter.execution.parallel.enabled = false
-              </configurationParameters>
-            </properties>
-          </configuration>
-        </plugin>
-      </plugins>
-
-    </pluginManagement>
   </build>
 
   <reporting>

From 0b07f72ca18536d8170a57d9076f74f7d78d754d Mon Sep 17 00:00:00 2001
From: Stefan Seifert <stefanseifert@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:44:23 +0100
Subject: [PATCH 2/5] update to latest sling-mock snapshot, prepare
 configuration of SLING-12090

---
 .github/workflows/maven-build.yml | 1 +
 pom.xml                           | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index fc4f02da..7c8288b9 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -35,3 +35,4 @@ jobs:
           sonar-run-on-java-version: 17
           sonar-token: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          maven-additional-args: -Dsling.mock.resourceresolverfactoryactivator.timeout.ms=250
diff --git a/pom.xml b/pom.xml
index b6eb244a..6df08cb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,6 +147,12 @@
       <version>5.6.2</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>org.apache.sling.testing.sling-mock</artifactId>
+      <version>3.5.3-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.logging-mock</artifactId>

From 904493f259669c2b36d7dea1e024bf2b258a8550 Mon Sep 17 00:00:00 2001
From: Stefan Seifert <stefanseifert@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:46:33 +0100
Subject: [PATCH 3/5] set
 sling.mock.resourceresolverfactoryactivator.timeout.ms to 500

---
 .github/workflows/maven-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 7c8288b9..b0631b1f 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -35,4 +35,4 @@ jobs:
           sonar-run-on-java-version: 17
           sonar-token: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          maven-additional-args: -Dsling.mock.resourceresolverfactoryactivator.timeout.ms=250
+          maven-additional-args: -Dsling.mock.resourceresolverfactoryactivator.timeout.ms=500

From 4302709962fd8f889c1025e5acce337cf5f84f5a Mon Sep 17 00:00:00 2001
From: Stefan Seifert <stefanseifert@users.noreply.github.com>
Date: Mon, 13 Jan 2025 11:50:36 +0100
Subject: [PATCH 4/5] set
 sling.mock.resourceresolverfactoryactivator.timeout.ms to 1000

---
 .github/workflows/maven-build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index b0631b1f..1dac440c 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -35,4 +35,4 @@ jobs:
           sonar-run-on-java-version: 17
           sonar-token: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          maven-additional-args: -Dsling.mock.resourceresolverfactoryactivator.timeout.ms=500
+          maven-additional-args: -Dsling.mock.resourceresolverfactoryactivator.timeout.ms=1000

From 55f92c20934849fa25dceb70145bb41ee5932760 Mon Sep 17 00:00:00 2001
From: Stefan Seifert <stefanseifert@users.noreply.github.com>
Date: Fri, 17 Jan 2025 10:30:02 +0100
Subject: [PATCH 5/5] remove experiments with
 sling.mock.resourceresolverfactoryactivator.timeout.ms - did not have an
 effect

---
 .github/workflows/maven-build.yml | 1 -
 pom.xml                           | 6 ------
 2 files changed, 7 deletions(-)

diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml
index 1dac440c..fc4f02da 100644
--- a/.github/workflows/maven-build.yml
+++ b/.github/workflows/maven-build.yml
@@ -35,4 +35,3 @@ jobs:
           sonar-run-on-java-version: 17
           sonar-token: ${{ secrets.SONAR_TOKEN }}
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          maven-additional-args: -Dsling.mock.resourceresolverfactoryactivator.timeout.ms=1000
diff --git a/pom.xml b/pom.xml
index 6df08cb7..b6eb244a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,12 +147,6 @@
       <version>5.6.2</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.sling</groupId>
-      <artifactId>org.apache.sling.testing.sling-mock</artifactId>
-      <version>3.5.3-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.testing.logging-mock</artifactId>