Apache Solr open-source search software
SOLR-15374 Update Mockito to newer version (#97)
Mike Drob3141609fed09
diff --git a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.javaindex 7c5c86476f9..6df9a704715 100644--- a/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java@@ -17,7 +17,15 @@package org.apache.solr.cloud;import static org.apache.solr.cloud.AbstractDistribZkTestBase.verifyReplicaStatus;-import static org.mockito.Mockito.*;+import static org.mockito.ArgumentMatchers.any;+import static org.mockito.ArgumentMatchers.anyBoolean;+import static org.mockito.ArgumentMatchers.anyInt;+import static org.mockito.ArgumentMatchers.anyString;+import static org.mockito.Mockito.doAnswer;+import static org.mockito.Mockito.doNothing;+import static org.mockito.Mockito.doReturn;+import static org.mockito.Mockito.mock;+import static org.mockito.Mockito.when;import java.io.IOException;import java.lang.invoke.MethodHandles;@@ -92,8 +100,9 @@ import org.junit.BeforeClass;import org.junit.Ignore;import org.junit.Test;import org.mockito.Mockito;-import org.mockito.internal.util.reflection.FieldSetter;+import org.mockito.internal.configuration.plugins.Plugins;import org.mockito.invocation.InvocationOnMock;+import org.mockito.plugins.MemberAccessor;import org.mockito.stubbing.Answer;import org.slf4j.Logger;import org.slf4j.LoggerFactory;@@ -1378,7 +1387,7 @@ public class OverseerTest extends SolrTestCaseJ4 {private SolrZkClient electNewOverseer(String address)throws InterruptedException, TimeoutException, IOException,- KeeperException, ParserConfigurationException, SAXException, NoSuchFieldException, SecurityException {+ KeeperException, ParserConfigurationException, SAXException, NoSuchFieldException, SecurityException, IllegalAccessException {SolrZkClient zkClient = new SolrZkClient(address, TIMEOUT);zkClients.add(zkClient);ZkStateReader reader = new ZkStateReader(zkClient);@@ -1407,12 +1416,12 @@ public class OverseerTest extends SolrTestCaseJ4 {return zkClient;}- private ZkController createMockZkController(String zkAddress, SolrZkClient zkClient, ZkStateReader reader) throws InterruptedException, NoSuchFieldException, SecurityException, SessionExpiredException {+ private ZkController createMockZkController(String zkAddress, SolrZkClient zkClient, ZkStateReader reader) throws InterruptedException, NoSuchFieldException, SecurityException, SessionExpiredException, IllegalAccessException {ZkController zkController = mock(ZkController.class);if (zkClient == null) {SolrZkClient newZkClient = new SolrZkClient(server.getZkAddress(), AbstractZkTestCase.TIMEOUT);- Mockito.doAnswer(+ doAnswer(new Answer<Void>() {public Void answer(InvocationOnMock invocation) {newZkClient.close();@@ -1432,9 +1441,10 @@ public class OverseerTest extends SolrTestCaseJ4 {ClusterSingletons singletons = new ClusterSingletons(() -> true, r -> r.run());// don't wait for all singletonssingletons.setReady();- FieldSetter.setField(mockAlwaysUpCoreContainer, CoreContainer.class.getDeclaredField("clusterSingletons"), singletons);- FieldSetter.setField(zkController, ZkController.class.getDeclaredField("zkClient"), zkClient);- FieldSetter.setField(zkController, ZkController.class.getDeclaredField("cc"), mockAlwaysUpCoreContainer);+ final MemberAccessor accessor = Plugins.getMemberAccessor();+ accessor.set(CoreContainer.class.getDeclaredField("clusterSingletons"), mockAlwaysUpCoreContainer, singletons);+ accessor.set(ZkController.class.getDeclaredField("zkClient"), zkController, zkClient);+ accessor.set(ZkController.class.getDeclaredField("cc"), zkController, mockAlwaysUpCoreContainer);when(zkController.getCoreContainer()).thenReturn(mockAlwaysUpCoreContainer);when(zkController.getZkClient()).thenReturn(zkClient);when(zkController.getZkStateReader()).thenReturn(reader);diff --git a/solr/licenses/byte-buddy-1.10.20.jar.sha1 b/solr/licenses/byte-buddy-1.10.20.jar.sha1new file mode 100644index 00000000000..b31ad1a9797--- /dev/null+++ b/solr/licenses/byte-buddy-1.10.20.jar.sha1@@ -0,0 +1 @@+c5d2d12c75c5d52f8df33f4211e6dbd05a42b117diff --git a/solr/licenses/byte-buddy-1.9.3.jar.sha1 b/solr/licenses/byte-buddy-1.9.3.jar.sha1deleted file mode 100644index 2a02d426736..00000000000--- a/solr/licenses/byte-buddy-1.9.3.jar.sha1+++ /dev/null@@ -1 +0,0 @@-f32e510b239620852fc9a2387fac41fd053d6a4ddiff --git a/solr/licenses/mockito-core-2.23.4.jar.sha1 b/solr/licenses/mockito-core-2.23.4.jar.sha1deleted file mode 100644index 725998b2f35..00000000000--- a/solr/licenses/mockito-core-2.23.4.jar.sha1+++ /dev/null@@ -1 +0,0 @@-a35b6f8ffcfa786771eac7d7d903429e790fdf3fdiff --git a/solr/licenses/mockito-core-3.8.0.jar.sha1 b/solr/licenses/mockito-core-3.8.0.jar.sha1new file mode 100644index 00000000000..0e89d395726--- /dev/null+++ b/solr/licenses/mockito-core-3.8.0.jar.sha1@@ -0,0 +1 @@+a3f5ed0745e4d76aa880136ab514412cd50b6246diff --git a/solr/licenses/objenesis-2.6.jar.sha1 b/solr/licenses/objenesis-2.6.jar.sha1deleted file mode 100644index 277e036b108..00000000000--- a/solr/licenses/objenesis-2.6.jar.sha1+++ /dev/null@@ -1 +0,0 @@-639033469776fd37c08358c6b92a4761feb2af4bdiff --git a/solr/licenses/objenesis-3.1.jar.sha1 b/solr/licenses/objenesis-3.1.jar.sha1new file mode 100644index 00000000000..b0824738b99--- /dev/null+++ b/solr/licenses/objenesis-3.1.jar.sha1@@ -0,0 +1 @@+48f12deaae83a8dfc3775d830c9fd60ea59bbbcadiff --git a/versions.lock b/versions.lockindex 0369039defd..045322d17f4 100644--- a/versions.lock+++ b/versions.lock@@ -218,7 +218,7 @@ com.martiansoftware:nailgun-server:0.9.1 (1 constraints: 800960a1)com.sun.jersey:jersey-servlet:1.19 (1 constraints: df04fa30)com.vaadin.external.google:android-json:0.0.20131108.vaadin1 (1 constraints: 34092a9e)joda-time:joda-time:2.9.9 (1 constraints: 8a0972a1)-net.bytebuddy:byte-buddy:1.9.3 (2 constraints: 2510faaf)+net.bytebuddy:byte-buddy:1.10.20 (2 constraints: 7c10a9d0)org.apache.hadoop:hadoop-hdfs:3.2.0 (1 constraints: 07050036)org.apache.hadoop:hadoop-minikdc:3.2.0 (1 constraints: 07050036)org.apache.kerby:kerb-admin:1.0.1 (1 constraints: 0405f135)@@ -239,6 +239,6 @@ org.jruby:jruby-stdlib:9.2.6.0 (1 constraints: 0f08b57d)org.jruby.jcodings:jcodings:1.0.41 (2 constraints: e3124361)org.jruby.joni:joni:2.1.25 (1 constraints: b00903ab)org.jsoup:jsoup:1.12.1 (1 constraints: 3705303b)-org.mockito:mockito-core:2.23.4 (1 constraints: 3d05403b)-org.objenesis:objenesis:2.6 (2 constraints: 5f0ffb79)+org.mockito:mockito-core:3.8.0 (1 constraints: 0d051236)+org.objenesis:objenesis:3.1 (2 constraints: 5b0ff979)org.slf4j:slf4j-simple:1.7.24 (1 constraints: 4005473b)diff --git a/versions.props b/versions.propsindex 07ef2b0451f..72597e107a0 100644--- a/versions.props+++ b/versions.props@@ -90,7 +90,7 @@ org.hsqldb:hsqldb=2.4.0org.jdom:jdom2=2.0.6org.jsoup:jsoup=1.12.1org.locationtech.spatial4j:*=0.7-org.mockito:mockito-core=2.23.4+org.mockito:mockito-core=3.8.0org.objenesis:objenesis=2.6org.ow2.asm:*=7.2org.rrd4j:rrd4j=3.5