#129: updated dependencies (#130)

* #129: updated dependencies

pom.xml

@@ -4,17 +4,17 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.exasol</groupId>
   <artifactId>virtual-schema-common-java</artifactId>
-  <version>8.0.1</version>
+  <version>8.0.2</version>
   <name>Common module of Exasol Virtual Schemas Adapters</name>
   <description>This is one of the modules of Virtual Schemas Adapters. The libraries provided by this project are the foundation of the adapter development, i.e. adapters must be implemented on top of them.</description>
   <url>https://github.com/exasol/virtual-schema-common-java</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>11</java.version>
-    <junit.version>5.4.2</junit.version>
-    <junit.platform.version>1.4.2</junit.platform.version>
-    <maven.surefire.version>3.0.0-M3</maven.surefire.version>
+    <junit.version>5.6.1</junit.version>
+    <junit.platform.version>1.6.1</junit.platform.version>
+    <maven.surefire.version>3.0.0-M4</maven.surefire.version>
     <gpg.skip>true</gpg.skip>
   </properties>
   <licenses>
@@ -67,17 +67,17 @@
     <dependency>
       <groupId>org.glassfish</groupId>
       <artifactId>javax.json</artifactId>
-      <version>1.0.4</version>
+      <version>1.1.4</version>
     </dependency>
     <dependency>
       <groupId>com.exasol</groupId>
       <artifactId>exasol-script-api</artifactId>
-      <version>6.1.0</version>
+      <version>6.1.7</version>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest</artifactId>
-      <version>2.1</version>
+      <version>2.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -107,24 +107,25 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.24.0</version>
+      <version>3.3.3</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>
-      <version>2.23.4</version>
+      <version>3.3.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.itsallcode</groupId>
       <artifactId>junit5-system-extensions</artifactId>
-      <version>1.0.3</version>
+      <version>1.1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>nl.jqno.equalsverifier</groupId>
       <artifactId>equalsverifier</artifactId>
-      <version>3.1.7</version>
+      <version>3.1.13</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -133,7 +134,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.8.1</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -142,7 +143,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.3</version>
+        <version>0.8.5</version>
         <executions>
           <execution>
             <goals>
@@ -166,7 +167,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -179,7 +180,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>attach-javadocs</id>

src/test/java/com/exasol/adapter/AbstractAdapterPropertiesTest.java

@@ -1,7 +1,7 @@
 package com.exasol.adapter;
 
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.util.*;

src/test/java/com/exasol/adapter/AdapterPropertiesTest.java

@@ -2,7 +2,7 @@
 
 import static com.exasol.adapter.AdapterProperties.*;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.lang.reflect.*;

src/test/java/com/exasol/adapter/AdapterRegistryTest.java

@@ -4,7 +4,7 @@
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.collection.IsEmptyCollection.emptyCollectionOf;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.junit.jupiter.api.AfterEach;

src/test/java/com/exasol/adapter/RequestDispatcherTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.startsWith;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;

src/test/java/com/exasol/adapter/capabilities/CapabilityAssertions.java

@@ -1,8 +1,8 @@
 package com.exasol.adapter.capabilities;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsEmptyIterable.emptyIterableOf;
 import static org.hamcrest.collection.IsIterableContainingInAnyOrder.containsInAnyOrder;
-import static org.junit.Assert.assertThat;
 
 public final class CapabilityAssertions {
     private CapabilityAssertions() {
@@ -58,5 +58,4 @@ public static void assertCapabilitesContainAllOf(final Capabilities capabilities
         assertThat("Contains aggregate function capabilities", capabilities.getAggregateFunctionCapabilities(),
                 containsInAnyOrder(expectedCapabilities));
     }
-
 }

src/test/java/com/exasol/adapter/metadata/TableMetadataTest.java

@@ -1,7 +1,7 @@
 package com.exasol.adapter.metadata;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
 
 import java.util.*;
 

src/test/java/com/exasol/adapter/request/LoggingConfigurationTest.java

@@ -3,7 +3,7 @@
 import static com.exasol.adapter.AdapterProperties.DEBUG_ADDRESS_PROPERTY;
 import static com.exasol.adapter.AdapterProperties.LOG_LEVEL_PROPERTY;
 import static org.hamcrest.Matchers.equalTo;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import java.util.HashMap;

src/test/java/com/exasol/adapter/request/parser/PushDownSqlParserTest.java

@@ -19,7 +19,7 @@
 
 import static com.exasol.adapter.sql.SqlNodeType.*;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 class PushDownSqlParserTest {

src/test/java/com/exasol/adapter/request/parser/RequestParserTest.java

@@ -1,8 +1,8 @@
 package com.exasol.adapter.request.parser;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
-import static org.junit.Assert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

src/test/java/com/exasol/adapter/request/parser/SchemaMetadataParserTest.java

@@ -1,7 +1,7 @@
 package com.exasol.adapter.request.parser;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 

src/test/java/com/exasol/logging/CompactFormatterTest.java

@@ -2,7 +2,7 @@
 
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.text.MatchesPattern.matchesPattern;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import java.util.logging.Level;

src/test/java/com/exasol/logging/RemoteLogManagerTest.java

@@ -1,7 +1,7 @@
 package com.exasol.logging;
 
 import static org.hamcrest.Matchers.matchesPattern;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.*;
 import java.net.*;

src/test/java/com/exasol/utils/JsonHelperTest.java

@@ -1,20 +1,20 @@
 package com.exasol.utils;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.mockito.Mockito.when;
+
+import javax.json.*;
+
+import org.json.JSONException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
-
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonValue;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.when;
+import org.skyscreamer.jsonassert.JSONAssert;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -55,7 +55,7 @@ void testGetKeyAsString() {
     }
 
     @Test
-    void testPrettyJson() {
-        assertThat(JsonHelper.prettyJson(this.expectedJsonObject), equalTo(JSON));
+    void testPrettyJson() throws JSONException {
+        JSONAssert.assertEquals(JSON, JsonHelper.prettyJson(this.expectedJsonObject), false);
     }
 }