From 542f539e32865b0863581bbeac17387559ec5bdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20B=C4=85czkowski?=
 <wojciech.baczkowski@scylladb.com>
Date: Tue, 13 Aug 2024 23:28:50 +0200
Subject: [PATCH 1/2] Upgrade mockito-core to 3.4.6

Upgrades mockito version. Version 3.4.6 was chosen because 3.4.0
is the first one providing mocking of static methods that we possibly want to use.
Does not switch to mockito-inline yet.
---
 metrics/micrometer/pom.xml | 1 +
 pom.xml                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/metrics/micrometer/pom.xml b/metrics/micrometer/pom.xml
index d96c7cb4720..c40b3826941 100644
--- a/metrics/micrometer/pom.xml
+++ b/metrics/micrometer/pom.xml
@@ -97,6 +97,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
+      <version>2.28.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 414ec6b5eb2..1f236bf1f98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -238,7 +238,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>2.28.2</version>
+        <version>3.4.6</version>
       </dependency>
       <dependency>
         <groupId>io.reactivex.rxjava2</groupId>

From 1009d96e0ac60cea42bfb8f4de4c96cb2942da12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wojciech=20B=C4=85czkowski?=
 <wojciech.baczkowski@scylladb.com>
Date: Tue, 20 Aug 2024 13:37:27 +0200
Subject: [PATCH 2/2] Set integration-tests parallel execution to method level

---
 integration-tests/pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 60631228e77..8a6f5c8ddc7 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -247,6 +247,8 @@
               <threadCountClasses>8</threadCountClasses>
               <summaryFile>${project.build.directory}/failsafe-reports/failsafe-summary-parallelized.xml</summaryFile>
               <skipITs>${skipParallelizableITs}</skipITs>
+              <parallel>methods</parallel>
+              <threadCount>4</threadCount>
             </configuration>
           </execution>
           <execution>