From d17588b870a9f677245343df166eabf676319d0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:41:05 +0000 Subject: [PATCH 01/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 22e235d..c5459ca 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.25 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -100,6 +100,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-1.8.0-openjdk \ %license LICENSE %changelog +* 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 From ffeb3f35e87e2f20ebe5b2c49781dfd37297dc86 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Wed, 18 Aug 2021 13:35:32 +0200 Subject: [PATCH 02/35] migrate to java-11 --- java-11-migration.patch | 67 +++++++++++++++++++++++++++++++++++++++ mysql-connector-java.spec | 11 +++++-- 2 files changed, 75 insertions(+), 3 deletions(-) create mode 100644 java-11-migration.patch 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 c5459ca..c6f637a 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.25 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -32,6 +32,7 @@ Source0: %{name}-%{version}-nojars.tar.xz Source1: generate-tarball.sh Patch1: remove-coverage-test.patch +Patch2: java-11-migration.patch BuildArch: noarch @@ -45,7 +46,7 @@ BuildRequires: javapackages-local BuildRequires: junit5 BuildRequires: protobuf-java BuildRequires: slf4j -BuildRequires: java-1.8.0-openjdk-devel +BuildRequires: java-11-openjdk-devel Requires: slf4j Requires: java @@ -72,6 +73,7 @@ done sed -i 's/>@.*%{version} - 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 From 2bd120f829474dc4ac60f9067a6eeee6ff46c2b7 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Thu, 16 Sep 2021 12:36:13 +0200 Subject: [PATCH 03/35] rebase mysql-connector-java to v. 8.0.26 --- mysql-connector-java.spec | 7 +++++-- remove-coverage-test.patch | 29 +++++++++++++++++------------ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index c6f637a..ff77c7e 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,8 +1,8 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 8.0.25 -Release: 4%{?dist} +Version: 8.0.26 +Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -102,6 +102,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch index db5609e..bc86b1b 100644 --- a/remove-coverage-test.patch +++ b/remove-coverage-test.patch @@ -3,15 +3,16 @@ From: Ondrej Dubaj Date: Tue, 11 May 2021 09:45:27 +0200 Subject: [PATCH] Remove coverage test + --- - build.xml | 154 ------------------------------------------------------ - 1 file changed, 154 deletions(-) + build.xml | 158 ------------------------------------------------------ + 1 file changed, 158 deletions(-) diff --git a/build.xml b/build.xml -index d1b1ab9..9c8ab7d 100644 +index 96c8a0c2..24bfc2f2 100644 --- a/build.xml +++ b/build.xml -@@ -1266,70 +1266,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +@@ -1269,76 +1269,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o ${com.mysql.cj.testsuite.message.test.mode} @@ -79,10 +80,16 @@ index d1b1ab9..9c8ab7d 100644 - - - - - - -@@ -1348,96 +1284,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +- +- +- +- +- +- + + + +@@ -1351,94 +1281,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o @@ -91,9 +98,7 @@ index d1b1ab9..9c8ab7d 100644 - - - -- +- - - - @@ -180,5 +185,5 @@ index d1b1ab9..9c8ab7d 100644 -- -2.30.2 +2.31.1 From e0ac4411d82fa7917dbafaf1e9d6aeac0eda2938 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Thu, 16 Sep 2021 14:15:05 +0200 Subject: [PATCH 04/35] update sources file --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index feb9fb4..e327346 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /mysql-connector-java-8.0.22-nojars.tar.xz /mysql-connector-java-8.0.23-nojars.tar.xz /mysql-connector-java-8.0.25-nojars.tar.xz +/mysql-connector-java-8.0.26-nojars.tar.xz diff --git a/sources b/sources index 468671e..62a3a94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.25-nojars.tar.xz) = 37a626a3c32abd9da72d39ba80955b19f179742a5a28e5c829cbaf7bbcd94e0514e6f2f296fe61048012f06afb99f4db33ff93b761515f4acbc874ba4df27c85 +SHA512 (mysql-connector-java-8.0.26-nojars.tar.xz) = 6b493ee81e10644957fdcfddc4f541ffd48af588a8d9b4f145db592866192680a292a36685d64837ebb5302a87c0ee2ec7ba986513383d5ae9275a8149cb0458 From 465e106e0c624651ec093b7054da00ca1adf4720 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Tue, 19 Oct 2021 15:58:32 +0200 Subject: [PATCH 05/35] Rebase to version 8.0.27 --- .gitignore | 1 + mysql-connector-java.spec | 9 +- remove-StatementsTest.patch | 86 +++++++++++ remove-authentication-plugin.patch | 232 +++++++++++++++++++++++++++++ remove-coverage-test.patch | 16 +- 5 files changed, 334 insertions(+), 10 deletions(-) create mode 100644 remove-StatementsTest.patch create mode 100644 remove-authentication-plugin.patch diff --git a/.gitignore b/.gitignore index e327346..f9f8dc4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /mysql-connector-java-8.0.23-nojars.tar.xz /mysql-connector-java-8.0.25-nojars.tar.xz /mysql-connector-java-8.0.26-nojars.tar.xz +/mysql-connector-java-8.0.27-nojars.tar.xz diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index ff77c7e..ebf5dba 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,7 +1,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 8.0.26 +Version: 8.0.27 Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions @@ -33,6 +33,8 @@ 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 @@ -74,6 +76,8 @@ sed -i 's/>@.*%{version} - 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 diff --git a/remove-StatementsTest.patch b/remove-StatementsTest.patch new file mode 100644 index 0000000..17fb1e2 --- /dev/null +++ b/remove-StatementsTest.patch @@ -0,0 +1,86 @@ +From b113bc5ed38da669a0cf2b88bf35905218b01cfd Mon Sep 17 00:00:00 2001 +From: Zuzana Miklankova +Date: Tue, 19 Oct 2021 15:31:36 +0200 +Subject: [PATCH] removing StatementsTest because of missing dependencies + +--- + .../regression/StatementRegressionTest.java | 51 ------------------- + 1 file changed, 51 deletions(-) + +diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java +index 5845c71e..f68fd9dd 100644 +--- a/src/test/java/testsuite/regression/StatementRegressionTest.java ++++ b/src/test/java/testsuite/regression/StatementRegressionTest.java +@@ -151,7 +151,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 +@@ -11599,21 +11598,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. + * +@@ -11639,39 +11623,4 @@ 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)); +- } + } +-- +2.31.1 + diff --git a/remove-authentication-plugin.patch b/remove-authentication-plugin.patch new file mode 100644 index 0000000..2105726 --- /dev/null +++ b/remove-authentication-plugin.patch @@ -0,0 +1,232 @@ + From 74cb8dc7c3100f5dddfe640519488dc8e2a49bd1 Mon Sep 17 00:00:00 2001 + From: Ondrej Dubaj + Date: Tue, 19 Oct 2021 14:35:41 +0200 + Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle + dependency + + --- + .../a/NativeAuthenticationProvider.java | 2 - + .../AuthenticationOciClient.java | 175 ------------------ + .../cj/LocalizedErrorMessages.properties | 6 - + 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 b53ea98..c1f1a41 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 + @@ -55,7 +55,6 @@ import com.mysql.cj.protocol.ServerSession; + import com.mysql.cj.protocol.a.NativeConstants.IntegerDataType; + import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType; + import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; + -import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient; + import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient; + import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin; + import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin; + @@ -254,7 +253,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider { + - public static String PLUGIN_NAME = "authentication_oci_client"; + - + - private String sourceOfAuthData = PLUGIN_NAME; + - + - protected Protocol protocol = null; + - private MysqlCallbackHandler usernameCallbackHandler = null; + - private String fingerprint = null; + - private RSAPrivateKey privateKey = null; + - + - @Override + - public void init(Protocol prot, MysqlCallbackHandler cbh) { + - this.protocol = prot; + - this.usernameCallbackHandler = cbh; + - } + - + - @Override + - public void reset() { + - this.fingerprint = null; + - this.privateKey = null; + - } + - + - @Override + - public void destroy() { + - reset(); + - } + - + - @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 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::AuthMoreData. + - 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 6b8dd34..d853ee0 100644 + --- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties + +++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties + @@ -44,12 +44,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''. + -- diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch index bc86b1b..3d0a0ed 100644 --- a/remove-coverage-test.patch +++ b/remove-coverage-test.patch @@ -3,16 +3,15 @@ From: Ondrej Dubaj Date: Tue, 11 May 2021 09:45:27 +0200 Subject: [PATCH] Remove coverage test - --- - build.xml | 158 ------------------------------------------------------ - 1 file changed, 158 deletions(-) + build.xml | 157 ------------------------------------------------------ + 1 file changed, 157 deletions(-) diff --git a/build.xml b/build.xml -index 96c8a0c2..24bfc2f2 100644 +index a7d82b62..bd0355b4 100644 --- a/build.xml +++ b/build.xml -@@ -1269,76 +1269,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +@@ -1285,76 +1285,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o ${com.mysql.cj.testsuite.message.test.mode} @@ -84,12 +83,12 @@ index 96c8a0c2..24bfc2f2 100644 - - - -- +- - -@@ -1351,94 +1281,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +@@ -1367,93 +1297,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o @@ -180,10 +179,9 @@ index 96c8a0c2..24bfc2f2 100644 - - - -- + - -- 2.31.1 From 6965d77b5ee72d0f742d2cb0e1b0fc9022f8f722 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Tue, 19 Oct 2021 16:56:17 +0200 Subject: [PATCH 06/35] update sources file --- remove-authentication-plugin.patch | 461 +++++++++++++++-------------- sources | 2 +- 2 files changed, 232 insertions(+), 231 deletions(-) diff --git a/remove-authentication-plugin.patch b/remove-authentication-plugin.patch index 2105726..61aa455 100644 --- a/remove-authentication-plugin.patch +++ b/remove-authentication-plugin.patch @@ -1,232 +1,233 @@ - From 74cb8dc7c3100f5dddfe640519488dc8e2a49bd1 Mon Sep 17 00:00:00 2001 - From: Ondrej Dubaj - Date: Tue, 19 Oct 2021 14:35:41 +0200 - Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle - dependency +From 74cb8dc7c3100f5dddfe640519488dc8e2a49bd1 Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Tue, 19 Oct 2021 14:35:41 +0200 +Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle + dependency - --- - .../a/NativeAuthenticationProvider.java | 2 - - .../AuthenticationOciClient.java | 175 ------------------ - .../cj/LocalizedErrorMessages.properties | 6 - - 3 files changed, 183 deletions(-) - delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java +--- + .../a/NativeAuthenticationProvider.java | 2 - + .../AuthenticationOciClient.java | 175 ------------------ + .../cj/LocalizedErrorMessages.properties | 6 - + 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 b53ea98..c1f1a41 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 - @@ -55,7 +55,6 @@ import com.mysql.cj.protocol.ServerSession; - import com.mysql.cj.protocol.a.NativeConstants.IntegerDataType; - import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType; - import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; - -import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient; - import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient; - import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin; - import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin; - @@ -254,7 +253,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider { - - public static String PLUGIN_NAME = "authentication_oci_client"; - - - - private String sourceOfAuthData = PLUGIN_NAME; - - - - protected Protocol protocol = null; - - private MysqlCallbackHandler usernameCallbackHandler = null; - - private String fingerprint = null; - - private RSAPrivateKey privateKey = null; - - - - @Override - - public void init(Protocol prot, MysqlCallbackHandler cbh) { - - this.protocol = prot; - - this.usernameCallbackHandler = cbh; - - } - - - - @Override - - public void reset() { - - this.fingerprint = null; - - this.privateKey = null; - - } - - - - @Override - - public void destroy() { - - reset(); - - } - - - - @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 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::AuthMoreData. - - 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 6b8dd34..d853ee0 100644 - --- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties - +++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties - @@ -44,12 +44,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''. - -- +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 b53ea98..c1f1a41 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 +@@ -55,7 +55,6 @@ import com.mysql.cj.protocol.ServerSession; + import com.mysql.cj.protocol.a.NativeConstants.IntegerDataType; + import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType; + import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; +-import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient; + import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient; + import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin; + import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin; +@@ -254,7 +253,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider { +- public static String PLUGIN_NAME = "authentication_oci_client"; +- +- private String sourceOfAuthData = PLUGIN_NAME; +- +- protected Protocol protocol = null; +- private MysqlCallbackHandler usernameCallbackHandler = null; +- private String fingerprint = null; +- private RSAPrivateKey privateKey = null; +- +- @Override +- public void init(Protocol prot, MysqlCallbackHandler cbh) { +- this.protocol = prot; +- this.usernameCallbackHandler = cbh; +- } +- +- @Override +- public void reset() { +- this.fingerprint = null; +- this.privateKey = null; +- } +- +- @Override +- public void destroy() { +- reset(); +- } +- +- @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 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::AuthMoreData. +- 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 6b8dd34..d853ee0 100644 +--- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties ++++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties +@@ -44,12 +44,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.31.1 \ No newline at end of file diff --git a/sources b/sources index 62a3a94..9e45284 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.26-nojars.tar.xz) = 6b493ee81e10644957fdcfddc4f541ffd48af588a8d9b4f145db592866192680a292a36685d64837ebb5302a87c0ee2ec7ba986513383d5ae9275a8149cb0458 +SHA512 (mysql-connector-java-8.0.27-nojars.tar.xz) = db07ad394a1558123fd3e6b353685e804b0863dc412bfba2375666aa9ccc44e023888b043e836a6dffcef237ce212fa55ddc3738373243bd0ef03e4c4713efe7 From db2ec8b887ecd159f49f5912beb29b7a27edfffb Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 26 Oct 2021 08:47:16 +0200 Subject: [PATCH 07/35] Rebuilt for protobuf 3.18.1 --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index ebf5dba..89fa1ea 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.27 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 From ec0e1b2197280ccf49e47b950be56b9c5117fcae Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Fri, 12 Nov 2021 09:12:17 +0100 Subject: [PATCH 08/35] rebuild for protobuf 3.19.0-2 --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 89fa1ea..bb57773 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.27 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 From ca7b6af50867c4766e735c4b4f1b05bb4aa37e68 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Tue, 18 Jan 2022 15:13:55 +0100 Subject: [PATCH 09/35] Rebase to version 8.0.28 --- .gitignore | 1 + mysql-connector-java.spec | 7 +++++-- remove-StatementsTest.patch | 31 +++++++++++++++--------------- remove-authentication-plugin.patch | 29 ++++++++++++++-------------- remove-coverage-test.patch | 28 ++++++++++++++------------- sources | 2 +- 6 files changed, 53 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index f9f8dc4..d1526d0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /mysql-connector-java-8.0.25-nojars.tar.xz /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 diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index bb57773..df4d220 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,8 +1,8 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 8.0.27 -Release: 3%{?dist} +Version: 8.0.28 +Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 diff --git a/remove-StatementsTest.patch b/remove-StatementsTest.patch index 17fb1e2..4f5c65f 100644 --- a/remove-StatementsTest.patch +++ b/remove-StatementsTest.patch @@ -1,17 +1,17 @@ -From b113bc5ed38da669a0cf2b88bf35905218b01cfd Mon Sep 17 00:00:00 2001 +From b9a7a929f547d1408c42aca31603d52518f6296b Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova -Date: Tue, 19 Oct 2021 15:31:36 +0200 -Subject: [PATCH] removing StatementsTest because of missing dependencies +Date: Tue, 18 Jan 2022 15:04:09 +0100 +Subject: [PATCH] patch --- - .../regression/StatementRegressionTest.java | 51 ------------------- - 1 file changed, 51 deletions(-) + .../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 5845c71e..f68fd9dd 100644 +index b5c53e9a..89483a07 100644 --- a/src/test/java/testsuite/regression/StatementRegressionTest.java +++ b/src/test/java/testsuite/regression/StatementRegressionTest.java -@@ -151,7 +151,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 5845c71e..f68fd9dd 100644 /** * Regression tests for the Statement class -@@ -11599,21 +11598,6 @@ public class StatementRegressionTest extends BaseTestCase { +@@ -11602,20 +11601,6 @@ public class StatementRegressionTest extends BaseTestCase { } } @@ -37,15 +37,13 @@ index 5845c71e..f68fd9dd 100644 - return null; - }); - } -- + /** * Tests fix for Bug#71929 (18346501), Prefixing query with double comments cancels query DML validation. - * -@@ -11639,39 +11623,4 @@ public class StatementRegressionTest extends BaseTestCase { - }); +@@ -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. - * @@ -80,7 +78,10 @@ index 5845c71e..f68fd9dd 100644 - testConn.close(); - } while ((useSPS = !useSPS) || (readOnly = !readOnly)); - } - } +- + /** + * Tests fix for Bug#101389 (32089018), GETWARNINGS SHOULD CHECK WARNING COUNT BEFORE SENDING SHOW. + * -- -2.31.1 +2.34.1 diff --git a/remove-authentication-plugin.patch b/remove-authentication-plugin.patch index 61aa455..d2ee0a2 100644 --- a/remove-authentication-plugin.patch +++ b/remove-authentication-plugin.patch @@ -1,8 +1,8 @@ -From 74cb8dc7c3100f5dddfe640519488dc8e2a49bd1 Mon Sep 17 00:00:00 2001 +From 47793b89300a19c5fd13b781f03dd580fc0186a6 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj -Date: Tue, 19 Oct 2021 14:35:41 +0200 -Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle - dependency +Date: Tue, 18 Jan 2022 14:58:57 +0100 +Subject: [PATCH] remove AuthenticationOciClient plugin due to missing + oracle dependency --- .../a/NativeAuthenticationProvider.java | 2 - @@ -12,18 +12,18 @@ Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle 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 b53ea98..c1f1a41 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 -@@ -55,7 +55,6 @@ import com.mysql.cj.protocol.ServerSession; - import com.mysql.cj.protocol.a.NativeConstants.IntegerDataType; - import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType; +@@ -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.AuthenticationOciClient; 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; -@@ -254,7 +253,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider -Date: Tue, 11 May 2021 09:45:27 +0200 +Date: Tue, 18 Jan 2022 14:51:24 +0100 Subject: [PATCH] Remove coverage test --- - build.xml | 157 ------------------------------------------------------ - 1 file changed, 157 deletions(-) + build.xml | 159 ------------------------------------------------------ + 1 file changed, 159 deletions(-) diff --git a/build.xml b/build.xml -index a7d82b62..bd0355b4 100644 +index c65df525..cc39d88d 100644 --- a/build.xml +++ b/build.xml -@@ -1285,76 +1285,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} @@ -32,6 +32,9 @@ index a7d82b62..bd0355b4 100644 - - - +- +- +- - - - @@ -44,7 +47,7 @@ index a7d82b62..bd0355b4 100644 - - - -- +- - - - @@ -58,7 +61,7 @@ index a7d82b62..bd0355b4 100644 - - - -- +- - - - @@ -73,7 +76,7 @@ index a7d82b62..bd0355b4 100644 - - - -- +- - - - @@ -88,7 +91,7 @@ index a7d82b62..bd0355b4 100644 -@@ -1367,93 +1297,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 @@ -178,10 +181,9 @@ index a7d82b62..bd0355b4 100644 - - - -- + - -- -2.31.1 +2.34.1 diff --git a/sources b/sources index 9e45284..bb74e5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.27-nojars.tar.xz) = db07ad394a1558123fd3e6b353685e804b0863dc412bfba2375666aa9ccc44e023888b043e836a6dffcef237ce212fa55ddc3738373243bd0ef03e4c4713efe7 +SHA512 (mysql-connector-java-8.0.28-nojars.tar.xz) = 5b8c66b28463849334a03679866914fc2b9c7d5e3c01308f9467e9b5d3fcbc934b3cdb4b46b611ab60d5ea2cda77c7458840773d56d1fb5d0cf7d2b37653de6c From 9ac206e76e383df36ad1348cda7a8070de1f9c12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:43:58 +0000 Subject: [PATCH 10/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index df4d220..53818a4 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.28 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 From 4cf054d047c1cecb2929622cd87651231c83e243 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 23:06:24 +0100 Subject: [PATCH 11/35] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 53818a4..deb43d2 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.28 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 From 8fa7fb030b64bcd2822efa6081ae569bbc45d378 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Tue, 26 Apr 2022 10:34:44 +0200 Subject: [PATCH 12/35] rebase to upstream version 8.0.29 --- mysql-connector-java.spec | 7 +++++-- remove-authentication-plugin.patch | 33 +++++++++++++++--------------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index deb43d2..2beb6ea 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,8 +1,8 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 8.0.28 -Release: 3%{?dist} +Version: 8.0.29 +Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 diff --git a/remove-authentication-plugin.patch b/remove-authentication-plugin.patch index d2ee0a2..a7e41e0 100644 --- a/remove-authentication-plugin.patch +++ b/remove-authentication-plugin.patch @@ -1,44 +1,43 @@ 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 | 175 ------------------ + .../AuthenticationOciClient.java | 177 ------------------ .../cj/LocalizedErrorMessages.properties | 6 - - 3 files changed, 183 deletions(-) + 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 e1b59182..44bc5290 100644 +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 -@@ -57,7 +57,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType; - import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; +@@ -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; -@@ -255,7 +254,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider Date: Tue, 26 Apr 2022 13:20:07 +0200 Subject: [PATCH 13/35] adding new sources for 8.0.29 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d1526d0..875f07e 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /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 diff --git a/sources b/sources index bb74e5d..d428ef4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.28-nojars.tar.xz) = 5b8c66b28463849334a03679866914fc2b9c7d5e3c01308f9467e9b5d3fcbc934b3cdb4b46b611ab60d5ea2cda77c7458840773d56d1fb5d0cf7d2b37653de6c +SHA512 (mysql-connector-java-8.0.29-nojars.tar.xz) = 17c0e06052b88c00f2bb09ca54cdf6d6810201e0ceeee80bdd652482ae58c63e30d998534de5ddab2211a93b552d5d596e4e9d5890fe2edb084c95abd01fbae7 From 6c8ea23b61edb2d388d2f13d21f73be81051fa64 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 16:19:06 +0200 Subject: [PATCH 14/35] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- mysql-connector-java.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 2beb6ea..862a6a3 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.29 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -37,6 +37,7 @@ Patch3: remove-authentication-plugin.patch Patch4: remove-StatementsTest.patch BuildArch: noarch +ExclusiveArch: %{java_arches} noarch BuildRequires: ant >= 1.6.0 BuildRequires: ant-junit @@ -106,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 From 822df88e99bb99c73fd574b94cbb35c77fc1eec5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:03:53 +0000 Subject: [PATCH 15/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 862a6a3..5d2fd59 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.29 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 From bddf4350588b0dda8c0da6ec532d0c7f22090d12 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Thu, 28 Jul 2022 11:10:41 +0200 Subject: [PATCH 16/35] rebase to upstream version 8.0.30 - build with jdk 17, as it is the system default jdk Resolves: #2110975 --- .gitignore | 1 + java-11-migration.patch | 16 ++++++++-------- mysql-connector-java.spec | 13 +++++++++---- remove-coverage-test.patch | 19 +++++++++++-------- sources | 2 +- 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 875f07e..9edddea 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /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/java-11-migration.patch b/java-11-migration.patch index 5af5777..d0f7c4e 100644 --- a/java-11-migration.patch +++ b/java-11-migration.patch @@ -7,7 +7,7 @@ index 9c8ab7d..040318c 100644 # - 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> ++com.mysql.cj.build.jdk=<full_path_to_jdk17> # Single JVM/MySQL tests: # - Must point to JDK or JRE home directory. @@ -16,7 +16,7 @@ index 9c8ab7d..040318c 100644 - -+ ++ @@ -25,13 +25,13 @@ index 9c8ab7d..040318c 100644 - -+ ++ - -+ ++ @@ -40,7 +40,7 @@ index 9c8ab7d..040318c 100644 - -+ ++ @@ -53,15 +53,15 @@ index d2926bb..9cf507b 100644 %if 0%{!?with_java:1} -BuildRequires: java-devel >= 1:1.8.0 -+BuildRequires: java-devel >= 1:11 ++BuildRequires: java-devel >= 1:17 %endif %if 0%{?sles12:1} || 0%{?sles15:1} -Requires: java-headless >= 1.8.0 -+Requires: java-headless >= 11 ++Requires: java-headless >= 17 %else -Requires: java-headless >= 1:1.8.0 -+Requires: java-headless >= 1:11 ++Requires: java-headless >= 1:17 %endif %description diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 5d2fd59..f3df3c4 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,8 +1,8 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 8.0.29 -Release: 3%{?dist} +Version: 8.0.30 +Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -49,7 +49,7 @@ BuildRequires: javapackages-local BuildRequires: junit5 BuildRequires: protobuf-java BuildRequires: slf4j -BuildRequires: java-11-openjdk-devel +BuildRequires: java-17-openjdk-devel Requires: slf4j Requires: java @@ -92,7 +92,7 @@ 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=/usr/lib/jvm/java-11-openjdk \ +ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ -Dcom.mysql.cj.extra.libs=%{_javadir} \ test dist @@ -107,6 +107,11 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \ %license LICENSE %changelog +* 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 diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch index dee34e4..ae1e4f7 100644 --- a/remove-coverage-test.patch +++ b/remove-coverage-test.patch @@ -1,17 +1,17 @@ -From aca78bd6710ba4f7556c44abfb9e7ae6793c8e3d Mon Sep 17 00:00:00 2001 +From cde027a4886ac1160ac42a6e4ba1fa2d271009be Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj -Date: Tue, 18 Jan 2022 14:51:24 +0100 +Date: Thu, 28 Jul 2022 09:54:06 +0200 Subject: [PATCH] Remove coverage test --- - build.xml | 159 ------------------------------------------------------ - 1 file changed, 159 deletions(-) + build.xml | 162 ------------------------------------------------------ + 1 file changed, 162 deletions(-) diff --git a/build.xml b/build.xml -index c65df525..cc39d88d 100644 +index 8c4e9f5d..3d13bf45 100644 --- a/build.xml +++ b/build.xml -@@ -1285,79 +1285,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 ${com.mysql.cj.testsuite.message.test.mode} @@ -43,6 +43,7 @@ index c65df525..cc39d88d 100644 - methods="${com.mysql.cj.testsuite.test.methods}" - outputdir="${com.mysql.cj.testsuite.junit.results}"> - +- - - - @@ -57,6 +58,7 @@ index c65df525..cc39d88d 100644 - name="${com.mysql.cj.testsuite.test.class}" - outputdir="${com.mysql.cj.testsuite.junit.results}"> - +- - - - @@ -72,6 +74,7 @@ index c65df525..cc39d88d 100644 - - - +- - - - @@ -91,7 +94,7 @@ index c65df525..cc39d88d 100644 -@@ -1370,92 +1297,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +@@ -1367,92 +1291,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o @@ -185,5 +188,5 @@ index c65df525..cc39d88d 100644 -- -2.34.1 +2.37.1 diff --git a/sources b/sources index d428ef4..3e8ac7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.29-nojars.tar.xz) = 17c0e06052b88c00f2bb09ca54cdf6d6810201e0ceeee80bdd652482ae58c63e30d998534de5ddab2211a93b552d5d596e4e9d5890fe2edb084c95abd01fbae7 +SHA512 (mysql-connector-java-8.0.30-nojars.tar.xz) = 592cd88f7d2f7daec2513846a4f75d2f8b5bc0acec286c5da56e62cfc5366ed62b8bd5c4a120f41f0e2eae3a1889e1ff237dee80c021d27e732bdf604398442d From db8e78d4c9b5620c1ec8f4956e1976dca55775ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:04:05 +0000 Subject: [PATCH 17/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index f3df3c4..e6fc0a5 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.30 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ %license LICENSE %changelog +* 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 From 54fb8677611becd82321862a23de759af3c96f4c Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Tue, 11 Apr 2023 07:47:06 +0200 Subject: [PATCH 18/35] migrated to SPDX, however this may be only a temporary change Because the license review process is still ongoing. See: https://gitlab.com/fedora/legal/fedora-license-data/-/issues/189 --- mysql-connector-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index e6fc0a5..f5b3931 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -4,7 +4,7 @@ Name: mysql-connector-java Version: 8.0.30 Release: 2%{?dist} Epoch: 1 -License: GPLv2 with exceptions +License: GPL-2.0-only URL: http://dev.mysql.com/downloads/connector/j/ Source0: %{name}-%{version}-nojars.tar.xz From 3ca4932429f4e707e28ccbe99851dd27d0364a40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:09:00 +0000 Subject: [PATCH 19/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index f5b3931..b1bdf0d 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.30 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 License: GPL-2.0-only URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ %license LICENSE %changelog +* 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 From 3ed2b4baa5979aedb8ee907168db7724b5939c1f Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 16 Jan 2024 14:11:38 +0100 Subject: [PATCH 20/35] Use %patch with a space --- mysql-connector-java.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index b1bdf0d..25db798 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -75,10 +75,10 @@ done sed -i 's/>@.*%{version} Date: Tue, 16 Jan 2024 14:10:49 +0100 Subject: [PATCH 21/35] Add generic JPV tests --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 10 ++++++++++ 4 files changed, 20 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !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/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..c9358ca --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,10 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: main +execute: + how: tmt +environment: + JP_VALIDATOR_SOURCE_PATH: '' + JP_VALIDATOR_ARGS: org.fedoraproject.javapackages.validator.validators.DefaultValidatorFactory From aaf19695a7b053e8d95b59bf7de1d7ceeb8284a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:00:08 +0000 Subject: [PATCH 22/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 25db798..450a088 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.30 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 1 License: GPL-2.0-only URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ %license LICENSE %changelog +* 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 From b8e6528d1d25aea3b12ef409cdf1f4027c90953c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:28:24 +0000 Subject: [PATCH 23/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 450a088..0b4390a 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.30 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPL-2.0-only URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ %license LICENSE %changelog +* 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 From 4cf95cc174a3b7390abf6f0d758e4494bfbf3c37 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:27:41 +0100 Subject: [PATCH 24/35] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 0b4390a..c51bde9 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.30 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 License: GPL-2.0-only URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ %license LICENSE %changelog +* 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 From fd30d71a7981f2119dee653e016defc1b8832fe5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:00:18 +0000 Subject: [PATCH 25/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index c51bde9..120948d 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.30 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 License: GPL-2.0-only URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ %license LICENSE %changelog +* 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 From cc8be3c0698b0e8e0d43a9e29b19efdaefa3e4a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:31:02 +0000 Subject: [PATCH 26/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 120948d..f169c80 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -2,7 +2,7 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java Version: 8.0.30 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 1 License: GPL-2.0-only URL: http://dev.mysql.com/downloads/connector/j/ @@ -107,6 +107,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-17-openjdk \ %license LICENSE %changelog +* 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 From 11e0c88643c87baf8aaa42dc6903f422d2e52f43 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 Jan 2025 09:46:28 +0100 Subject: [PATCH 27/35] Fix .spec --- ...t.patch => 0001-Remove-coverage-test.patch | 4 +- ...=> 0002-Remove-authentication-plugin.patch | 8 +- ....patch => 0003-Remove-StatementsTest.patch | 10 +- 0004-Port-to-Java-21.patch | 42 ++++++++ java-11-migration.patch | 67 ------------- mysql-connector-java.spec | 97 +++++-------------- 6 files changed, 77 insertions(+), 151 deletions(-) rename remove-coverage-test.patch => 0001-Remove-coverage-test.patch (99%) rename remove-authentication-plugin.patch => 0002-Remove-authentication-plugin.patch (99%) rename remove-StatementsTest.patch => 0003-Remove-StatementsTest.patch (93%) create mode 100644 0004-Port-to-Java-21.patch delete mode 100644 java-11-migration.patch diff --git a/remove-coverage-test.patch b/0001-Remove-coverage-test.patch similarity index 99% rename from remove-coverage-test.patch rename to 0001-Remove-coverage-test.patch index ae1e4f7..58a84ea 100644 --- a/remove-coverage-test.patch +++ b/0001-Remove-coverage-test.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Remove coverage test 1 file changed, 162 deletions(-) diff --git a/build.xml b/build.xml -index 8c4e9f5d..3d13bf45 100644 +index 8c4e9f5..3d13bf4 100644 --- a/build.xml +++ b/build.xml @@ -1279,82 +1279,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o @@ -188,5 +188,5 @@ index 8c4e9f5d..3d13bf45 100644 -- -2.37.1 +2.48.1 diff --git a/remove-authentication-plugin.patch b/0002-Remove-authentication-plugin.patch similarity index 99% rename from remove-authentication-plugin.patch rename to 0002-Remove-authentication-plugin.patch index a7e41e0..270f72f 100644 --- a/remove-authentication-plugin.patch +++ b/0002-Remove-authentication-plugin.patch @@ -11,7 +11,7 @@ Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle dep 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 +index 0d94061..58bbf23 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; @@ -32,7 +32,7 @@ index 0d94061d..58bbf23b 100644 // 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 +index 473e532..0000000 --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java +++ /dev/null @@ -1,177 +0,0 @@ @@ -214,7 +214,7 @@ index 473e532f..00000000 - } -} diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties -index e4709a75..d29cdeb3 100644 +index 8a5bfc1..53affc4 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 @@ -231,5 +231,5 @@ index e4709a75..d29cdeb3 100644 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 +2.48.1 diff --git a/remove-StatementsTest.patch b/0003-Remove-StatementsTest.patch similarity index 93% rename from remove-StatementsTest.patch rename to 0003-Remove-StatementsTest.patch index 4f5c65f..201a330 100644 --- a/remove-StatementsTest.patch +++ b/0003-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 b5c53e9a..89483a07 100644 +index 7e5a5f8..8e77de5 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; +@@ -156,7 +156,6 @@ import com.mysql.cj.util.TimeUtil; import testsuite.BaseQueryInterceptor; import testsuite.BaseTestCase; import testsuite.UnreliableSocketFactory; @@ -19,7 +19,7 @@ index b5c53e9a..89483a07 100644 /** * Regression tests for the Statement class -@@ -11602,20 +11601,6 @@ public class StatementRegressionTest extends BaseTestCase { +@@ -11607,20 +11606,6 @@ public class StatementRegressionTest extends BaseTestCase { } } @@ -40,7 +40,7 @@ index b5c53e9a..89483a07 100644 /** * Tests fix for Bug#71929 (18346501), Prefixing query with double comments cancels query DML validation. -@@ -11643,41 +11628,6 @@ public class StatementRegressionTest extends BaseTestCase { +@@ -11648,41 +11633,6 @@ public class StatementRegressionTest extends BaseTestCase { } } @@ -83,5 +83,5 @@ index b5c53e9a..89483a07 100644 * Tests fix for Bug#101389 (32089018), GETWARNINGS SHOULD CHECK WARNING COUNT BEFORE SENDING SHOW. * -- -2.34.1 +2.48.1 diff --git a/0004-Port-to-Java-21.patch b/0004-Port-to-Java-21.patch new file mode 100644 index 0000000..576594b --- /dev/null +++ b/0004-Port-to-Java-21.patch @@ -0,0 +1,42 @@ +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/java-11-migration.patch b/java-11-migration.patch deleted file mode 100644 index d0f7c4e..0000000 --- a/java-11-migration.patch +++ /dev/null @@ -1,67 +0,0 @@ -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_jdk17> - - # 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:17 - %endif - - %if 0%{?sles12:1} || 0%{?sles15:1} --Requires: java-headless >= 1.8.0 -+Requires: java-headless >= 17 - %else --Requires: java-headless >= 1:1.8.0 -+Requires: java-headless >= 1:17 - %endif - - %description diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index f169c80..269900c 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,58 +1,27 @@ - -Summary: Official JDBC driver for MySQL -Name: mysql-connector-java -Version: 8.0.30 -Release: 8%{?dist} -Epoch: 1 -License: GPL-2.0-only -URL: http://dev.mysql.com/downloads/connector/j/ -Source0: %{name}-%{version}-nojars.tar.xz - -# 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. - -# 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 +Name: mysql-connector-java +Epoch: 1 +Version: 8.0.30 +Release: 8%{?dist} +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 -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-17-openjdk-devel +# Generated with generate-tarball.sh +Source0: %{name}-%{version}-nojars.tar.xz +Source1: generate-tarball.sh -Requires: slf4j -Requires: java +Patch: 0001-Remove-coverage-test.patch +Patch: 0002-Remove-authentication-plugin.patch +Patch: 0003-Remove-StatementsTest.patch +Patch: 0004-Port-to-Java-21.patch + +BuildRequires: javapackages-local-openjdk21 +BuildRequires: ant-junit5 +BuildRequires: javassist +BuildRequires: protobuf-java +BuildRequires: slf4j %description MySQL Connector/J is a native Java driver that converts JDBC (Java Database @@ -64,27 +33,8 @@ IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. %prep -%setup -q -n mysql-connector-j-%{version} - -# 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 - +%autosetup -p1 -C sed -i 's/>@.*%{version} Date: Wed, 29 Jan 2025 16:48:52 +0100 Subject: [PATCH 28/35] Modernize generate-tarball.sh --- generate-tarball.sh | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/generate-tarball.sh b/generate-tarball.sh index 749d727..8743ff5 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -1,24 +1,25 @@ -#!/bin/sh +#!/bin/bash -VERSION=$1 +set -e -if [ -z "$VERSION" ]; then - echo >&2 "Usage:" - echo >&2 " $0 " - exit 1 -fi +name="$(sed -n '/^Name:/{s///;s/^\s*//;p;q}' *.spec)" +version="$(sed -n '/^Version:/{s///;s/^\s*//;p;q}' *.spec)" -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 +# RETRIEVE +curl -L "https://github.com/mysql/mysql-connector-j/archive/${version}.tar.gz" -o "${name}-${version}.orig.tar.gz" -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 +rm -rf tarball-tmp +mkdir tarball-tmp +pushd tarball-tmp +tar -xf "../${name}-${version}.orig.tar.gz" +mv * "${name}-${version}" -tar cfJ mysql-connector-java-$VERSION-nojars.tar.xz mysql-connector-j-$VERSION || exit 1 +# CLEAN +find -name '*.jar' -print -delete +find -name '*.class' -print -delete +find -name '*.zip' -print -delete -rm -rf mysql-connector-j-$VERSION $VERSION.tar.gz - -exit 0 +tar -c * | zstd -10 -f -o "../${name}-${version}.tar.zst" +popd +rm -r tarball-tmp "${name}-${version}.orig.tar.gz" From 1979972d642bdce5aa4a1ebfdfbc7e06400a534c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jan 2025 17:48:52 +0100 Subject: [PATCH 29/35] Replace sed with Xpath --- mysql-connector-java.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 269900c..0fbe32a 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -34,7 +34,10 @@ capabilities of MySQL. %prep %autosetup -p1 -C -sed -i 's/>@.*%{version} Date: Wed, 29 Jan 2025 17:53:31 +0100 Subject: [PATCH 30/35] Use %autorelease and %autochangelog --- changelog | 391 +++++++++++++++++++++++++++++++++++++ mysql-connector-java.spec | 394 +------------------------------------- 2 files changed, 393 insertions(+), 392 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..28c9238 --- /dev/null +++ b/changelog @@ -0,0 +1,391 @@ +* 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/mysql-connector-java.spec b/mysql-connector-java.spec index 0fbe32a..6ebc065 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,7 +1,7 @@ Name: mysql-connector-java Epoch: 1 Version: 8.0.30 -Release: 8%{?dist} +Release: %autorelease Summary: Official JDBC driver for MySQL License: GPL-2.0-only URL: https://dev.mysql.com/downloads/connector/j/ @@ -61,394 +61,4 @@ ant -Dcom.mysql.cj.build.jdk=%{java_home} \ %license LICENSE %changelog -* 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 +%autochangelog From 34aebbaedb4fa2b7c2eb4e229e4bf096550219b8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 6 Feb 2025 09:42:46 +0100 Subject: [PATCH 31/35] Update javapackages test --- plans/javapackages.fmf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index c9358ca..1e5c8de 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -5,6 +5,5 @@ discover: ref: main execute: how: tmt -environment: - JP_VALIDATOR_SOURCE_PATH: '' - JP_VALIDATOR_ARGS: org.fedoraproject.javapackages.validator.validators.DefaultValidatorFactory +context: + jpv_flavor: generic From 2f56a1946220d46ccd6d3d4e60d8d498b733dad2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:32:51 +0000 Subject: [PATCH 32/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From cb07fe8bac17b4dd3dcffd27a9a2be85def76a89 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Mon, 28 Jul 2025 19:14:50 +0200 Subject: [PATCH 33/35] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. --- mysql-connector-java.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 6ebc065..74bd3fb 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -17,7 +17,7 @@ Patch: 0002-Remove-authentication-plugin.patch Patch: 0003-Remove-StatementsTest.patch Patch: 0004-Port-to-Java-21.patch -BuildRequires: javapackages-local-openjdk21 +BuildRequires: javapackages-local-openjdk25 BuildRequires: ant-junit5 BuildRequires: javassist BuildRequires: protobuf-java From 8eae7bf9a3987aa27acde12daaef0fab9d75839c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 19 Aug 2025 10:48:25 +0200 Subject: [PATCH 34/35] Update javapackages-validator URL --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 1e5c8de..36643ec 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: main execute: how: tmt From 9f2b8b66de0533c7e42bd00a6ec1862f6c789dab Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 10:41:08 +0200 Subject: [PATCH 35/35] manual bodhi update for jdk25 needed on selected pkgs