开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 3

_service:tar_scm:mysql-connector-java.spec Changed

@@ -1,17 +1,32 @@
 Summary:             Official JDBC driver for MySQL
 Name:                mysql-connector-java
-Version:             8.0.16
+Version:             8.0.33
 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
+Source1:             https://repo.maven.apache.org/maven2/mysql/mysql-connector-java/8.0.33/mysql-connector-java-8.0.33.pom
+
+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:       maven-local apache-commons-logging
+BuildRequires:       hibernate java-devel >= 1:1.6.0 javapackages-local jta >= 1.0 
+BuildRequires:       java-17-openjdk-devel
+BuildRequires:       mvn(org.junit.jupiter:junit-jupiter-api)
+BuildRequires:       mvn(com.google.protobuf:protobuf-java)
+BuildRequires:       mvn(org.junit.platform:junit-platform-engine)
+BuildRequires:       mvn(org.apache.maven.surefire:surefire-junit-platform)
+BuildRequires:       mvn(org.hamcrest:hamcrest)
+BuildRequires:       mvn(javassist:javassist)
+BuildRequires:       mvn(org.slf4j:slf4j-api)
+BuildRequires:       mvn(com.mchange:c3p0)
+BuildRequires:       mvn(org.eclipse.aether:aether-connector-basic)
+BuildRequires:       mvn(org.eclipse.aether:aether-transport-wagon)
+BuildRequires:       mvn(org.apache.maven.wagon:wagon-http)
+BuildRequires:       mvn(org.apache.maven.wagon:wagon-provider-api)
 Requires:            jta >= 1.0 slf4j
 
 %description
@@ -23,8 +38,13 @@
 IV JDBC driver and has a complete JDBC feature set that supports the
 capabilities of MySQL.
 
+%package javadoc
+Summary:             Javadoc for mysql-connector-java
+%description javadoc
+Javadoc for mysql-connector-java
+
 %prep
-%setup -q -n mysql-connector-j-%{version}
+%autosetup -p1 -n mysql-connector-j-%{version}
 
 for file in README README.md; do
  sed -i.orig 's|\r||g' $file
@@ -32,31 +52,35 @@
  rm $file.orig
 done
 sed -i 's/>@.*</>%{version}</' src/build/misc/pom.xml
-%patch4 -p1
+cp %{SOURCE1} ./pom.xml
 
 %build
 export CLASSPATH=$(build-classpath jdbc-stdext jta junit slf4j commons-logging.jar)
 rm -rf src/main/user-impl/java/com/mysql/cj/jdbc/integration/jboss
-rm src/test/java/testsuite/regression/ConnectionRegressionTest.java
-rm src/test/java/testsuite/regression/DataSourceRegressionTest.java
-rm src/test/java/testsuite/simple/StatementsTest.java
-ant -Dcom.mysql.cj.build.jdk=%{java_home} \
-    -Dcom.mysql.cj.extra.libs=/usr/share/java \
-    test dist
+rm src/test/java/testsuite/regression/StatementRegressionTest.java
+%mvn_build -b --xmvn-javadoc
 
 %install
 %mvn_file mysql:mysql-connector-java %{name}
-%mvn_artifact src/build/misc/pom.xml build/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar
 %mvn_install
 
 %files -f .mfiles
 %doc CHANGES README README.md
 %license LICENSE
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE
+
 %changelog
-* Fri Feb 25 2022 houyingchao <houyingchao@huawei.com> - 8.0.16-1
+* Wed Jan 17 2024 Ge Wang <wang__ge@126.com> - 1:8.0.33-1
+- UPgrade to 8.0.33
+
+* 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

_service:tar_scm:remove-StatementsTest.patch Added

@@ -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

_service:tar_scm:remove-authentication-plugin.patch Added

