From c8fcba217992e654dcfad1f10ed74720d2f3ab5e Mon Sep 17 00:00:00 2001
From: Jakub Janco <jjanco@redhat.com>
Date: Jan 29 2019 10:45:15 +0000
Subject: update to 2.4.0


---

diff --git a/.gitignore b/.gitignore
index c7197f3..18eb43b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /2.2.5.tar.gz
 /2.2.6.tar.gz
 /2.3.0.tar.gz
+/2.4.0.tar.gz
diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec
index d2241ad..3a83b40 100644
--- a/mariadb-java-client.spec
+++ b/mariadb-java-client.spec
@@ -1,5 +1,5 @@
 Name:		mariadb-java-client
-Version:	2.3.0
+Version:	2.4.0
 Release:	1%{?dist}
 Summary:	Connects applications developed in Java to MariaDB and MySQL databases
 # added BSD license because of https://bugzilla.redhat.com/show_bug.cgi?id=1291558#c13
@@ -20,6 +20,8 @@ BuildRequires:	mvn(org.apache.maven.plugins:maven-javadoc-plugin)
 BuildRequires:	mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:	mvn(org.sonatype.oss:oss-parent:pom:)
 BuildRequires:	mvn(org.codehaus.mojo:build-helper-maven-plugin)
+# Since version 2.4.0
+BuildRequires:	mvn(org.jacoco:jacoco-maven-plugin)
 # since version 1.5.2 missing optional dependency (windows)
 #BuildRequires:	mvn(com.github.dblock.waffle:waffle-jna)
 
@@ -61,7 +63,7 @@ done
 # remove missing optional dependency waffle-jna
 %pom_remove_dep com.github.waffle:waffle-jna
 # also remove the file using the removed plugin
-rm -f src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/WindowsNativeSspiAuthentication.java
+rm -f src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/WindowsNativeSspiAuthentication.java
 # patch the sources so that the missing file is not making trouble
 %patch0 -p1
 
@@ -137,6 +139,9 @@ cp target/%{name}-%{version}-tests.jar %{buildroot}/%{_jnidir}/%{name}-tests.jar
 %license LICENSE
 
 %changelog
+* Tue Jan 29 2019 Jakub Janco <jjanco@redhat.com> - 2.4.0-1
+- new version
+
 * Mon Nov 26 2018 Jakub Janco <jjanco@redhat.com> - 2.3.0-1
 - new version
 
diff --git a/remove_waffle-jna.patch b/remove_waffle-jna.patch
index a64b9da..fe35e40 100644
--- a/remove_waffle-jna.patch
+++ b/remove_waffle-jna.patch
@@ -1,17 +1,25 @@
-diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java b/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java
-index fbfd4cb5..1d54c2bd 100644
---- a/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java
-+++ b/src/main/java/org/mariadb/jdbc/internal/com/send/gssapi/GssUtility.java
-@@ -13,19 +13,6 @@ public class GssUtility {
+diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java b/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java
+index 15c61c85..7276e91e 100644
+--- a/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java
++++ b/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java
+@@ -5,25 +5,12 @@ import com.sun.jna.Platform;
+ public class GssUtility {
+ 
+   /**
+-   * Get authentication method according to classpath. Windows native authentication is using
+-   * Waffle-jna.
++   * Get authentication method according to classpath.
++   *
+    *
     * @return authentication method
     */
-   public static BiFunction<PacketInputStream, Integer, GssapiAuth> getAuthenticationMethod() {
+   public static GssapiAuth getAuthenticationMethod() {
 -    try {
 -      //Waffle-jna has jna as dependency, so if not available on classpath, just use standard authentication
 -      if (Platform.isWindows()) {
 -        try {
 -          Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl");
--          return (reader, packSeq) -> new WindowsNativeSspiAuthentication(reader, packSeq);
+-          return new WindowsNativeSspiAuthentication();
 -        } catch (ClassNotFoundException cle) {
 -          //waffle not in the classpath
 -        }
@@ -19,6 +27,6 @@ index fbfd4cb5..1d54c2bd 100644
 -    } catch (Throwable cle) {
 -      //jna jar's are not in classpath
 -    }
-     return (reader, packSeq) -> new StandardGssapiAuthentication(reader, packSeq);
+     return new StandardGssapiAuthentication();
    }
  
diff --git a/sources b/sources
index db35d36..e047d5c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (2.3.0.tar.gz) = b9408ba48dd6a5cbff98878ce85fec7891edf6f63fd1f88bccf5fbddecd36d506e46ebd9caa7c92a36e2a856022709608e0e012f20c8b1c22cf2f37dbd7f5fc7
+SHA512 (2.4.0.tar.gz) = 29f917b5779827f2daa6fc9ed0b48239aa6464572add2f80895e76eae05255e8e8ba04fc6844225c77fb5cc042528eabe2a3f87eec10ebdd876e77c39345cc28