diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 9edddea..d1526d0 100644 --- a/.gitignore +++ b/.gitignore @@ -22,5 +22,3 @@ /mysql-connector-java-8.0.26-nojars.tar.xz /mysql-connector-java-8.0.27-nojars.tar.xz /mysql-connector-java-8.0.28-nojars.tar.xz -/mysql-connector-java-8.0.29-nojars.tar.xz -/mysql-connector-java-8.0.30-nojars.tar.xz diff --git a/0004-Port-to-Java-21.patch b/0004-Port-to-Java-21.patch deleted file mode 100644 index 576594b..0000000 --- a/0004-Port-to-Java-21.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 790e9bdb1c73b3695a1bea9d0fccf91341728fc7 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Fri, 24 Jan 2025 10:09:16 +0100 -Subject: [PATCH 4/4] Port to Java 21 - ---- - build.xml | 12 +----------- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/build.xml b/build.xml -index 3d13bf4..b3437d5 100644 ---- a/build.xml -+++ b/build.xml -@@ -350,17 +350,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o - - - -- -- -- -- -- -- -- -- -- -- -- - - - --- -2.48.1 - diff --git a/changelog b/changelog deleted file mode 100644 index 28c9238..0000000 --- a/changelog +++ /dev/null @@ -1,391 +0,0 @@ -* Fri Jan 17 2025 Fedora Release Engineering - 1:8.0.30-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Thu Jul 18 2024 Fedora Release Engineering - 1:8.0.30-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1:8.0.30-6 -- Rebuilt for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 1:8.0.30-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 1:8.0.30-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 1:8.0.30-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 1:8.0.30-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 28 2022 Zuzana Miklankova - 1:8.0.30-1 -- rebase to version 8.0.30 -- build with jdk17 -- bz#2110975 - -* Fri Jul 22 2022 Fedora Release Engineering - 1:8.0.29-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 1:8.0.29-2 -- Rebuilt for Drop i686 JDKs - -* Tue Apr 26 2022 Zuzana Miklankova - 1:8.0.29-1 -- rebase to version 8.0.29 - -* Sat Feb 05 2022 Jiri Vanek - 1:8.0.28-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1:8.0.28-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 18 2022 Zuzana Miklankova - 1:8.0.28-1 -- rebase to version 8.0.28 - -* Fri Nov 12 2021 Zuzana Miklankova - 1:8.0.27-3 -- Rebuilt for protobuf 3.19.0 - -* Tue Oct 26 2021 Adrian Reber - 1:8.0.27-2 -- Rebuilt for protobuf 3.18.1 - -* Tue Oct 19 2021 Zuzana Miklankova - 1:8.0.27-1 -- rebase to version 8.0.27 - -* Thu Sep 16 2021 Zuzana Miklankova - 1:8.0.26-1 -- rebase to version 8.0.26 - -* Wed Aug 18 2021 Ondrej Dubaj - 1:8.0.25-4 -- migrate to java-11 - -* Thu Jul 22 2021 Fedora Release Engineering - 1:8.0.25-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 10 2021 Ondrej Dubaj - 1:8.0.25-1 -- rebase to version 8.0.25 - -* Tue Jan 26 2021 Fedora Release Engineering - 1:8.0.23-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jan 18 2021 Ondrej Dubaj - 1:8.0.23-1 -- rebase to version 8.0.23 - -* Sat Jan 16 12:49:04 CET 2021 Adrian Reber - 1:8.0.22-4 -- Rebuilt for protobuf 3.14 - -* Fri Jan 15 14:47:55 CET 2021 Nicolas Lécureuil - 1:8.0.22-3 -- Remove useless ant-contrib buildrequire - -* Thu Jan 14 08:31:55 CET 2021 Adrian Reber - 1:8.0.22-2 -- Rebuilt for protobuf 3.14 - -* Wed Oct 21 2020 Ondrej Dubaj - 1:8.0.22-1 -- rebase to version 8.0.22 - -* Thu Sep 24 2020 Adrian Reber - 1:8.0.21-2 -- Rebuilt for protobuf 3.13 - -* Tue Aug 25 2020 Ondrej Dubaj - 1:8.0.21-1 -- rebase to version 8.0.21 - -* Tue Jul 28 2020 Fedora Release Engineering - 1:8.0.20-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 1:8.0.20-3 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jun 26 2020 Ondrej Dubaj - 1:8.0.20-2 -- remove *-headless dependecny - -* Thu Jun 25 2020 Ondrej Dubaj - 1:8.0.20-1 -- new upstream release -- compatibility with jdk-11 - -* Sun Jun 14 2020 Adrian Reber - 1:8.0.16-7 -- Rebuilt for protobuf 3.12 - -* Thu May 07 2020 Ondrej Dubaj - 1:8.0.16-6 -- removed jta dependency - -* Wed Jan 29 2020 Fedora Release Engineering - 1:8.0.16-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Mon Oct 14 2019 Ondrej Dubaj - 1:8.0.16-4 -- removed c3p0 dependency - -* Wed Oct 02 2019 Ondrej Dubaj - 1:8.0.16-3 -- removed hibernate dependency, updated .spec file - -* Thu Jul 25 2019 Fedora Release Engineering - 1:8.0.16-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon May 06 2019 Jakub Janco - 1:8.0.16-1 -- new version - -* Fri Feb 22 2019 Jakub Janco - 1:8.0.15-1 -- new version - -* Fri Feb 01 2019 Fedora Release Engineering - 1:8.0.13-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Oct 22 2018 Jakub Janco - 1:8.0.13-1 -- Update to 8.0.13 - -* Tue Aug 07 2018 Jakub Janco - 1:8.0.12-1 -- new version - -* Fri Jul 13 2018 Fedora Release Engineering - 1:5.1.38-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Feb 08 2018 Fedora Release Engineering - 1:5.1.38-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1:5.1.38-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1:5.1.38-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 1:5.1.38-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Dec 08 2015 gil cattaneo 1:5.1.38-2 -- fix jdbc-4.1 patch - -* Tue Dec 08 2015 gil cattaneo 1:5.1.38-1 -- update to 5.1.38 -- use upstream git tarball - -* Fri Oct 16 2015 gil cattaneo 1:5.1.37-1 -- update to 5.1.37 - -* Thu Jun 25 2015 Jakub Dorňák - 1:5.1.36-1 -- Rebase to version 5.1.36 - Resolves rhbz#1061093 - -* Sat Jun 20 2015 gil cattaneo 1:5.1.28-6 -- Fix FTBFS: rhbz#1106256 -- adapt to current guideline - -* Wed Jun 17 2015 Fedora Release Engineering - 1:5.1.28-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1:5.1.28-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Wed Apr 23 2014 Mikolaj Izdebski - 1:5.1.28-3 -- Add explicit requires on java-headless -- Resolves: rhbz#1068431 - -* Fri Mar 28 2014 Michael Simacek - 1:5.1.28-2 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Jan 23 2014 Jakub Dorňák - 1:5.1.28-1 -- Update to 5.1.28 -- fix generate-tarball.sh to also remove .zip files - Resolves: #1049223 - -* Mon Nov 4 2013 Honza Horak - 1:5.1.26-3 -- Remove unnecessary buildroot erase - -* Thu Oct 24 2013 Honza Horak - 1:5.1.26-2 -- Clean-up of the spec file, including gcj support -- Remove jar files from the tar ball - -* Wed Oct 23 2013 Honza Horak - 1:5.1.26-1 -- Update to 5.1.26 -- Remove versioned jars - Resolves: #1022144 - -* Mon Aug 12 2013 Alexander Kurtakov 1:5.1.25-3 -- Fix FTBFS. - -* Sat Aug 03 2013 Fedora Release Engineering - 1:5.1.25-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Jun 25 2013 Honza Horak - 1:5.1.25-1 -- Update to 5.1.25 - -* Mon Apr 8 2013 Honza Horak - 1:5.1.24-1 -- Update to 5.1.24 - -* Thu Feb 14 2013 Fedora Release Engineering - 1:5.1.22-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Sep 11 2012 Miloš Jakubíček - 1:5.1.22-1 -- Update to 5.1.22 - -* Fri Jul 20 2012 Fedora Release Engineering - 1:5.1.21-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Jul 10 2012 Miloš Jakubíček - 1:5.1.21-2 -- More fuzz for mysql-connector-java-jdbc-4.1.patch - -* Tue Jul 10 2012 Miloš Jakubíček - 1:5.1.21-1 -- Update to 5.1.21 - -* Sat May 5 2012 Tom Lane 1:5.1.17-5 -- Switch to noarch (non-GCJ) build -Resolves: #688937, #819139 -- Fix mysql-connector-java-jdbc-4.1.patch to cover both driver classes -Related: #816696 - -* Wed Jan 25 2012 Deepak Bhole - 1:5.1.17-4 -- Removed java-1.6.0-openjdk-devel requirement - -* Wed Jan 25 2012 Deepak Bhole - 1:5.1.17-3 -- Added patch to support build with JDBC 4.1/Java 7 - -* Fri Jan 13 2012 Fedora Release Engineering - 1:5.1.17-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Aug 20 2011 Miloš Jakubíček - 1:5.1.17-1 -- Update to 5.1.17 - -* Thu Feb 10 2011 Miloš Jakubíček - 1:5.1.15-1 -- Update to 5.1.15, fix BZ#676464, changed BR: log4j to BR: slf4j - -* Tue Feb 08 2011 Fedora Release Engineering - 1:5.1.14-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 18 2011 Milos Jakubicek - 1:5.1.14-1 -- Update to 5.1.14 - -* Fri Feb 19 2010 Milos Jakubicek - 1:5.1.12-1 -- Update to 5.1.12 - -* Fri Jan 29 2010 Milos Jakubicek 1:5.1.11-1 -- Update to 5.1.11 - -* Thu Jan 21 2010 Tom Lane 1:5.1.8-3 -- Clean up rpmlint complaints (/usr/lib/ references, old provides/obsoletes, - tab usage) - -* Fri Dec 4 2009 Mary Ellen Foster - 1:5.1.8-2 -- Add Maven POM and depmap fragment - -* Wed Aug 26 2009 Milos Jakubicek - 1:5.1.8-1 -- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled. -- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging -- Minor spec file updates: %%global instead of %%define, tabs instead of spaces -- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch - -* Sat Jul 25 2009 Fedora Release Engineering - 1:3.1.12-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 1:3.1.12-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Mon Aug 11 2008 Tom "spot" Callaway 1:3.1.12-6 -- fix license tag - -* Fri Apr 04 2008 Andrew Overholt 1:3.1.12-5 -- Rebuild for rhbz #234286. - -* Tue Feb 19 2008 Fedora Release Engineering - 1:3.1.12-4 -- Autorebuild for GCC 4.3 - -* Thu Oct 05 2006 Christian Iseli 1:3.1.12-3 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Igor Foox 1:3.1.12-2 -- Remove jpp string from release. - -* Fri Sep 08 2006 Igor Foox 1:3.1.12-1jpp_5fc -- Add dist tag. - -* Thu Sep 07 2006 Igor Foox 1:3.1.12-1jpp_4fc -- Fix indentation of preamble. -- Fix version and epoch of jta Requires. -- Fix Group from Development/Libraries to System Environment/Libraries. - -* Wed Sep 06 2006 Igor Foox 1:3.1.12-1jpp_3fc -- Remove duplicate readme files. -- Remove binary jars from distributed tarball, since they have no source - attached to them, and are in violation of the LGPL. -- Change jta BR to 1.0 from 1.0.1 since geronimo-specs-compat is 1.0. -- Remove unneccessary 0 epoch from BRs. - -* Thu Jul 20 2006 Igor Foox 1:3.1.12-1jpp_2fc -- Fix line endings. -- Change Group to standard Development/Java. - -* Thu Jun 1 2006 Igor Foox 1:3.1.12-1jpp_1fc -- Natively compile -- Add mysql-connector-java-noSunAppletSecurity.patch to take out references -to sun classes -- Change BuildRoot to what Extras expects - -* Thu Feb 2 2006 Jason Corley 1:3.1.12-1jpp -- 3.1.12 -- add some more docs from the tarball -- correct url -- remove vendor and distribution, should be defined in ~/.rpmmacros instead - -* Sat May 14 2005 Jason Corley 1:3.1.8-0.a.1jpp -- 3.1.8a - -* Sun Feb 13 2005 Jason Corley 1:3.1.6-1jpp -- Update to 3.1.6 now that it's considered stable - -* Sat Feb 12 2005 Jason Corley 1:3.0.16-1jpp -- Update to 3.0.16 - -* Mon Aug 23 2004 Fernando Nasser 1:3.0.14-1jpp -- Update to 3.0.14 -- Rebuilt with Ant 1.6.2 - -* Wed Mar 24 2004 Kaj J. Niemi 1:3.0.11-1jpp -- Bumped epoch, back to a "stable" release - -* Fri Mar 19 2004 Kaj J. Niemi 0:3.1.1-1jpp -- 3.1.1, supports stored procedures and SAVEPOINTs among other things. -- Tidy .spec file: nicer description and don't own %%{_javadir} - -* Wed Jan 21 2004 David Walluck 0:3.0.10-1jpp -- 3.0.10 -- change group - -* Sun Oct 05 2003 Henri Gomez 0:3.0.9-1jpp -- mysql-connector-j 3.0.9 - -* Mon Jul 07 2003 Henri Gomez 3.0.8.2jpp -- mysql-connector-j 3.0.8 -- jar goes back in /usr/share/java - -* Sun May 11 2003 David Walluck 0:3.0.6-2jpp -- update for JPackage 1.5 - -* Tue Mar 25 2003 Nicolas Mailhot 3.0.6-1jpp -- For jpackage-utils 1.5 -- New project name -- Requires java >= 1.4.1 - -* Thu Jun 06 2002 Henri Gomez 2.0.14.1jpp -- mm.mysql 2.0.14 - -* Tue May 07 2002 Henri Gomez 2.0.13.1jpp -- mm.mysql 2.0.13 - -* Tue Mar 26 2002 Henri Gomez 2.0.11.2jpp -- correct changelog - -* Mon Feb 04 2002 Henri Gomez -- mm.mysql 2.0.11 - -* Thu Jan 17 2002 Henri Gomez -- mm.mysql 2.0.8 -- seriously patch build.xml to make it compile on Linux boxes - with both JDK 1.2/1.3 and 1.1 -- added javadoc generation to build.xml -- changed manual to javadoc package - -* Tue Feb 06 2001 Henri Gomez -- mm.mysql 2.0.4 -- Fixes to getDecimal to fix decimal place wrong bug - -* Mon Jan 15 2001 Henri Gomez -- Initial release mm.mysql 2.0.3 -- detect jdbc-2.0 extension jar (javax.sql) and if present - also build MysqlDataSource and MysqlDataSourceFactory -- build with IBM JDK 1.3.0 (cx130-20001114) and jikes 1.12 -- build CLASSPATH=/usr/share/java/jdbc2_0-stdext.jar diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh index 8743ff5..749d727 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -1,25 +1,24 @@ -#!/bin/bash +#!/bin/sh -set -e +VERSION=$1 -name="$(sed -n '/^Name:/{s///;s/^\s*//;p;q}' *.spec)" -version="$(sed -n '/^Version:/{s///;s/^\s*//;p;q}' *.spec)" +if [ -z "$VERSION" ]; then + echo >&2 "Usage:" + echo >&2 " $0 " + exit 1 +fi -# RETRIEVE -curl -L "https://github.com/mysql/mysql-connector-j/archive/${version}.tar.gz" -o "${name}-${version}.orig.tar.gz" +rm -rf mysql-connector-j-$VERSION +wget https://github.com/mysql/mysql-connector-j/archive/$VERSION.tar.gz +tar xfz $VERSION.tar.gz || exit 1 -rm -rf tarball-tmp -mkdir tarball-tmp -pushd tarball-tmp -tar -xf "../${name}-${version}.orig.tar.gz" -mv * "${name}-${version}" +find mysql-connector-j-$VERSION -name "*.class" -print -delete +find mysql-connector-j-$VERSION -name '*.jar' -print -delete +find mysql-connector-j-$VERSION -name '*.zip' -print -delete -# CLEAN -find -name '*.jar' -print -delete -find -name '*.class' -print -delete -find -name '*.zip' -print -delete +tar cfJ mysql-connector-java-$VERSION-nojars.tar.xz mysql-connector-j-$VERSION || exit 1 -tar -c * | zstd -10 -f -o "../${name}-${version}.tar.zst" +rm -rf mysql-connector-j-$VERSION $VERSION.tar.gz + +exit 0 -popd -rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/java-11-migration.patch b/java-11-migration.patch new file mode 100644 index 0000000..5af5777 --- /dev/null +++ b/java-11-migration.patch @@ -0,0 +1,67 @@ +diff --git a/build.xml b/build.xml +index 9c8ab7d..040318c 100644 +--- a/build.xml ++++ b/build.xml +@@ -97,7 +97,7 @@ com.mysql.cj.extra.libs=<full_path_to_connector-j-jardeps> + # - Must point to JDK home directory. + # - Also used for testing if 'com.mysql.cj.testsuite.jvm' is not provided. + # - Mandatory. +-com.mysql.cj.build.jdk=<full_path_to_jdk1.8> ++com.mysql.cj.build.jdk=<full_path_to_jdk11> + + # Single JVM/MySQL tests: + # - Must point to JDK or JRE home directory. +@@ -259,7 +259,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o + + + +- ++ + + + +@@ -352,12 +352,12 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o + + + +- ++ + + + + +- ++ + + + +@@ -385,7 +385,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o + + + +- ++ + + + +diff --git a/src/build/misc/rpm.spec.in b/src/build/misc/rpm.spec.in +index d2926bb..9cf507b 100644 +--- a/src/build/misc/rpm.spec.in ++++ b/src/build/misc/rpm.spec.in +@@ -84,13 +84,13 @@ BuildRequires: ant + %endif + + %if 0%{!?with_java:1} +-BuildRequires: java-devel >= 1:1.8.0 ++BuildRequires: java-devel >= 1:11 + %endif + + %if 0%{?sles12:1} || 0%{?sles15:1} +-Requires: java-headless >= 1.8.0 ++Requires: java-headless >= 11 + %else +-Requires: java-headless >= 1:1.8.0 ++Requires: java-headless >= 1:11 + %endif + + %description diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 74bd3fb..ecd997f 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,27 +1,57 @@ -Name: mysql-connector-java -Epoch: 1 -Version: 8.0.30 -Release: %autorelease -Summary: Official JDBC driver for MySQL -License: GPL-2.0-only -URL: https://dev.mysql.com/downloads/connector/j/ -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -# Generated with generate-tarball.sh -Source0: %{name}-%{version}-nojars.tar.xz -Source1: generate-tarball.sh +Summary: Official JDBC driver for MySQL +Name: mysql-connector-java +Version: 8.0.28 +Release: 1%{?dist} +Epoch: 1 +License: GPLv2 with exceptions +URL: http://dev.mysql.com/downloads/connector/j/ +Source0: %{name}-%{version}-nojars.tar.xz -Patch: 0001-Remove-coverage-test.patch -Patch: 0002-Remove-authentication-plugin.patch -Patch: 0003-Remove-StatementsTest.patch -Patch: 0004-Port-to-Java-21.patch +# Mysql has a mirror redirector for its downloads +# You can get this tarball by following a link from: +# http://dev.mysql.com/get/Downloads/Connector-J/%%{name}-%%{version}.tar.gz +# +# OR +# https://github.com/mysql/mysql-connector-j/archive/%%{version}.tar.gz +# Following prebuilt jars and sources have been removed from the tarball: +# +# %%{name}-%%{version}-bin.jar +# lib/c3p0-0.9.1-pre6.jar +# lib/c3p0-0.9.1-pre6.src.zip +# lib/jboss-common-jdbc-wrapper.jar +# lib/jboss-common-jdbc-wrapper-src.jar +# lib/protobuf-java-3.6.1.jar +# lib/slf4j-api-1.6.1.jar +# +# See http://bugs.mysql.com/bug.php?id=28512 for details. -BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant-junit5 -BuildRequires: javassist -BuildRequires: protobuf-java -BuildRequires: slf4j +# To make it easier a script generate-tarball.sh has been created: +# ./generate-tarball.sh version +# will create a new tarball compressed with xz and without those jar files. +Source1: generate-tarball.sh + +Patch1: remove-coverage-test.patch +Patch2: java-11-migration.patch +Patch3: remove-authentication-plugin.patch +Patch4: remove-StatementsTest.patch + +BuildArch: noarch + +BuildRequires: ant >= 1.6.0 +BuildRequires: ant-junit +BuildRequires: apache-commons-logging +BuildRequires: git +BuildRequires: javassist +BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: javapackages-local +BuildRequires: junit5 +BuildRequires: protobuf-java +BuildRequires: slf4j +BuildRequires: java-11-openjdk-devel + +Requires: slf4j +Requires: java %description MySQL Connector/J is a native Java driver that converts JDBC (Java Database @@ -33,10 +63,26 @@ IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. %prep -%autosetup -p1 -C +%setup -q -n mysql-connector-j-%{version} -# xmlstarlet ed -L -N pom="http://maven.apache.org/POM/4.0.0" -u "/project/version" -v "8.0.33" src/build/misc/pom.xml -%pom_xpath_set 'pom:project/pom:version' %{version} src/build/misc/pom.xml +# fix line endings +for file in README README.md; do + sed -i.orig 's|\r||g' $file + touch -r $file.orig $file + rm $file.orig +done + +sed -i 's/>@.*%{version} - 1:8.0.28-1 +- rebase to version 8.0.28 + +* Tue Oct 19 2021 Zuzana Miklankova - 1:8.0.27-1 +- rebase to version 8.0.27 + +* Thu Sep 16 2021 Zuzana Miklankova - 1:8.0.26-1 +- rebase to version 8.0.26 + +* Wed Aug 18 2021 Ondrej Dubaj - 1:8.0.25-4 +- migrate to java-11 + +* Thu Jul 22 2021 Fedora Release Engineering - 1:8.0.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 10 2021 Ondrej Dubaj - 1:8.0.25-1 +- rebase to version 8.0.25 + +* Tue Jan 26 2021 Fedora Release Engineering - 1:8.0.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 18 2021 Ondrej Dubaj - 1:8.0.23-1 +- rebase to version 8.0.23 + +* Sat Jan 16 12:49:04 CET 2021 Adrian Reber - 1:8.0.22-4 +- Rebuilt for protobuf 3.14 + +* Fri Jan 15 14:47:55 CET 2021 Nicolas Lécureuil - 1:8.0.22-3 +- Remove useless ant-contrib buildrequire + +* Thu Jan 14 08:31:55 CET 2021 Adrian Reber - 1:8.0.22-2 +- Rebuilt for protobuf 3.14 + +* Wed Oct 21 2020 Ondrej Dubaj - 1:8.0.22-1 +- rebase to version 8.0.22 + +* Thu Sep 24 2020 Adrian Reber - 1:8.0.21-2 +- Rebuilt for protobuf 3.13 + +* Tue Aug 25 2020 Ondrej Dubaj - 1:8.0.21-1 +- rebase to version 8.0.21 + +* Tue Jul 28 2020 Fedora Release Engineering - 1:8.0.20-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 1:8.0.20-3 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Fri Jun 26 2020 Ondrej Dubaj - 1:8.0.20-2 +- remove *-headless dependecny + +* Thu Jun 25 2020 Ondrej Dubaj - 1:8.0.20-1 +- new upstream release +- compatibility with jdk-11 + +* Sun Jun 14 2020 Adrian Reber - 1:8.0.16-7 +- Rebuilt for protobuf 3.12 + +* Thu May 07 2020 Ondrej Dubaj - 1:8.0.16-6 +- removed jta dependency + +* Wed Jan 29 2020 Fedora Release Engineering - 1:8.0.16-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Oct 14 2019 Ondrej Dubaj - 1:8.0.16-4 +- removed c3p0 dependency + +* Wed Oct 02 2019 Ondrej Dubaj - 1:8.0.16-3 +- removed hibernate dependency, updated .spec file + +* Thu Jul 25 2019 Fedora Release Engineering - 1:8.0.16-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon May 06 2019 Jakub Janco - 1:8.0.16-1 +- new version + +* Fri Feb 22 2019 Jakub Janco - 1:8.0.15-1 +- new version + +* Fri Feb 01 2019 Fedora Release Engineering - 1:8.0.13-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Oct 22 2018 Jakub Janco - 1:8.0.13-1 +- Update to 8.0.13 + +* Tue Aug 07 2018 Jakub Janco - 1:8.0.12-1 +- new version + +* Fri Jul 13 2018 Fedora Release Engineering - 1:5.1.38-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Feb 08 2018 Fedora Release Engineering - 1:5.1.38-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1:5.1.38-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1:5.1.38-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Feb 04 2016 Fedora Release Engineering - 1:5.1.38-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Dec 08 2015 gil cattaneo 1:5.1.38-2 +- fix jdbc-4.1 patch + +* Tue Dec 08 2015 gil cattaneo 1:5.1.38-1 +- update to 5.1.38 +- use upstream git tarball + +* Fri Oct 16 2015 gil cattaneo 1:5.1.37-1 +- update to 5.1.37 + +* Thu Jun 25 2015 Jakub Dorňák - 1:5.1.36-1 +- Rebase to version 5.1.36 + Resolves rhbz#1061093 + +* Sat Jun 20 2015 gil cattaneo 1:5.1.28-6 +- Fix FTBFS: rhbz#1106256 +- adapt to current guideline + +* Wed Jun 17 2015 Fedora Release Engineering - 1:5.1.28-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1:5.1.28-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Apr 23 2014 Mikolaj Izdebski - 1:5.1.28-3 +- Add explicit requires on java-headless +- Resolves: rhbz#1068431 + +* Fri Mar 28 2014 Michael Simacek - 1:5.1.28-2 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Jan 23 2014 Jakub Dorňák - 1:5.1.28-1 +- Update to 5.1.28 +- fix generate-tarball.sh to also remove .zip files + Resolves: #1049223 + +* Mon Nov 4 2013 Honza Horak - 1:5.1.26-3 +- Remove unnecessary buildroot erase + +* Thu Oct 24 2013 Honza Horak - 1:5.1.26-2 +- Clean-up of the spec file, including gcj support +- Remove jar files from the tar ball + +* Wed Oct 23 2013 Honza Horak - 1:5.1.26-1 +- Update to 5.1.26 +- Remove versioned jars + Resolves: #1022144 + +* Mon Aug 12 2013 Alexander Kurtakov 1:5.1.25-3 +- Fix FTBFS. + +* Sat Aug 03 2013 Fedora Release Engineering - 1:5.1.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Jun 25 2013 Honza Horak - 1:5.1.25-1 +- Update to 5.1.25 + +* Mon Apr 8 2013 Honza Horak - 1:5.1.24-1 +- Update to 5.1.24 + +* Thu Feb 14 2013 Fedora Release Engineering - 1:5.1.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Sep 11 2012 Miloš Jakubíček - 1:5.1.22-1 +- Update to 5.1.22 + +* Fri Jul 20 2012 Fedora Release Engineering - 1:5.1.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Jul 10 2012 Miloš Jakubíček - 1:5.1.21-2 +- More fuzz for mysql-connector-java-jdbc-4.1.patch + +* Tue Jul 10 2012 Miloš Jakubíček - 1:5.1.21-1 +- Update to 5.1.21 + +* Sat May 5 2012 Tom Lane 1:5.1.17-5 +- Switch to noarch (non-GCJ) build +Resolves: #688937, #819139 +- Fix mysql-connector-java-jdbc-4.1.patch to cover both driver classes +Related: #816696 + +* Wed Jan 25 2012 Deepak Bhole - 1:5.1.17-4 +- Removed java-1.6.0-openjdk-devel requirement + +* Wed Jan 25 2012 Deepak Bhole - 1:5.1.17-3 +- Added patch to support build with JDBC 4.1/Java 7 + +* Fri Jan 13 2012 Fedora Release Engineering - 1:5.1.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Sat Aug 20 2011 Miloš Jakubíček - 1:5.1.17-1 +- Update to 5.1.17 + +* Thu Feb 10 2011 Miloš Jakubíček - 1:5.1.15-1 +- Update to 5.1.15, fix BZ#676464, changed BR: log4j to BR: slf4j + +* Tue Feb 08 2011 Fedora Release Engineering - 1:5.1.14-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 18 2011 Milos Jakubicek - 1:5.1.14-1 +- Update to 5.1.14 + +* Fri Feb 19 2010 Milos Jakubicek - 1:5.1.12-1 +- Update to 5.1.12 + +* Fri Jan 29 2010 Milos Jakubicek 1:5.1.11-1 +- Update to 5.1.11 + +* Thu Jan 21 2010 Tom Lane 1:5.1.8-3 +- Clean up rpmlint complaints (/usr/lib/ references, old provides/obsoletes, + tab usage) + +* Fri Dec 4 2009 Mary Ellen Foster - 1:5.1.8-2 +- Add Maven POM and depmap fragment + +* Wed Aug 26 2009 Milos Jakubicek - 1:5.1.8-1 +- Update to 5.1.8 (resolves BZ#480154) with jboss integration disabled. +- Added BR: java-1.6.0-openjdk-devel, java-1.5.0-gcj-devel, jakarta-commons-logging +- Minor spec file updates: %%global instead of %%define, tabs instead of spaces +- Dropped unnecessary patch-build.xml and mysql-connector-java-noSunAppletSecurity.patch + +* Sat Jul 25 2009 Fedora Release Engineering - 1:3.1.12-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Wed Feb 25 2009 Fedora Release Engineering - 1:3.1.12-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Mon Aug 11 2008 Tom "spot" Callaway 1:3.1.12-6 +- fix license tag + +* Fri Apr 04 2008 Andrew Overholt 1:3.1.12-5 +- Rebuild for rhbz #234286. + +* Tue Feb 19 2008 Fedora Release Engineering - 1:3.1.12-4 +- Autorebuild for GCC 4.3 + +* Thu Oct 05 2006 Christian Iseli 1:3.1.12-3 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Igor Foox 1:3.1.12-2 +- Remove jpp string from release. + +* Fri Sep 08 2006 Igor Foox 1:3.1.12-1jpp_5fc +- Add dist tag. + +* Thu Sep 07 2006 Igor Foox 1:3.1.12-1jpp_4fc +- Fix indentation of preamble. +- Fix version and epoch of jta Requires. +- Fix Group from Development/Libraries to System Environment/Libraries. + +* Wed Sep 06 2006 Igor Foox 1:3.1.12-1jpp_3fc +- Remove duplicate readme files. +- Remove binary jars from distributed tarball, since they have no source + attached to them, and are in violation of the LGPL. +- Change jta BR to 1.0 from 1.0.1 since geronimo-specs-compat is 1.0. +- Remove unneccessary 0 epoch from BRs. + +* Thu Jul 20 2006 Igor Foox 1:3.1.12-1jpp_2fc +- Fix line endings. +- Change Group to standard Development/Java. + +* Thu Jun 1 2006 Igor Foox 1:3.1.12-1jpp_1fc +- Natively compile +- Add mysql-connector-java-noSunAppletSecurity.patch to take out references +to sun classes +- Change BuildRoot to what Extras expects + +* Thu Feb 2 2006 Jason Corley 1:3.1.12-1jpp +- 3.1.12 +- add some more docs from the tarball +- correct url +- remove vendor and distribution, should be defined in ~/.rpmmacros instead + +* Sat May 14 2005 Jason Corley 1:3.1.8-0.a.1jpp +- 3.1.8a + +* Sun Feb 13 2005 Jason Corley 1:3.1.6-1jpp +- Update to 3.1.6 now that it's considered stable + +* Sat Feb 12 2005 Jason Corley 1:3.0.16-1jpp +- Update to 3.0.16 + +* Mon Aug 23 2004 Fernando Nasser 1:3.0.14-1jpp +- Update to 3.0.14 +- Rebuilt with Ant 1.6.2 + +* Wed Mar 24 2004 Kaj J. Niemi 1:3.0.11-1jpp +- Bumped epoch, back to a "stable" release + +* Fri Mar 19 2004 Kaj J. Niemi 0:3.1.1-1jpp +- 3.1.1, supports stored procedures and SAVEPOINTs among other things. +- Tidy .spec file: nicer description and don't own %%{_javadir} + +* Wed Jan 21 2004 David Walluck 0:3.0.10-1jpp +- 3.0.10 +- change group + +* Sun Oct 05 2003 Henri Gomez 0:3.0.9-1jpp +- mysql-connector-j 3.0.9 + +* Mon Jul 07 2003 Henri Gomez 3.0.8.2jpp +- mysql-connector-j 3.0.8 +- jar goes back in /usr/share/java + +* Sun May 11 2003 David Walluck 0:3.0.6-2jpp +- update for JPackage 1.5 + +* Tue Mar 25 2003 Nicolas Mailhot 3.0.6-1jpp +- For jpackage-utils 1.5 +- New project name +- Requires java >= 1.4.1 + +* Thu Jun 06 2002 Henri Gomez 2.0.14.1jpp +- mm.mysql 2.0.14 + +* Tue May 07 2002 Henri Gomez 2.0.13.1jpp +- mm.mysql 2.0.13 + +* Tue Mar 26 2002 Henri Gomez 2.0.11.2jpp +- correct changelog + +* Mon Feb 04 2002 Henri Gomez +- mm.mysql 2.0.11 + +* Thu Jan 17 2002 Henri Gomez +- mm.mysql 2.0.8 +- seriously patch build.xml to make it compile on Linux boxes + with both JDK 1.2/1.3 and 1.1 +- added javadoc generation to build.xml +- changed manual to javadoc package + +* Tue Feb 06 2001 Henri Gomez +- mm.mysql 2.0.4 +- Fixes to getDecimal to fix decimal place wrong bug + +* Mon Jan 15 2001 Henri Gomez +- Initial release mm.mysql 2.0.3 +- detect jdbc-2.0 extension jar (javax.sql) and if present + also build MysqlDataSource and MysqlDataSourceFactory +- build with IBM JDK 1.3.0 (cx130-20001114) and jikes 1.12 +- build CLASSPATH=/usr/share/java/jdbc2_0-stdext.jar diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index 36643ec..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,9 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: main -execute: - how: tmt -context: - jpv_flavor: generic diff --git a/0003-Remove-StatementsTest.patch b/remove-StatementsTest.patch similarity index 93% rename from 0003-Remove-StatementsTest.patch rename to remove-StatementsTest.patch index 201a330..4f5c65f 100644 --- a/0003-Remove-StatementsTest.patch +++ b/remove-StatementsTest.patch @@ -8,10 +8,10 @@ Subject: [PATCH] patch 1 file changed, 50 deletions(-) diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java -index 7e5a5f8..8e77de5 100644 +index b5c53e9a..89483a07 100644 --- a/src/test/java/testsuite/regression/StatementRegressionTest.java +++ b/src/test/java/testsuite/regression/StatementRegressionTest.java -@@ -156,7 +156,6 @@ import com.mysql.cj.util.TimeUtil; +@@ -154,7 +154,6 @@ import com.mysql.cj.util.TimeUtil; import testsuite.BaseQueryInterceptor; import testsuite.BaseTestCase; import testsuite.UnreliableSocketFactory; @@ -19,7 +19,7 @@ index 7e5a5f8..8e77de5 100644 /** * Regression tests for the Statement class -@@ -11607,20 +11606,6 @@ public class StatementRegressionTest extends BaseTestCase { +@@ -11602,20 +11601,6 @@ public class StatementRegressionTest extends BaseTestCase { } } @@ -40,7 +40,7 @@ index 7e5a5f8..8e77de5 100644 /** * Tests fix for Bug#71929 (18346501), Prefixing query with double comments cancels query DML validation. -@@ -11648,41 +11633,6 @@ public class StatementRegressionTest extends BaseTestCase { +@@ -11643,41 +11628,6 @@ public class StatementRegressionTest extends BaseTestCase { } } @@ -83,5 +83,5 @@ index 7e5a5f8..8e77de5 100644 * Tests fix for Bug#101389 (32089018), GETWARNINGS SHOULD CHECK WARNING COUNT BEFORE SENDING SHOW. * -- -2.48.1 +2.34.1 diff --git a/0002-Remove-authentication-plugin.patch b/remove-authentication-plugin.patch similarity index 93% rename from 0002-Remove-authentication-plugin.patch rename to remove-authentication-plugin.patch index 270f72f..d2ee0a2 100644 --- a/0002-Remove-authentication-plugin.patch +++ b/remove-authentication-plugin.patch @@ -1,43 +1,44 @@ From 47793b89300a19c5fd13b781f03dd580fc0186a6 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Tue, 18 Jan 2022 14:58:57 +0100 -Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle dependency +Subject: [PATCH] remove AuthenticationOciClient plugin due to missing + oracle dependency --- .../a/NativeAuthenticationProvider.java | 2 - - .../AuthenticationOciClient.java | 177 ------------------ + .../AuthenticationOciClient.java | 175 ------------------ .../cj/LocalizedErrorMessages.properties | 6 - - 3 files changed, 185 deletions(-) + 3 files changed, 183 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 0d94061..58bbf23 100644 +index e1b59182..44bc5290 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; +@@ -57,7 +57,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType; + import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; 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 -Date: Thu, 28 Jul 2022 09:54:06 +0200 +Date: Tue, 18 Jan 2022 14:51:24 +0100 Subject: [PATCH] Remove coverage test --- - build.xml | 162 ------------------------------------------------------ - 1 file changed, 162 deletions(-) + build.xml | 159 ------------------------------------------------------ + 1 file changed, 159 deletions(-) diff --git a/build.xml b/build.xml -index 8c4e9f5..3d13bf4 100644 +index c65df525..cc39d88d 100644 --- a/build.xml +++ b/build.xml -@@ -1279,82 +1279,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +@@ -1285,79 +1285,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o ${com.mysql.cj.testsuite.message.test.mode} @@ -43,7 +43,6 @@ index 8c4e9f5..3d13bf4 100644 - methods="${com.mysql.cj.testsuite.test.methods}" - outputdir="${com.mysql.cj.testsuite.junit.results}"> - -- - - - @@ -58,7 +57,6 @@ index 8c4e9f5..3d13bf4 100644 - name="${com.mysql.cj.testsuite.test.class}" - outputdir="${com.mysql.cj.testsuite.junit.results}"> - -- - - - @@ -74,7 +72,6 @@ index 8c4e9f5..3d13bf4 100644 - - - -- - - - @@ -94,7 +91,7 @@ index 8c4e9f5..3d13bf4 100644 -@@ -1367,92 +1291,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +@@ -1370,92 +1297,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o @@ -188,5 +185,5 @@ index 8c4e9f5..3d13bf4 100644 -- -2.48.1 +2.34.1 diff --git a/sources b/sources index 3e8ac7b..bb74e5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.30-nojars.tar.xz) = 592cd88f7d2f7daec2513846a4f75d2f8b5bc0acec286c5da56e62cfc5366ed62b8bd5c4a120f41f0e2eae3a1889e1ff237dee80c021d27e732bdf604398442d +SHA512 (mysql-connector-java-8.0.28-nojars.tar.xz) = 5b8c66b28463849334a03679866914fc2b9c7d5e3c01308f9467e9b5d3fcbc934b3cdb4b46b611ab60d5ea2cda77c7458840773d56d1fb5d0cf7d2b37653de6c