@@ -0,0 +1,282 @@
+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              | 218 ------------------
+ .../cj/LocalizedErrorMessages.properties      |  12 -
+ 3 files changed, 232 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 b9a8ca6..3d5f145 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;
+@@ -257,7 +256,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 4fe5d32..0000000
+--- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
++++ /dev/null
+@@ -1,218 +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.Path;
+-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 configFingerprint = null;
+-    private String configKeyFile = null;
+-    private String configSecurityTokenFile = null;
+-    private RSAPrivateKey privateKey = null;
+-    private byte token = null;
+-
+-    @Override
+-    public void init(Protocol<NativePacketPayload> prot, MysqlCallbackHandler cbh) {
+-        this.protocol = prot;
+-        this.usernameCallbackHandler = cbh;
+-    }
+-
+-    @Override
+-    public void reset() {
+-        this.configFingerprint = 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;
+-        }
+-
+-        loadOciConfig();
+-        initializePrivateKey();
+-        initializeToken();
+-
+-        byte nonce = fromServer.readBytes(StringSelfDataType.STRING_EOF);
+-        byte signature = ExportControlled.sign(nonce, this.privateKey);
+-        if (signature == null) {
+-            signature = new byte0;
+-        }
+-        String payload = String.format("{\"fingerprint\":\"%s\", \"signature\":\"%s\", \"token\":\"%s\"}", this.configFingerprint,
+-                Base64.getEncoder().encodeToString(signature), new String(this.token));
+-        toServer.add(new NativePacketPayload(payload.getBytes(Charset.defaultCharset())));
+-        return true;
+-    }
+-
+-    private void loadOciConfig() {
+-        ConfigFile configFile;
+-        try {
+-            String configFilePath = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigFile.getKeyName()).getStringValue();
+-            String configProfile = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigProfile.getKeyName()).getStringValue();
+-            if (StringUtils.isNullOrEmpty(configFilePath)) {
+-                configFile = ConfigFileReader.parseDefault(configProfile);
+-            } else if (Files.exists(Paths.get(configFilePath))) {
+-                configFile = ConfigFileReader.parse(configFilePath, configProfile);
+-            } else {
+-                throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.ConfigFileNotFound"));
+-            }
+-        } catch (NoClassDefFoundError e) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciSdkNotFound"), e);
+-        } catch (IOException e) {
+-            throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileError"), e);
+-        } catch (IllegalArgumentException e) {

_service:tar_scm:remove-coverage-test.patch Deleted

@@ -1,170 +0,0 @@
-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 7572a4ce..fcce72be 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>
--
- 
-     
-     
-@@ -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>
- 
--        <local name="com.mysql.cj.testsuite.test.coverage" />
--        <condition property="com.mysql.cj.testsuite.test.coverage" value="true" else="false">
--            <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" />
--
--                <syspropertyset refid="junit.system.properties" />
--                <sysproperty key="com.mysql.cj.testsuite.url" value="${com.mysql.cj.testsuite.url}" />
--
--                <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>
--
--                <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}"
--                      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}"
--                      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>
--
-         <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
-     </target>
- 
- 
--    
--    
--    
--
--
--    <target name="test-coverage" description="Runs tests collecting coverage results." depends="-set-test-coverage-detaults, test" />
--
--
--    <target name="-set-test-coverage-detaults">
--        <condition property="com.mysql.cj.coverage.result.dir.final"
--                   value="${com.mysql.cj.coverage.result.dir}"
--                   else="${com.mysql.cj.testsuite.build.dir}/coverage">
--            <isset property="com.mysql.cj.coverage.result.dir" />
--        </condition>
--        <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>
--    </target>
--
--
--    
--    
--    
--
--
--    <target name="report-coverage"
--            depends="-extra-libs-check, -set-report-coverage-detaults, -jacoco-merge"
--            description="Merges coverage results and creates HTML coverage report.">
--        <jacoco:report>
--            <executiondata>
--                <file file="${com.mysql.cj.coverage.merge.result.final}" />
--            </executiondata>
--
--            <structure name="Connector/J classes">
--                <classfiles>
--                    <fileset dir="${com.mysql.cj.build.dir.driver}">
--                        <include name="com/mysql/cj/**" />
--                        <exclude name="com/mysql/cj/x/protobuf/**" />
--                    </fileset>
--                </classfiles>
--                <sourcefiles encoding="UTF-8">
--                    <fileset dir="${com.mysql.cj.build.dir.driver}">
--                        <include name="com/mysql/cj/**" />
--                        <exclude name="com/mysql/cj/x/protobuf/**" />
--                    </fileset>
--                </sourcefiles>
--            </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">
--        <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">
--        <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">
--            <isset property="com.mysql.cj.coverage.merge.result" />
--        </condition>
--        <condition property="com.mysql.cj.coverage.report.dir.final"
--                   value="${com.mysql.cj.coverage.report.dir}"
--                   else="${com.mysql.cj.coverage.result.dir.final}/report">
--            <isset property="com.mysql.cj.coverage.report.dir" />
--        </condition>
--    </target>
--
--
-     
-     
-     
--- 
-2.14.5
-

_service Changed

_service:tar_scm:8.0.16.tar.gz Deleted

_service:tar_scm:mysql-connector-java-8.0.33.pom Added

@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>mysql</groupId>
+  <artifactId>mysql-connector-java</artifactId>
+  <version>8.0.33</version>
+
+  <distributionManagement>
+    <relocation>
+      <groupId>com.mysql</groupId>
+      <artifactId>mysql-connector-j</artifactId>
+      <message>MySQL Connector/J artifacts moved to reverse-DNS compliant Maven 2+ coordinates.</message>
+    </relocation>
+  </distributionManagement>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <encoding>UTF-8</encoding>
+    <java.version>1.8</java.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <version>5.4.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <version>2.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-engine</artifactId>
+      <version>1.4.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.junit.platform</groupId>
+      <artifactId>junit-platform-launcher</artifactId>
+      <version>1.4.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit-platform</artifactId>
+      <version>2.22.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.18.1.GA</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <version>1.7.25</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.mchange</groupId>
+      <artifactId>c3p0</artifactId>
+      <version>0.9.5.4</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>3.19.6</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-compiler-plugin</artifactId>
+	<version>3.8.0</version>
+	<configuration>
+          <source>1.8</source>
+	  <target>1.8</target>
+	  <encoding>UTF-8</encoding>
+	</configuration>
+      </plugin>
+
+      <plugin>
+	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-surefire-plugin</artifactId>
+	<version>2.22.0</version>
+	<configuration>
+          <includes>
+            <include>**/test/java/*</include>
+	  </includes>
+	</configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.junit.platform</groupId>
+	    <artifactId>junit-platform-surefire-provider</artifactId>
+	    <version>1.3.2</version>
+	  </dependency>
+	</dependencies>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+	<configuration>
+          <sourceFileExcludes>
+	    <sourceFileExclude>**/test/java/*</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/com/mysql/cj/result/SqlTimestampValueFactoryTest.java</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/testsuite/x/devapi/BaseTableTestCase.java</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/testsuite/x/devapi/CollectionFindTest.java</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/testsuite/x/devapi/*.java</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/testsuite/regression/*.java</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/testsuite/perf/*.java</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/testsuite/simple/*.java</sourceFileExclude>
+	    <sourceFileExclude>**/test/java/com/mysql/cj/protocol/x/SyncMessageReaderTest.java</sourceFileExclude>
+	  </sourceFileExcludes>
+	</configuration>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

_service:tar_scm:mysql-connector-java-8.0.33.tar.gz Added