From bf7411e715cc8975e053e45a21d89726d9ca1b37 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Mon, 23 Mar 2020 09:09:27 +0100
Subject: [PATCH] Rebased to version 2.6.0 (#1815696)

---
 .gitignore               | 1 +
 mariadb-java-client.spec | 9 +++++----
 sources                  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3189786..8283d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /2.4.1.tar.gz
 /2.4.3.tar.gz
 /2.5.4.tar.gz
+/2.6.0.tar.gz
diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec
index b037da4..a33cfcf 100644
--- a/mariadb-java-client.spec
+++ b/mariadb-java-client.spec
@@ -1,5 +1,5 @@
 Name:		mariadb-java-client
-Version:	2.5.4
+Version:	2.6.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
@@ -54,7 +54,6 @@ done
 %pom_remove_dep com.github.waffle:waffle-jna
 %pom_remove_dep ch.qos.logback:logback-classic
 %pom_remove_dep junit:junit
-%pom_remove_dep com.zaxxer:HikariCP
 %pom_remove_dep com.amazonaws:aws-java-sdk-rds
 
 # use latest OSGi implementation
@@ -74,10 +73,9 @@ rm -f src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/Win
 %mvn_alias org.mariadb.jdbc:%{name} mariadb:mariadb-connector-java
 
 %pom_remove_plugin org.jacoco:jacoco-maven-plugin
-%pom_remove_plugin org.apache.maven.plugins:maven-checkstyle-plugin
 %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
 %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
-%pom_remove_plugin pl.project13.maven:git-commit-id-plugin
+%pom_remove_plugin com.coveo:fmt-maven-plugin
 %pom_remove_plugin -r :maven-gpg-plugin
 
 # remove preconfigured OSGi manifest file and generate OSGi manifest file
@@ -129,6 +127,9 @@ rm src/main/resources/META-INF/MANIFEST.MF
 %license LICENSE
 
 %changelog
+* Mon Mar 23 2020 Ondrej Dubaj <odubaj@redhat.com> - 2.6.0-1
+- Rebase to version 2.6.0 (#1815696)
+
 * Thu Feb 20 2020 Ondrej Dubaj <odubaj@redhat.com> - 2.5.4-1
 - Rebase to version 2.5.4 (#1752069)
 
diff --git a/sources b/sources
index f46260f..0ff2ced 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (2.5.4.tar.gz) = 0e525ac268e09ead37a66b0977305fbb308bbb6ecb9b9b256758da3298f3725d5ae66d3dd87eca4a60843c2bd0826800ed079e3cbc8ec2f1b6319ff76dff5241
+SHA512 (2.6.0.tar.gz) = 19c01295aad5bf85e7cece4d39b8d70ee702b44ee497264f75729956160f62139e5c4c0047fb06634b54d5c50b2e102bc8649e33f2146aaf1138ce04797c853f