diff --git a/.github/workflows/sonar.yml b/.github/workflows/sonar.yml
index 7987a06..6a64cf6 100644
--- a/.github/workflows/sonar.yml
+++ b/.github/workflows/sonar.yml
@@ -25,4 +25,4 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 #       run sonar maven plugin:
-        run: mvn -B verify sonar:sonar -Dsonar.projectKey=antkorwin_xsync -Dsonar.organization=antkorwin-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=$SONAR_TOKEN -Dsonar.coverage.jacoco.xmlReportPaths=./target/site/jacoco/jacoco.xml
+        run: mvn -B verify sonar:sonar -Dsonar.projectKey=antkorwin_xsync -Dsonar.organization=antkorwin-github -Dsonar.host.url=https://sonarcloud.io -Dsonar.token=$SONAR_TOKEN -Dsonar.coverage.jacoco.xmlReportPaths=./target/site/jacoco/jacoco.xml
diff --git a/pom.xml b/pom.xml
index f6dbba9..d25e896 100755
--- a/pom.xml
+++ b/pom.xml
@@ -65,17 +65,22 @@
         </repository>
     </distributionManagement>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.junit</groupId>
-				<artifactId>junit-bom</artifactId>
-				<version>${junit-jupiter.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.junit</groupId>
+                <artifactId>junit-bom</artifactId>
+                <version>${junit-jupiter.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>1.18.28</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <dependency>
             <groupId>org.awaitility</groupId>
@@ -92,7 +97,13 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.15.0</version>
+            <version>3.5.13</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>4.11.0</version> <!-- Newer versions are incompatible with JDK 8 -->
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -209,7 +220,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.4</version>
+                <version>0.8.6</version>
                 <executions>
                     <execution>
                         <goals>
@@ -257,6 +268,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.9.1</version>
+                <configuration>
+                    <source>8</source>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
diff --git a/src/test/java/com/antkorwin/xsync/CollisionDetectorTest.java b/src/test/java/com/antkorwin/xsync/CollisionDetectorTest.java
index 61b7625..deb0518 100644
--- a/src/test/java/com/antkorwin/xsync/CollisionDetectorTest.java
+++ b/src/test/java/com/antkorwin/xsync/CollisionDetectorTest.java
@@ -6,13 +6,17 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 
-
+@ExtendWith(MockitoExtension.class)
 class CollisionDetectorTest {
 
+	@Mock
 	private XMutexFactory<Integer> factory;
 	private MutexSorter<Integer> sorter;
 
diff --git a/src/test/java/com/antkorwin/xsync/MultiKeysXSyncTest.java b/src/test/java/com/antkorwin/xsync/MultiKeysXSyncTest.java
index a70e77c..081a202 100644
--- a/src/test/java/com/antkorwin/xsync/MultiKeysXSyncTest.java
+++ b/src/test/java/com/antkorwin/xsync/MultiKeysXSyncTest.java
@@ -326,14 +326,14 @@ void throwExceptionInFunction() {
 		try {
 			xsync.evaluate(Arrays.asList(123L), () -> {
 				// nop
-				throw new NotImplementedException();
+				throw new UnsupportedOperationException();
 			});
 		} catch (Exception e) {
 			exception = e;
 		}
 
 		assertThat(exception).isNotNull();
-		assertThat(exception.getClass()).isEqualTo(NotImplementedException.class);
+		assertThat(exception.getClass()).isEqualTo(UnsupportedOperationException.class);
 	}