commit 45d562ad08ff7ef99458e8737f0fe932ab432d8c
author Fabrizio Fortino <fortino@apache.org> Wed Jan 20 14:46:38 2021 +0000
committer Fabrizio Fortino <fortino@apache.org> Wed Jan 20 14:46:38 2021 +0000
tree b80ac3c77ecffb74a19bad34f47b581cf0cafcd1
parent 0ea42704e4eeee784a496a4bc640ad1e1b0c5307

OAK-9329: bump mockito to version 3.7.7 (fixes compatibility with java 15)

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/oak/trunk@1885717 13f79535-47bb-0310-9956-ffa450edef68

oak-parent/pom.xml

diff --git a/oak-parent/pom.xml b/oak-parent/pom.xml
index 7a2ce75..f8a407d 100644
--- a/oak-parent/pom.xml
+++ b/oak-parent/pom.xml
@@ -579,7 +579,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>3.3.3</version>
+        <version>3.7.7</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>

oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java

diff --git a/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java b/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java
index 2dd230e..c7e3746 100644
--- a/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java
+++ b/oak-segment-remote/src/test/java/org/apache/jackrabbit/oak/segment/remote/queue/SegmentWriteQueueTest.java
@@ -18,10 +18,9 @@
 
 import org.apache.jackrabbit.oak.segment.remote.RemoteSegmentArchiveEntry;
 import org.junit.After;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.mockito.internal.util.reflection.FieldSetter;
+import org.mockito.internal.util.reflection.InstanceField;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -38,7 +37,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -82,7 +80,7 @@
         });
 
         Mockito.when(queue.offer(any(SegmentWriteAction.class), anyLong(), any(TimeUnit.class))).thenThrow(new InterruptedException());
-        FieldSetter.setField(queueBlocked, queueBlocked.getClass().getDeclaredField("queue"), queue);
+        new InstanceField(queueBlocked.getClass().getDeclaredField("queue"), queueBlocked).set(queue);
 
         try {
             queueBlocked.addToQueue(tarEntry(0), EMPTY_DATA, 0, 0);