Upgrade version to 8.0.30

Signed-off-by: cherry530 <707078654@qq.com>
(cherry picked from commit 057d42353a0b3a726008af7d6df768bd8283a55e)

mysql-connector-java.spec

@@ -1,17 +1,20 @@
 Summary:             Official JDBC driver for MySQL
 Name:                mysql-connector-java
-Version:             8.0.16
+Version:             8.0.30
 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
-Patch4:              remove-coverage-test.patch
+Source0:             https://github.com/mysql/mysql-connector-j/archive/%{version}/%{name}-%{version}.tar.gz
+
+Patch1:              remove-coverage-test.patch
+Patch2:              remove-authentication-plugin.patch
+Patch3:              remove-StatementsTest.patch
 
 BuildArch:           noarch
 BuildRequires:       ant >= 1.6.0 ant-contrib >= 1.0 ant-junit apache-commons-logging c3p0 git
-BuildRequires:       hibernate java-devel >= 1:1.6.0 javapackages-local jta >= 1.0 junit
-BuildRequires:       protobuf-java slf4j
+BuildRequires:       hibernate java-devel >= 1:1.6.0 javapackages-local jta >= 1.0 junit5
+BuildRequires:       protobuf-java slf4j 
 Requires:            jta >= 1.0 slf4j
 
 %description
@@ -32,7 +35,10 @@ for file in README README.md; do
  rm $file.orig
 done
 sed -i 's/>@.*</>%{version}</' src/build/misc/pom.xml
-%patch4 -p1
+	
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 export CLASSPATH=$(build-classpath jdbc-stdext jta junit slf4j commons-logging.jar)
@@ -54,9 +60,12 @@ ant -Dcom.mysql.cj.build.jdk=%{java_home} \
 %license LICENSE
 
 %changelog
-* Fri Feb 25 2022 houyingchao <houyingchao@huawei.com> - 8.0.16-1
+* Tue Sep 26 2023 xu_ping <707078654@qq.com> - 1:8.0.30-1
+- Upgrade to 8.0.30
+
+* Fri Feb 25 2022 houyingchao <houyingchao@huawei.com> - 1: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
+* Fri Jul 24 2020 leiju <leiju4@huawei.com> - 1:8.0.15-1
 - Package init

remove-StatementsTest.patch

