[sling-org-apache-sling-clam] branch master updated: SLING-11226 Use Commons Threads 3.2.22

[olli]

This is an automated email from the ASF dual-hosted git repository.

olli pushed a commit to branch master
in repository 
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git


The following commit(s) were added to refs/heads/master by this push:
     new fb0e682  SLING-11226 Use Commons Threads 3.2.22
fb0e682 is described below

commit fb0e68287eaed5670300ed627340b672f830ada8
Author: Oliver Lietz <o...@apache.org>
AuthorDate: Mon Mar 28 11:22:53 2022 +0200

    SLING-11226 Use Commons Threads 3.2.22
    
    3.2.22 is required for Java 17
---
 pom.xml                                                           | 2 +-
 src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 573fbf5..55574d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,7 +314,7 @@
     <dependency>
       <groupId>org.apache.sling</groupId>
       <artifactId>org.apache.sling.commons.threads</artifactId>
-      <version>3.2.18</version>
+      <version>3.2.22</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java 
b/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java
index bd15523..f9e3a8f 100644
--- a/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java
+++ b/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java
@@ -33,6 +33,7 @@ import 
org.apache.sling.clam.jcr.NodeDescendingJcrPropertyDigger;
 import org.apache.sling.commons.clam.ClamService;
 import org.apache.sling.event.jobs.JobManager;
 import org.apache.sling.jcr.api.SlingRepository;
+import org.apache.sling.testing.paxexam.SlingOptions;
 import org.apache.sling.testing.paxexam.TestSupport;
 import org.ops4j.pax.exam.Option;
 import org.ops4j.pax.exam.options.ModifiableCompositeOption;
@@ -74,6 +75,7 @@ public abstract class ClamTestSupport extends TestSupport {
     static final String ADMIN_PASSWORD = "admin";
 
     protected ModifiableCompositeOption baseConfiguration() {
+        SlingOptions.versionResolver.setVersionFromProject(SLING_GROUP_ID, 
"org.apache.sling.commons.threads");
         return composite(
             // Truth first to prevent version issues with Guava
             
wrappedBundle(mavenBundle().groupId("com.google.truth").artifactId("truth").versionAsInProject()),