From 6a53b00e1e1a62e3db05703cd29bb2c4be1ad476 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Thu, 4 Jun 2020 17:55:21 +0200
Subject: [PATCH 1/3] Upgrade mockito to work around JPype incompatibilities

---
 mockdriver/pom.xml                                     |  4 ++--
 .../java/org/jaydebeapi/mockdriver/MockConnection.java | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mockdriver/pom.xml b/mockdriver/pom.xml
index 72cbc88..d46e418 100644
--- a/mockdriver/pom.xml
+++ b/mockdriver/pom.xml
@@ -15,8 +15,8 @@
   <dependencies>
    <dependency>
       <groupId>org.mockito</groupId>
-      <artifactId>mockito-all</artifactId>
-      <version>1.10.19</version>
+      <artifactId>mockito-core</artifactId>
+      <version>2.28.2</version>
       <!-- non-test scope on purpose -->
    </dependency>
     <dependency>
diff --git a/mockdriver/src/main/java/org/jaydebeapi/mockdriver/MockConnection.java b/mockdriver/src/main/java/org/jaydebeapi/mockdriver/MockConnection.java
index 7d8b3c2..e780772 100644
--- a/mockdriver/src/main/java/org/jaydebeapi/mockdriver/MockConnection.java
+++ b/mockdriver/src/main/java/org/jaydebeapi/mockdriver/MockConnection.java
@@ -57,7 +57,7 @@ public abstract class MockConnection implements Connection {
     PreparedStatement mockPreparedStatement = Mockito.mock(PreparedStatement.class);
     Throwable exception = createException(className, exceptionMessage);
     Mockito.when(mockPreparedStatement.execute()).thenThrow(exception);
-    Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement);
+    Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
   }
 
   public final void mockBigDecimalResult(long value, int scale) throws SQLException {
@@ -73,7 +73,7 @@ public abstract class MockConnection implements Connection {
     BigDecimal columnValue = BigDecimal.valueOf(value, scale);
     Mockito.when(mockResultSet.getObject(1)).thenReturn(columnValue);
     Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DECIMAL);
-    Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement);
+    Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
   }
 
   public final void mockDoubleDecimalResult(double value) throws SQLException {
@@ -89,7 +89,7 @@ public abstract class MockConnection implements Connection {
     Double columnValue = Double.valueOf(value);
     Mockito.when(mockResultSet.getObject(1)).thenReturn(value);
     Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DECIMAL);
-    Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement);
+    Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
   }
 
   public final void mockDateResult(int year, int month, int day) throws SQLException {
@@ -109,7 +109,7 @@ public abstract class MockConnection implements Connection {
     Date ancientDate = new Date(cal.getTime().getTime());
     Mockito.when(mockResultSet.getDate(1)).thenReturn(ancientDate);
     Mockito.when(mockMetaData.getColumnType(1)).thenReturn(Types.DATE);
-    Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement);
+    Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
   }
 
   public final void mockType(String sqlTypesName) throws SQLException {
@@ -123,7 +123,7 @@ public abstract class MockConnection implements Connection {
     Mockito.when(mockMetaData.getColumnCount()).thenReturn(1);
     int sqlTypeCode = extractTypeCodeForName(sqlTypesName);
     Mockito.when(mockMetaData.getColumnType(1)).thenReturn(sqlTypeCode);
-    Mockito.when(this.prepareStatement(Mockito.anyString())).thenReturn(mockPreparedStatement);
+    Mockito.when(this.prepareStatement(Mockito.any())).thenReturn(mockPreparedStatement);
   }
 
   public final ResultSet verifyResultSet() {

From 983f310acf412eac69ff5f9048bd9e1eb58d46b2 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Thu, 4 Jun 2020 18:04:07 +0200
Subject: [PATCH 2/3] Upgrade to the latest Mockito

---
 mockdriver/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mockdriver/pom.xml b/mockdriver/pom.xml
index d46e418..be5058a 100644
--- a/mockdriver/pom.xml
+++ b/mockdriver/pom.xml
@@ -16,7 +16,7 @@
    <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>2.28.2</version>
+      <version>3.3.3</version>
       <!-- non-test scope on purpose -->
    </dependency>
     <dependency>

From 5449ca8dab2381b2342789c6f6f5018affc0fc53 Mon Sep 17 00:00:00 2001
From: baztian <bastian.dev@gmail.com>
Date: Thu, 4 Jun 2020 23:53:42 +0200
Subject: [PATCH 3/3] Upgrade jip to be able to download new mockito versions
 containing some utf-8 chars in pom

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 5d62205..d9b32e2 100644
--- a/tox.ini
+++ b/tox.ini
@@ -22,7 +22,7 @@ deps =
   py35-newjpype: JPype1==0.7.5
   py36-newjpype: JPype1==0.7.5
   py27-newjpype: JPype1==0.7.0
-  jip==0.9.14
+  jip==0.9.15
   coverage==4.5.4
 commands =
   python --version