@@ -0,0 +1,86 @@
+From b9a7a929f547d1408c42aca31603d52518f6296b Mon Sep 17 00:00:00 2001
+From: Zuzana Miklankova <zmiklank@redhat.com>
+Date: Tue, 18 Jan 2022 15:04:09 +0100
+Subject: [PATCH] patch
+ 
+---
+ .../regression/StatementRegressionTest.java   | 50 -------------------
+ 1 file changed, 50 deletions(-)
+ 
+diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java
+index b5c53e9a..89483a07 100644
+--- a/src/test/java/testsuite/regression/StatementRegressionTest.java
++++ b/src/test/java/testsuite/regression/StatementRegressionTest.java
+@@ -154,7 +154,6 @@ import com.mysql.cj.util.TimeUtil;
+ import testsuite.BaseQueryInterceptor;
+ import testsuite.BaseTestCase;
+ import testsuite.UnreliableSocketFactory;
+-import testsuite.simple.StatementsTest;
+ 
+ /**
+  * Regression tests for the Statement class
+@@ -11602,20 +11601,6 @@ public class StatementRegressionTest extends BaseTestCase {
+         }
+     }
+ 
+-    /**
+-     * Tests fix for Bug#23204652, CURSOR POSITIONING API'S DOESNOT CHECK THE VALIDITY OF RESULTSET.
+-     * 
+-     * @throws Exception
+-     * 
+-     * @see StatementsTest#testResultSetProducingQueries()
+-     */
+-    @Test
+-    public void testBug23204652() throws Exception {
+-        assertThrows(SQLException.class, "Statement\\.executeQuery\\(\\) cannot issue statements that do not produce result sets\\.", () -> {
+-            this.stmt.executeQuery("DO 1 + 2");
+-            return null;
+-        });
+-    }
+ 
+     /**
+      * Tests fix for Bug#71929 (18346501), Prefixing query with double comments cancels query DML validation.
+@@ -11643,41 +11628,6 @@ public class StatementRegressionTest extends BaseTestCase {
+         }
+     }
+ 
+-    /**
+-     * Test fix for Bug#103612 (32902019), Incorrectly identified WITH...SELECT as unsafe for read-only connections.
+-     * 
+-     * @throws Exception
+-     * 
+-     * @see StatementsTest#testReadOnlySafeStatements()
+-     */
+-    @Test
+-    public void testBug103612() throws Exception {
+-        assumeTrue(versionMeetsMinimum(8, 0, 1), "MySQL 8.0.1+ is required to run this test.");
+-
+-        createTable("testBug103612", "(id INT)");
+-        String query = "WITH cte AS (SELECT * FROM testBug103612) SELECT * FROM cte";
+-
+-        boolean useSPS = false;
+-        boolean readOnly = false;
+-        do {
+-            final String testCase = String.format("Case [SPS: %s, ReadOnly: %s]", useSPS ? "Y" : "N", readOnly ? "Y" : "N");
+-
+-            Properties props = new Properties();
+-            props.setProperty(PropertyKey.useServerPrepStmts.getKeyName(), Boolean.toString(useSPS));
+-            Connection testConn = getConnectionWithProps(props);
+-            testConn.setReadOnly(readOnly);
+-
+-            try (Statement testStmt = testConn.createStatement()) {
+-                assertTrue(testStmt.execute(query), testCase);
+-            }
+-            try (PreparedStatement testPstmt = testConn.prepareStatement(query)) {
+-                assertTrue(testPstmt.execute(), testCase);
+-            }
+-
+-            testConn.close();
+-        } while ((useSPS = !useSPS) || (readOnly = !readOnly));
+-    }
+-
+     /**
+      * Tests fix for Bug#101389 (32089018), GETWARNINGS SHOULD CHECK WARNING COUNT BEFORE SENDING SHOW.
+      * 
+-- 
+2.34.1

remove-authentication-plugin.patch

@@ -0,0 +1,234 @@
+From 47793b89300a19c5fd13b781f03dd580fc0186a6 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj@redhat.com>
+Date: Tue, 18 Jan 2022 14:58:57 +0100
+Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle dependency
+ 
+---
+ .../a/NativeAuthenticationProvider.java       |   2 -
+ .../AuthenticationOciClient.java              | 177 ------------------
+ .../cj/LocalizedErrorMessages.properties      |   6 -
+ 3 files changed, 185 deletions(-)
+ delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
+ 
+diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
+index 0d94061d..58bbf23b 100644
+--- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
++++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
+@@ -58,7 +58,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType;
+ import com.mysql.cj.protocol.a.authentication.AuthenticationFidoClient;
+ import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient;
+ import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin;
+-import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient;
+ import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin;
+ import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin;
+ import com.mysql.cj.protocol.a.authentication.MysqlNativePasswordPlugin;
+@@ -256,7 +255,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider<Nati
+         pluginsToInit.add(new MysqlOldPasswordPlugin());
+         pluginsToInit.add(new AuthenticationLdapSaslClientPlugin());
+         pluginsToInit.add(new AuthenticationKerberosClient());
+-        pluginsToInit.add(new AuthenticationOciClient());
+         pluginsToInit.add(new AuthenticationFidoClient());
+ 
+         // plugins from authenticationPluginClasses connection parameter
+diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
+deleted file mode 100644
+index 473e532f..00000000
+--- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
++++ /dev/null
+@@ -1,177 +0,0 @@
+-/*
+- * Copyright (c) 2021, 2022, Oracle and/or its affiliates.
+- *
+- * This program is free software; you can redistribute it and/or modify it under
+- * the terms of the GNU General Public License, version 2.0, as published by the
+- * Free Software Foundation.
+- *
+- * This program is also distributed with certain software (including but not
+- * limited to OpenSSL) that is licensed under separate terms, as designated in a
+- * particular file or component or in included license documentation. The
+- * authors of MySQL hereby grant you an additional permission to link the
+- * program and your derivative works with the separately licensed software that
+- * they have included with MySQL.
+- *
+- * Without limiting anything contained in the foregoing, this file, which is
+- * part of MySQL Connector/J, is also subject to the Universal FOSS Exception,
+- * version 1.0, a copy of which can be found at
+- * http://oss.oracle.com/licenses/universal-foss-exception.
+- *
+- * This program is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+- * FOR A PARTICULAR PURPOSE. See the GNU General Public License, version 2.0,
+- * for more details.
+- *
+- * You should have received a copy of the GNU General Public License along with
+- * this program; if not, write to the Free Software Foundation, Inc.,
+- * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+- */
+-
+-package com.mysql.cj.protocol.a.authentication;
+-
+-import java.io.IOException;
+-import java.nio.charset.Charset;
+-import java.nio.file.Files;
+-import java.nio.file.Paths;
+-import java.security.interfaces.RSAPrivateKey;
+-import java.util.Base64;
+-import java.util.List;
+-
+-import com.mysql.cj.Messages;
+-import com.mysql.cj.callback.MysqlCallbackHandler;
+-import com.mysql.cj.callback.UsernameCallback;
+-import com.mysql.cj.conf.PropertyKey;
+-import com.mysql.cj.exceptions.ExceptionFactory;
+-import com.mysql.cj.exceptions.RSAException;
+-import com.mysql.cj.protocol.AuthenticationPlugin;
+-import com.mysql.cj.protocol.ExportControlled;
+-import com.mysql.cj.protocol.Protocol;
+-import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType;
+-import com.mysql.cj.protocol.a.NativePacketPayload;
+-import com.mysql.cj.util.StringUtils;
+-import com.oracle.bmc.ConfigFileReader;
+-import com.oracle.bmc.ConfigFileReader.ConfigFile;
+-
+-/**
+- * MySQL 'authentication_iam_client' authentication plugin.
+- */
+-public class AuthenticationOciClient implements AuthenticationPlugin<NativePacketPayload> {
+-    public static String PLUGIN_NAME = "authentication_oci_client";
+-
+-    private String sourceOfAuthData = PLUGIN_NAME;
+-
+-    protected Protocol<NativePacketPayload> protocol = null;
+-    private MysqlCallbackHandler usernameCallbackHandler = null;
+-    private String fingerprint = null;
+-    private RSAPrivateKey privateKey = null;
+-
+-    @Override
+-    public void init(Protocol<NativePacketPayload> prot, MysqlCallbackHandler cbh) {
+-        this.protocol = prot;
+-        this.usernameCallbackHandler = cbh;
+-    }
+-
+-    @Override
+-    public void reset() {
+-        this.fingerprint = null;
+-        this.privateKey = null;
+-    }
+-
+-    @Override
+-    public void destroy() {
+-        reset();
+-        this.protocol = null;
+-        this.usernameCallbackHandler = null;
+-    }
+-
+-    @Override
+-    public String getProtocolPluginName() {
+-        return PLUGIN_NAME;
+-    }
+-
+-    @Override
+-    public boolean requiresConfidentiality() {
+-        return false;
+-    }
+-
+-    @Override
+-    public boolean isReusable() {
+-        return false;
+-    }
+-
+-    @Override
+-    public void setAuthenticationParameters(String user, String password) {
+-        if (user == null && this.usernameCallbackHandler != null) {
+-            // Fall back to system login user.
+-            this.usernameCallbackHandler.handle(new UsernameCallback(System.getProperty("user.name")));
+-        }
+-    }
+-
+-    @Override
+-    public void setSourceOfAuthData(String sourceOfAuthData) {
+-        this.sourceOfAuthData = sourceOfAuthData;
+-    }
+-
+-    @Override
+-    public boolean nextAuthenticationStep(NativePacketPayload fromServer, List<NativePacketPayload> toServer) {
+-        toServer.clear();
+-
+-        if (!this.sourceOfAuthData.equals(PLUGIN_NAME) || fromServer.getPayloadLength() == 0) {
+-            // Cannot do anything with whatever payload comes from the server, so just skip this iteration and wait for a Protocol::AuthSwitchRequest or a
+-            // Protocol::AuthNextFactor.
+-            toServer.add(new NativePacketPayload(0));
+-            return true;
+-        }
+-
+-        initializePrivateKey();
+-
+-        byte[] nonce = fromServer.readBytes(StringSelfDataType.STRING_EOF);
+-        byte[] signature = ExportControlled.sign(nonce, this.privateKey);
+-        if (signature == null) {
+-            signature = new byte[0];
+-        }
+-        String payload = String.format("{\"fingerprint\":\"%s\", \"signature\":\"%s\"}", this.fingerprint, Base64.getEncoder().encodeToString(signature));
+-        toServer.add(new NativePacketPayload(payload.getBytes(Charset.defaultCharset())));
+-        return true;
+-    }
+-
+-    private void initializePrivateKey() {
+-        if (this.privateKey != null) {
+-            // Already initialized.
+-            return;
+-        }
+-
+-        ConfigFile configFile;
+-        try {
+-            String configFilePath = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigFile.getKeyName()).getStringValue();
+-            if (StringUtils.isNullOrEmpty(configFilePath)) {
+-                configFile = ConfigFileReader.parseDefault();
+-            } else if (Files.exists(Paths.get(configFilePath))) {
+-                configFile = ConfigFileReader.parse(configFilePath);
+-            } else {
+-                throw ExceptionFactory.createException("configuration file does not exist");
+-            }
+-        } catch (NoClassDefFoundError e) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.SdkNotFound"), e);
+-        } catch (IOException e) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileError"), e);
+-        }
+-        this.fingerprint = configFile.get("fingerprint");
+-        if (StringUtils.isNullOrEmpty(this.fingerprint)) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry"));
+-        }
+-        String keyFilePath = configFile.get("key_file");
+-        if (StringUtils.isNullOrEmpty(keyFilePath)) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry"));
+-        }
+-
+-        try {
+-            String key = new String(Files.readAllBytes(Paths.get(keyFilePath)), Charset.defaultCharset());
+-            this.privateKey = ExportControlled.decodeRSAPrivateKey(key);
+-        } catch (IOException e) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotFound"), e);
+-        } catch (RSAException | IllegalArgumentException e) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotValid"), e);
+-        }
+-    }
+-}
+diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
+index e4709a75..d29cdeb3 100644
+--- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
++++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
+@@ -50,12 +50,6 @@ AuthenticationLdapSaslClientPlugin.MissingLdapServerHostname=An LDAP Server host
+ AuthenticationLdapSaslClientPlugin.FailCreateSaslClient=Failed creating a SASL client for the authentication mechanism ''{0}''.
+ AuthenticationLdapSaslClientPlugin.ErrProcessingAuthIter=Error while processing an authentication iteration for the authentication mechanism ''{0}''.
+ 
+-AuthenticationOciClientPlugin.SdkNotFound=The OCI SDK could not be found or is not installed.
+-AuthenticationOciClientPlugin.OciConfigFileError=OCI configuration file could not be read.
+-AuthenticationOciClientPlugin.OciConfigFileMissingEntry=OCI configuration file does not contain a ''fingerprint'' or ''key_file'' entry.
+-AuthenticationOciClientPlugin.PrivateKeyNotFound=Private key could not be found at location given by OCI configuration entry ''key_file''.
+-AuthenticationOciClientPlugin.PrivateKeyNotValid=OCI configuration entry ''key_file'' does not reference a valid key file.
+-
+ AuthenticationProvider.BadAuthenticationPlugin=Unable to load authentication plugin ''{0}''.
+ AuthenticationProvider.BadDefaultAuthenticationPlugin=Improper value "{0}" for property ''defaultAuthenticationPlugin''.
+ AuthenticationProvider.DefaultAuthenticationPluginIsNotListed=Default authentication plugin "{0}" is neither one of the built-in plugins nor one of the plugins listed in ''authenticationPlugins''.
+-- 
+2.35.1

