From 2bd120f829474dc4ac60f9067a6eeee6ff46c2b7 Mon Sep 17 00:00:00 2001
From: Zuzana Miklankova <zmiklank@redhat.com>
Date: Thu, 16 Sep 2021 12:36:13 +0200
Subject: [PATCH] rebase mysql-connector-java to v. 8.0.26

---
 mysql-connector-java.spec  |  7 +++++--
 remove-coverage-test.patch | 29 +++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index c6f637a..ff77c7e 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -1,8 +1,8 @@
 
 Summary:       Official JDBC driver for MySQL
 Name:          mysql-connector-java
-Version:       8.0.25
-Release:       4%{?dist}
+Version:       8.0.26
+Release:       1%{?dist}
 Epoch:         1
 License:       GPLv2 with exceptions
 URL:           http://dev.mysql.com/downloads/connector/j/
@@ -102,6 +102,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \
 %license LICENSE
 
 %changelog
+* Thu Sep 16 2021 Zuzana Miklankova <zmiklank@redhat.com> - 1:8.0.26-1
+- rebase to version 8.0.26
+
 * Wed Aug 18 2021 Ondrej Dubaj <odubaj@redhat.com> - 1:8.0.25-4
 - migrate to java-11
 
diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch
index db5609e..bc86b1b 100644
--- a/remove-coverage-test.patch
+++ b/remove-coverage-test.patch
@@ -3,15 +3,16 @@ From: Ondrej Dubaj <odubaj@redhat.com>
 Date: Tue, 11 May 2021 09:45:27 +0200
 Subject: [PATCH] Remove coverage test
 
+
 ---
- build.xml | 154 ------------------------------------------------------
- 1 file changed, 154 deletions(-)
+ build.xml | 158 ------------------------------------------------------
+ 1 file changed, 158 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index d1b1ab9..9c8ab7d 100644
+index 96c8a0c2..24bfc2f2 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -1266,70 +1266,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+@@ -1269,76 +1269,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
          </condition>
          <echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
  
@@ -79,10 +80,16 @@ index d1b1ab9..9c8ab7d 100644
 -            </testclasses>
 -        </junitlauncher>
 -
-         <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
-             <fileset dir="${com.mysql.cj.testsuite.junit.results}">
-                 <include name="**/TEST-*.xml" />
-@@ -1348,96 +1284,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+-        <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
+-            <fileset dir="${com.mysql.cj.testsuite.junit.results}">
+-                <include name="**/TEST-*.xml" />
+-            </fileset>
+-            <report format="frames" todir="${com.mysql.cj.testsuite.junit.results}/report" />
+-        </junitreport>
+ 
+         <!-- Don't fail the build if we're doing coverage test. -->
+         <fail message="Tests failed. Check logs and/or reports in '${com.mysql.cj.testsuite.junit.results}'.">
+@@ -1351,94 +1281,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
      </target>
  
  
@@ -91,9 +98,7 @@ index d1b1ab9..9c8ab7d 100644
 -    <!-- ********************************* -->
 -
 -
--    <target name="test-coverage"
--            description="Runs tests collecting coverage results."
--            depends="-setup-test-coverage-agent, test" />
+-    <target name="test-coverage" description="Runs tests collecting coverage results." depends="-setup-test-coverage-agent, test" />
 -
 -
 -    <target name="-set-test-coverage-defaults" depends="-extra-libs-check">
@@ -180,5 +185,5 @@ index d1b1ab9..9c8ab7d 100644
      <!-- ***** RPM/DEB PACKAGING ***** -->
      <!-- ***************************** -->
 -- 
-2.30.2
+2.31.1