Merge branch 'master' of https://github.com/everit-org/json-schema

Author: Bence Erős

core/pom.xml

@@ -224,13 +224,13 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
+            <version>31.0.1-jre</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.7.0</version>
+            <version>5.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -247,7 +247,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>1.10.19</version>
+            <version>4.2.0</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -259,7 +259,7 @@
         <dependency>
             <groupId>nl.jqno.equalsverifier</groupId>
             <artifactId>equalsverifier</artifactId>
-            <version>3.0.3</version>
+            <version>3.8.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -270,12 +270,12 @@
         <dependency>
             <groupId>com.google.re2j</groupId>
             <artifactId>re2j</artifactId>
-            <version>1.3</version>
+            <version>1.6</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

core/src/test/java/org/everit/json/schema/ValidatingVisitorTest.java

@@ -3,7 +3,7 @@
 import static org.everit.json.schema.PrimitiveValidationStrategy.LENIENT;
 import static org.everit.json.schema.PrimitiveValidationStrategy.STRICT;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

core/src/test/java/org/everit/json/schema/loader/JsonObjectTest.java

@@ -4,7 +4,7 @@
 import static org.everit.json.schema.loader.JsonValueTest.withLs;
 import static org.everit.json.schema.loader.OrgJsonUtil.toMap;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

core/src/test/java/org/everit/json/schema/loader/JsonValueTest.java

@@ -8,13 +8,11 @@
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.function.Consumer;

core/src/test/java/org/everit/json/schema/loader/ProjectedJsonObjectTest.java

@@ -4,7 +4,7 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singleton;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;

core/src/test/java/org/everit/json/schema/loader/internal/TypeBasedMultiplexerTest.java

@@ -27,6 +27,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import static org.mockito.hamcrest.MockitoHamcrest.argThat;
 
 public class TypeBasedMultiplexerTest {
 
@@ -54,7 +55,7 @@ public void dispatchesIdChangeEvent() {
         subject.ifObject().then(o -> {
         }).requireAny();
         Mockito.verify(mockListener).resolutionScopeChanged(
-                Mockito.argThat(uriAsString("http://origchangedId")));
+                argThat(uriAsString("http://origchangedId")));
         Mockito.verify(mockListener).resolutionScopeChanged(uri("http://orig"));
     }
 
@@ -66,7 +67,7 @@ private void expectScopeChanges(final JSONObject subjectOfMultiplexing, final St
         subject.addResolutionScopeChangeListener(mockListener);
         subject.ifObject().then(o -> {
         }).requireAny();
-        Mockito.verify(mockListener).resolutionScopeChanged(Mockito.argThat(uriAsString(newScope)));
+        Mockito.verify(mockListener).resolutionScopeChanged(argThat(uriAsString(newScope)));
         Mockito.verify(mockListener).resolutionScopeChanged(uri(origScope));
     }