From e53ef2a4bf0f824f530ffce43c3fa162fa57f018 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Wed, 26 Aug 2020 08:14:25 +0200
Subject: [PATCH] Rebase do version 8.0.21

---
 .gitignore                 |   1 +
 mysql-connector-java.spec  |   9 ++-
 remove-coverage-test.patch | 126 ++++++++++++++++++-------------------
 sources                    |   2 +-
 4 files changed, 71 insertions(+), 67 deletions(-)

diff --git a/.gitignore b/.gitignore
index ef180f9..86b4c25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /mysql-connector-java-8.0.15-nojars.tar.xz
 /mysql-connector-java-8.0.16-nojars.tar.xz
 /mysql-connector-java-8.0.20-nojars.tar.xz
+/mysql-connector-java-8.0.21-nojars.tar.xz
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index 35db3ff..6b60575 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.20
-Release:       2%{?dist}
+Version:       8.0.21
+Release:       1%{?dist}
 Epoch:         1
 License:       GPLv2 with exceptions
 URL:           http://dev.mysql.com/downloads/connector/j/
@@ -43,7 +43,7 @@ BuildRequires: git
 BuildRequires: javassist
 BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: javapackages-local
-BuildRequires: junit
+BuildRequires: junit5
 BuildRequires: protobuf-java
 BuildRequires: slf4j
 BuildRequires: java-1.8.0-openjdk-devel
@@ -101,6 +101,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-1.8.0-openjdk \
 %license LICENSE
 
 %changelog
+* Tue Aug 25 2020 Ondrej Dubaj <odubaj@redhat.com> - 1:8.0.21-1
+- rebase to version 8.0.21
+
 * Fri Jun 26 2020 Ondrej Dubaj <odubaj@redhat.com> - 1:8.0.20-2
 - remove *-headless dependecny
 
diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch
index 874113e..140157d 100644
--- a/remove-coverage-test.patch
+++ b/remove-coverage-test.patch
@@ -1,32 +1,17 @@
-From 134dadce2a60a2d51d1c2e13d152ec11a419c575 Mon Sep 17 00:00:00 2001
+From b31d3c13c6eb99aa75739cd80cb9c43972320e0f Mon Sep 17 00:00:00 2001
 From: Ondrej Dubaj <odubaj@redhat.com>
-Date: Thu, 14 May 2020 13:40:39 +0200
+Date: Wed, 26 Aug 2020 08:08:39 +0200
 Subject: [PATCH] Remove coverage test
 
 ---
- build.xml | 133 ------------------------------------------------------
- 1 file changed, 133 deletions(-)
+ build.xml | 140 ------------------------------------------------------
+ 1 file changed, 140 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 83b6e2c..af374ee 100644
+index 98f00ed..fde7906 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -338,14 +338,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
-                 </not>
-             </condition>
-         </fail>
--
--        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml">
--            <classpath>
--                <fileset dir="${com.mysql.cj.extra.libs}">
--                    <include name="**/jacocoant.jar" />
--                </fileset>
--            </classpath>
--        </taskdef>
-     </target>
- 
- 
-@@ -1307,56 +1299,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+@@ -1290,72 +1290,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
          </condition>
          <echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
  
@@ -35,55 +20,71 @@ index 83b6e2c..af374ee 100644
 -            <isset property="com.mysql.cj.coverage.result.dir.final" />
 -        </condition>
 -
--        <jacoco:coverage destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"
--                         enabled="${com.mysql.cj.testsuite.test.coverage}">
--            <junit printsummary="yes"
--                   fork="on"
--                   forkmode="once"
--                   jvm="${com.mysql.cj.testsuite.jvm.java}"
--                   errorproperty="com.mysql.cj.testsuite.junit.fail"
--                   failureproperty="com.mysql.cj.testsuite.junit.fail">
--                <jvmarg value="-Xmx1024m" />
+-        <local name="com.mysql.cj.testsuite.test.coverage.jvmarg" />
+-        <jacoco:agent destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"
+-                      enabled="${com.mysql.cj.testsuite.test.coverage}"
+-                      property="com.mysql.cj.testsuite.test.coverage.jvmarg" />
 -
--                <syspropertyset refid="junit.system.properties" />
--                <sysproperty key="com.mysql.cj.testsuite.url" value="${com.mysql.cj.testsuite.url}" />
+-        <local name="com.mysql.cj.testsuite.test.coverage.jvmargfinal" />
+-        <condition property="com.mysql.cj.testsuite.test.coverage.jvmargfinal"
+-                   value="${com.mysql.cj.testsuite.test.coverage.jvmarg}"
+-                   else="-Dcoverage=disabled">
+-            <and>
+-                <isset property="com.mysql.cj.testsuite.test.coverage.jvmarg" />
+-                <not>
+-                    <equals arg1="${com.mysql.cj.testsuite.test.coverage.jvmarg}" arg2="" />
+-                </not>
+-            </and>
+-        </condition>
 -
