Upgrade to 8.0.16 version

(cherry picked from commit 7efd581bb37c73406f9312a8a283d05502b1ad8b)

java-version-detection.patch

@@ -1,25 +0,0 @@
-From 7e9856cdde756339aa184c24cdb3d6a381bb5f11 Mon Sep 17 00:00:00 2001
-From: Jakub Janco <jjanco@redhat.com>
-Date: Fri, 22 Feb 2019 11:08:05 +0100
-Subject: [PATCH] Fix version detection
-
----
- build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/build.xml b/build.xml
-index 00b2d7eb..a790ee15 100644
---- a/build.xml
-+++ b/build.xml
-@@ -362,7 +362,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
-                 <not>
-                     <and>
-                         <equals arg1="${com.mysql.cj.build.jdk.exitStatus}" arg2="0" />
--                        <contains string="${com.mysql.cj.build.jdk.version}" substring="java version &quot;1.8" casesensitive="true" />
-+                        <contains string="${com.mysql.cj.build.jdk.version}" substring="openjdk version &quot;1.8" casesensitive="true" />
-                     </and>
-                 </not>
-             </condition>
--- 
-2.14.4
-

mysql-connector-java.spec

@@ -1,12 +1,11 @@
 Summary:             Official JDBC driver for MySQL
 Name:                mysql-connector-java
-Version:             8.0.15
+Version:             8.0.16
 Release:             1
 Epoch:               1
 License:             GPLv2 with exceptions
 URL:                 http://dev.mysql.com/downloads/connector/j/
 Source0:             https://github.com/mysql/mysql-connector-j/archive/%{version}.tar.gz
-Patch3:              java-version-detection.patch
 Patch4:              remove-coverage-test.patch
 
 BuildArch:           noarch
@@ -33,7 +32,6 @@ for file in README README.md; do
  rm $file.orig
 done
 sed -i 's/>@.*</>%{version}</' src/build/misc/pom.xml
-%patch3 -p1
 %patch4 -p1
 
 %build
@@ -56,5 +54,9 @@ ant -Dcom.mysql.cj.build.jdk=%{java_home} \
 %license LICENSE
 
 %changelog
+* Fri Feb 25 2022 houyingchao <houyingchao@huawei.com> - 8.0.16-1
+- Upgrade to 8.0.16
+- Fix CVE-2019-2692
+
 * Fri Jul 24 2020 leiju <leiju4@huawei.com> - 8.0.15-1
 - Package init

remove-coverage-test.patch

@@ -1,8 +1,17 @@
+From 62f1bf44f6cee0fd97500d6f761a3e03810318df Mon Sep 17 00:00:00 2001
+From: Jakub Janco <jjanco@redhat.com>
+Date: Mon, 6 May 2019 15:05:17 +0200
+Subject: [PATCH] Remove coverage test
+
+---
+ build.xml | 133 --------------------------------------------------------------
+ 1 file changed, 133 deletions(-)
+
 diff --git a/build.xml b/build.xml
-index 03efb55f..9bf9abfe 100644
+index 7572a4ce..fcce72be 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -306,13 +306,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+@@ -303,14 +303,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
          <pathelement location="${com.mysql.cj.testsuite.build.dir}/${com.mysql.cj.build.driver.fullName}" />
      </path>
  
@@ -13,10 +22,11 @@ index 03efb55f..9bf9abfe 100644
 -            </fileset>
 -        </classpath>
 -    </taskdef>
- 
+-
  
      <!-- ************************* -->
-@@ -1182,58 +1175,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+     <!-- ***** VERIFICATIONS ***** -->
+@@ -1276,56 +1268,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
          </condition>
          <echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
  
@@ -43,9 +53,6 @@ index 03efb55f..9bf9abfe 100644
 -                        <include name="**/*.jar" />
 -                        <exclude name="**/protobuf-java-2.6.0.jar" />
 -                    </fileset>
--                    <fileset dir="${com.mysql.cj.build.dir.driver}/lib">
--                        <include name="**/*.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}" />
@@ -72,10 +79,11 @@ index 03efb55f..9bf9abfe 100644
 -                </batchtest>
 -            </junit>
 -        </jacoco:coverage>
- 
+-
          <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
              <fileset dir="${com.mysql.cj.testsuite.junit.results}">
-@@ -1253,79 +1194,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+                 <include name="**/TEST-*.xml" />
+@@ -1344,81 +1286,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
      </target>
  
  
@@ -152,6 +160,11 @@ index 03efb55f..9bf9abfe 100644
 -            <isset property="com.mysql.cj.coverage.report.dir" />
 -        </condition>
 -    </target>
- 
- 
+-
+-
      <!-- ***************************** -->
+     <!-- ***** RPM/DEB PACKAGING ***** -->
+     <!-- ***************************** -->
+-- 
+2.14.5
+