remove-coverage-test.patch

@@ -1,32 +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
+From cde027a4886ac1160ac42a6e4ba1fa2d271009be Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj@redhat.com>
+Date: Thu, 28 Jul 2022 09:54:06 +0200
 Subject: [PATCH] Remove coverage test
-
+ 
 ---
- build.xml | 133 --------------------------------------------------------------
- 1 file changed, 133 deletions(-)
-
+ build.xml | 162 ------------------------------------------------------
+ 1 file changed, 162 deletions(-)
+ 
 diff --git a/build.xml b/build.xml
-index 7572a4ce..fcce72be 100644
+index 8c4e9f5d..3d13bf45 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -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>
- 
--    <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>
--
- 
-     <!-- ************************* -->
-     <!-- ***** VERIFICATIONS ***** -->
-@@ -1276,56 +1268,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
+@@ -1279,82 +1279,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,81 @@ index 7572a4ce..fcce72be 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.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>
 -
--                <syspropertyset refid="junit.system.properties" />
--                <sysproperty key="com.mysql.cj.testsuite.url" value="${com.mysql.cj.testsuite.url}" />
+-        <!-- ant 1.10.10 and above print report summaries to the console from where test counts can be retrieved. -->
+-        <antversion property="com.mysql.cj.testsuite.ant.version" atleast="1.10.10" />
 -