--                <classpath>
--                    <fileset dir="${com.mysql.cj.extra.libs}">
--                        <include name="**/*.jar" />
--                        <exclude name="**/protobuf-java-2.6.0.jar" />
--                    </fileset>
--                    <pathelement location="${com.mysql.cj.build.dir.driver}" />
--                    <pathelement location="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}" />
--                    <pathelement path="${com.mysql.cj.testsuite.build.classpath}" />
--                    <pathelement path="${java.class.path}" />
--                </classpath>
+-        <junitlauncher haltOnFailure="false" printSummary="true" failureProperty="com.mysql.cj.testsuite.junit.fail">
+-            <classpath refid="com.mysql.cj.testsuite.build.classpath" />
 -
--                <formatter type="xml" />
+-            <test if="${com.mysql.cj.testsuite.test.methods.enabled}"
+-                  name="${com.mysql.cj.testsuite.test.class}"
+-                  methods="${com.mysql.cj.testsuite.test.methods}"
+-                  outputdir="${com.mysql.cj.testsuite.junit.results}">
+-                <fork>
+-                    <jvmarg value="-Xmx1024m" />
+-                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
+-                    <syspropertyset refid="junit.system.properties" />
+-                </fork>
+-                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
+-                <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
+-            </test>
 -
--                <test if="${com.mysql.cj.testsuite.test.methods.enabled}"
--                      name="${com.mysql.cj.testsuite.test.class}"
--                      methods="${com.mysql.cj.testsuite.test.methods}"
--                      todir="${com.mysql.cj.testsuite.junit.results}" />
+-            <test if="com.mysql.cj.testsuite.test.class"
+-                  unless="com.mysql.cj.testsuite.test.methods"
+-                  name="${com.mysql.cj.testsuite.test.class}"
+-                  outputdir="${com.mysql.cj.testsuite.junit.results}">
+-                <fork>
+-                    <jvmarg value="-Xmx1024m" />
+-                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
+-                    <syspropertyset refid="junit.system.properties" />
+-                </fork>
+-                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
+-                <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
+-            </test>
 -
--                <test if="com.mysql.cj.testsuite.test.class"
--                      unless="com.mysql.cj.testsuite.test.methods"
--                      name="${com.mysql.cj.testsuite.test.class}"
--                      todir="${com.mysql.cj.testsuite.junit.results}" />
--
--                <batchtest unless="com.mysql.cj.testsuite.test.class" todir="${com.mysql.cj.testsuite.junit.results}">
--                    <fileset dir="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}">
--                        <include name="**/*Test.java" />
--                        <exclude name="**/perf/*.java" />
--                    </fileset>
--                </batchtest>
--            </junit>
--        </jacoco:coverage>
+-            <testclasses unless="com.mysql.cj.testsuite.test.class" outputdir="${com.mysql.cj.testsuite.junit.results}">
+-                <fileset dir="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}">
+-                    <include name="**/*Test.class" />
+-                    <exclude name="**/perf/*.class" />
+-                </fileset>
+-                <fork>
+-                    <jvmarg value="-Xmx1024m" />
+-                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
+-                    <syspropertyset refid="junit.system.properties" />
+-                </fork>
+-                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
+-                <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
+-            </testclasses>
+-        </junitlauncher>
 -
          <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
              <fileset dir="${com.mysql.cj.testsuite.junit.results}">
                  <include name="**/TEST-*.xml" />
-@@ -1375,81 +1317,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+@@ -1374,80 +1308,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
      </target>
  
  
@@ -136,7 +137,6 @@ index 83b6e2c..af374ee 100644
 -            </structure>
 -
 -            <html destdir="${com.mysql.cj.coverage.report.dir.final}" />
--
 -        </jacoco:report>
 -    </target>
 -
@@ -166,5 +166,5 @@ index 83b6e2c..af374ee 100644
      <!-- ***** RPM/DEB PACKAGING ***** -->
      <!-- ***************************** -->
 -- 
-2.24.1
+2.26.0
 
diff --git a/sources b/sources
index fc6a088..5352649 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mysql-connector-java-8.0.20-nojars.tar.xz) = afe91a3c20ec58992b326f3a0c5da89ee3f51830082009defbe3f78d2ee4ff62eb63fca11cf86749292095d250f262f3a73026e58a0dd44141dc257dd68acfe4
+SHA512 (mysql-connector-java-8.0.21-nojars.tar.xz) = 4c0186c0e915ae0c0036defa7cd7a1b04009440458d1effc58d557d6604bdd87496238774bda3b0d93b983e3e0b5c23441c3f83349b9209d6ee6be541f191296