--                <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="-Dfile.encoding=UTF-8" />
+-                    <jvmarg value="-Xmx1024m" />
+-                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
+-                    <syspropertyset refid="junit.system.properties" />
+-                </fork>
+-                <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
+-                <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="-Dfile.encoding=UTF-8" />
+-                    <jvmarg value="-Xmx1024m" />
+-                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
+-                    <syspropertyset refid="junit.system.properties" />
+-                </fork>
+-                <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
+-                <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}" />
+-            <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="-Dfile.encoding=UTF-8" />
+-                    <jvmarg value="-Xmx1024m" />
+-                    <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
+-                    <syspropertyset refid="junit.system.properties" />
+-                </fork>
+-                <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
+-                <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
+-                <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
+-            </testclasses>
+-        </junitlauncher>
 -
--                <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>
--
-         <junitreport todir="${com.mysql.cj.testsuite.junit.results}/report">
-             <fileset dir="${com.mysql.cj.testsuite.junit.results}">
-                 <include name="**/TEST-*.xml" />
-@@ -1344,81 +1286,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 styledir="${junit.styledir}" 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}'.">
+@@ -1367,92 +1291,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
      </target>
  
  
@@ -92,10 +103,10 @@ index 7572a4ce..fcce72be 100644
 -    <!-- ********************************* -->
 -
 -
--    <target name="test-coverage" description="Runs tests collecting coverage results." depends="-set-test-coverage-detaults, test" />
+-    <target name="test-coverage" description="Runs tests collecting coverage results." depends="-setup-test-coverage-agent, test" />
 -
 -
--    <target name="-set-test-coverage-detaults">
+-    <target name="-set-test-coverage-defaults" depends="-extra-libs-check">
 -        <condition property="com.mysql.cj.coverage.result.dir.final"
 -                   value="${com.mysql.cj.coverage.result.dir}"
 -                   else="${com.mysql.cj.testsuite.build.dir}/coverage">
@@ -104,6 +115,20 @@ index 7572a4ce..fcce72be 100644
 -        <condition property="com.mysql.cj.coverage.result.name.final" value="${com.mysql.cj.coverage.result.name}" else="jacoco.exec">
 -            <isset property="com.mysql.cj.coverage.result.name" />
 -        </condition>
+-
+-        <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>
+-
+-
+-    <target name="-setup-test-coverage-agent" depends="-set-test-coverage-defaults">
+-        <jacoco:agent destfile="${com.mysql.cj.coverage.result.dir.final}/${com.mysql.cj.coverage.result.name.final}"
+-                      property="com.mysql.cj.testsuite.test.coverage.jvmarg" />
 -    </target>
 -
 -
@@ -113,7 +138,7 @@ index 7572a4ce..fcce72be 100644
 -
 -
 -    <target name="report-coverage"
--            depends="-extra-libs-check, -set-report-coverage-detaults, -jacoco-merge"
+-            depends="-set-report-coverage-defaults, -jacoco-merge"
 -            description="Merges coverage results and creates HTML coverage report.">
 -        <jacoco:report>
 -            <executiondata>
@@ -136,19 +161,18 @@ index 7572a4ce..fcce72be 100644
 -            </structure>
 -
 -            <html destdir="${com.mysql.cj.coverage.report.dir.final}" />
--
 -        </jacoco:report>
 -    </target>
 -
 -
--    <target name="-jacoco-merge" depends="-set-report-coverage-detaults" if="com.mysql.cj.coverage.merge.files">
+-    <target name="-jacoco-merge" depends="-set-report-coverage-defaults" if="com.mysql.cj.coverage.merge.files">
 -        <jacoco:merge destfile="${com.mysql.cj.coverage.merge.result.final}">
 -            <fileset dir="${com.mysql.cj.coverage.result.dir.final}" includes="${com.mysql.cj.coverage.merge.files}" />
 -        </jacoco:merge>
 -    </target>
 -
 -
--    <target name="-set-report-coverage-detaults" depends="-set-test-coverage-detaults">
+-    <target name="-set-report-coverage-defaults" depends="-set-test-coverage-defaults">
 -        <condition property="com.mysql.cj.coverage.merge.result.final"
 -                   value="${com.mysql.cj.coverage.merge.result}"
 -                   else="${com.mysql.cj.coverage.result.dir.final}/jacoco.exec">
@@ -160,11 +184,8 @@ index 7572a4ce..fcce72be 100644
 -            <isset property="com.mysql.cj.coverage.report.dir" />
 -        </condition>
 -    </target>
--
--
-     <!-- ***************************** -->
-     <!-- ***** RPM/DEB PACKAGING ***** -->
+ 
+ 
      <!-- ***************************** -->
 -- 
-2.14.5
-
+2.37.1