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/.gitignore b/.gitignore index 091f7a4..9edddea 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,18 @@ /mysql-connector-java-5.1.36-nojars.tar.xz /mysql-connector-java-5.1.37-nojars.tar.xz /mysql-connector-java-5.1.38-nojars.tar.xz +/mysql-connector-java-8.0.11-nojars.tar.xz +/mysql-connector-java-8.0.12-nojars.tar.xz +/mysql-connector-java-8.0.13-nojars.tar.xz +/mysql-connector-java-8.0.15-nojars.tar.xz +/mysql-connector-java-8.0.16-nojars.tar.xz +/mysql-connector-java-8.0.20-nojars.tar.xz +/mysql-connector-java-8.0.21-nojars.tar.xz +/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 +/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/0001-Remove-coverage-test.patch b/0001-Remove-coverage-test.patch new file mode 100644 index 0000000..58a84ea --- /dev/null +++ b/0001-Remove-coverage-test.patch @@ -0,0 +1,192 @@ +From cde027a4886ac1160ac42a6e4ba1fa2d271009be Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Thu, 28 Jul 2022 09:54:06 +0200 +Subject: [PATCH] Remove coverage test + +--- + build.xml | 162 ------------------------------------------------------ + 1 file changed, 162 deletions(-) + +diff --git a/build.xml b/build.xml +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 + + ${com.mysql.cj.testsuite.message.test.mode} + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1367,92 +1291,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +-- +2.48.1 + diff --git a/0002-Remove-authentication-plugin.patch b/0002-Remove-authentication-plugin.patch new file mode 100644 index 0000000..270f72f --- /dev/null +++ b/0002-Remove-authentication-plugin.patch @@ -0,0 +1,235 @@ +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 + +--- + .../a/NativeAuthenticationProvider.java | 2 - + .../AuthenticationOciClient.java | 177 ------------------ + .../cj/LocalizedErrorMessages.properties | 6 - + 3 files changed, 185 deletions(-) + delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java + +diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java +index 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; + import com.mysql.cj.protocol.a.authentication.AuthenticationFidoClient; + import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient; + import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin; +-import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient; + import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin; + import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin; + import com.mysql.cj.protocol.a.authentication.MysqlNativePasswordPlugin; +@@ -256,7 +255,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider { +- 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(); +- this.protocol = null; +- this.usernameCallbackHandler = null; +- } +- +- @Override +- public String getProtocolPluginName() { +- return PLUGIN_NAME; +- } +- +- @Override +- public boolean requiresConfidentiality() { +- return false; +- } +- +- @Override +- public boolean isReusable() { +- return false; +- } +- +- @Override +- public void setAuthenticationParameters(String user, String password) { +- if (user == null && this.usernameCallbackHandler != null) { +- // Fall back to system login user. +- this.usernameCallbackHandler.handle(new UsernameCallback(System.getProperty("user.name"))); +- } +- } +- +- @Override +- public void setSourceOfAuthData(String sourceOfAuthData) { +- this.sourceOfAuthData = sourceOfAuthData; +- } +- +- @Override +- public boolean nextAuthenticationStep(NativePacketPayload fromServer, List toServer) { +- toServer.clear(); +- +- if (!this.sourceOfAuthData.equals(PLUGIN_NAME) || fromServer.getPayloadLength() == 0) { +- // Cannot do anything with whatever payload comes from the server, so just skip this iteration and wait for a Protocol::AuthSwitchRequest or a +- // Protocol::AuthNextFactor. +- toServer.add(new NativePacketPayload(0)); +- return true; +- } +- +- initializePrivateKey(); +- +- byte[] nonce = fromServer.readBytes(StringSelfDataType.STRING_EOF); +- byte[] signature = ExportControlled.sign(nonce, this.privateKey); +- if (signature == null) { +- signature = new byte[0]; +- } +- String payload = String.format("{\"fingerprint\":\"%s\", \"signature\":\"%s\"}", this.fingerprint, Base64.getEncoder().encodeToString(signature)); +- toServer.add(new NativePacketPayload(payload.getBytes(Charset.defaultCharset()))); +- return true; +- } +- +- private void initializePrivateKey() { +- if (this.privateKey != null) { +- // Already initialized. +- return; +- } +- +- ConfigFile configFile; +- try { +- String configFilePath = this.protocol.getPropertySet().getStringProperty(PropertyKey.ociConfigFile.getKeyName()).getStringValue(); +- if (StringUtils.isNullOrEmpty(configFilePath)) { +- configFile = ConfigFileReader.parseDefault(); +- } else if (Files.exists(Paths.get(configFilePath))) { +- configFile = ConfigFileReader.parse(configFilePath); +- } else { +- throw ExceptionFactory.createException("configuration file does not exist"); +- } +- } catch (NoClassDefFoundError e) { +- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.SdkNotFound"), e); +- } catch (IOException e) { +- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileError"), e); +- } +- this.fingerprint = configFile.get("fingerprint"); +- if (StringUtils.isNullOrEmpty(this.fingerprint)) { +- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry")); +- } +- String keyFilePath = configFile.get("key_file"); +- if (StringUtils.isNullOrEmpty(keyFilePath)) { +- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.OciConfigFileMissingEntry")); +- } +- +- try { +- String key = new String(Files.readAllBytes(Paths.get(keyFilePath)), Charset.defaultCharset()); +- this.privateKey = ExportControlled.decodeRSAPrivateKey(key); +- } catch (IOException e) { +- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotFound"), e); +- } catch (RSAException | IllegalArgumentException e) { +- throw ExceptionFactory.createException(Messages.getString("AuthenticationOciClientPlugin.PrivateKeyNotValid"), e); +- } +- } +-} +diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties +index 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 + 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.48.1 + diff --git a/0003-Remove-StatementsTest.patch b/0003-Remove-StatementsTest.patch new file mode 100644 index 0000000..201a330 --- /dev/null +++ b/0003-Remove-StatementsTest.patch @@ -0,0 +1,87 @@ +From b9a7a929f547d1408c42aca31603d52518f6296b Mon Sep 17 00:00:00 2001 +From: Zuzana Miklankova +Date: Tue, 18 Jan 2022 15:04:09 +0100 +Subject: [PATCH] patch + +--- + .../regression/StatementRegressionTest.java | 50 ------------------- + 1 file changed, 50 deletions(-) + +diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java +index 7e5a5f8..8e77de5 100644 +--- a/src/test/java/testsuite/regression/StatementRegressionTest.java ++++ b/src/test/java/testsuite/regression/StatementRegressionTest.java +@@ -156,7 +156,6 @@ import com.mysql.cj.util.TimeUtil; + import testsuite.BaseQueryInterceptor; + import testsuite.BaseTestCase; + import testsuite.UnreliableSocketFactory; +-import testsuite.simple.StatementsTest; + + /** + * Regression tests for the Statement class +@@ -11607,20 +11606,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. +@@ -11648,41 +11633,6 @@ public class StatementRegressionTest extends BaseTestCase { + } + } + +- /** +- * Test fix for Bug#103612 (32902019), Incorrectly identified WITH...SELECT as unsafe for read-only connections. +- * +- * @throws Exception +- * +- * @see StatementsTest#testReadOnlySafeStatements() +- */ +- @Test +- public void testBug103612() throws Exception { +- assumeTrue(versionMeetsMinimum(8, 0, 1), "MySQL 8.0.1+ is required to run this test."); +- +- createTable("testBug103612", "(id INT)"); +- String query = "WITH cte AS (SELECT * FROM testBug103612) SELECT * FROM cte"; +- +- boolean useSPS = false; +- boolean readOnly = false; +- do { +- final String testCase = String.format("Case [SPS: %s, ReadOnly: %s]", useSPS ? "Y" : "N", readOnly ? "Y" : "N"); +- +- Properties props = new Properties(); +- props.setProperty(PropertyKey.useServerPrepStmts.getKeyName(), Boolean.toString(useSPS)); +- Connection testConn = getConnectionWithProps(props); +- testConn.setReadOnly(readOnly); +- +- try (Statement testStmt = testConn.createStatement()) { +- assertTrue(testStmt.execute(query), testCase); +- } +- try (PreparedStatement testPstmt = testConn.prepareStatement(query)) { +- assertTrue(testPstmt.execute(), testCase); +- } +- +- testConn.close(); +- } while ((useSPS = !useSPS) || (readOnly = !readOnly)); +- } +- + /** + * Tests fix for Bug#101389 (32089018), GETWARNINGS SHOULD CHECK WARNING COUNT BEFORE SENDING SHOW. + * +-- +2.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/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/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/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" diff --git a/mysql-connector-java-5.1.38-build.patch b/mysql-connector-java-5.1.38-build.patch deleted file mode 100644 index b78bb58..0000000 --- a/mysql-connector-java-5.1.38-build.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -Nru mysql-connector-j-5.1.38/build.xml mysql-connector-j-5.1.38.build/build.xml ---- mysql-connector-j-5.1.38/build.xml 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.build/build.xml 2015-12-08 09:12:11.344825605 +0100 -@@ -166,7 +166,6 @@ - - - -- - - - -- -+ - - - -@@ -193,8 +192,14 @@ - - - -- -- -+ -+ -+ -+ -+ -+ -+ -+ - - - -@@ -219,10 +224,10 @@ - - - -- -+ - - -- -+ - - - -@@ -230,34 +235,7 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ - - - -@@ -275,13 +253,10 @@ - - - -- -+ - - -- -- -- -- -+ - - - -@@ -813,39 +788,10 @@ - - -- -- -- -- -- Compiling MySQL Connector/J JDBC 3 implementation with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ depends="-compile-driver-jdbc4" /> - - -- -+ - Compiling MySQL Connector/J JDBC 4+ implementation with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -- Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J testsuite with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -949,7 +895,7 @@ - - - -- Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-c3p0 integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -970,7 +916,7 @@ - - - -- Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-jboss integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -991,7 +937,7 @@ - - - -- Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk5}' to '${compiler.output}' -+ Compiling MySQL Connector/J-log4j integration with '${com.mysql.jdbc.jdk8}' to '${compiler.output}' - - -+ source="1.6" -+ target="1.6"> - - - -@@ -1791,7 +1737,7 @@ - - - -- -+ - - - -@@ -1878,7 +1824,7 @@ - - - -- -+ - - - diff --git a/mysql-connector-java-5.1.38-jdbc4.1.patch b/mysql-connector-java-5.1.38-jdbc4.1.patch deleted file mode 100644 index 510f9d0..0000000 --- a/mysql-connector-java-5.1.38-jdbc4.1.patch +++ /dev/null @@ -1,2046 +0,0 @@ -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java ---- mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLConnectionProxy.java 2015-12-08 09:26:50.490672588 +0100 -@@ -23,13 +23,20 @@ - - package com.mysql.fabric.jdbc; - -+import java.sql.Blob; - import java.sql.CallableStatement; -+import java.sql.Clob; - import java.sql.DatabaseMetaData; -+import java.sql.NClob; - import java.sql.PreparedStatement; -+import java.sql.Savepoint; -+import java.sql.SQLClientInfoException; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLWarning; --import java.sql.Savepoint; -+import java.sql.SQLXML; - import java.sql.Statement; -+import java.sql.Struct; - import java.util.ArrayList; - import java.util.Calendar; - import java.util.Collections; -@@ -3057,4 +3064,42 @@ - - public void decachePreparedStatement(ServerPreparedStatement pstmt) throws SQLException { - } -+ -+ @Override -+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClientInfo(String name, String value) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public void setClientInfo(Properties properties) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public SQLXML createSQLXML() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob createNClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Blob createBlob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Clob createClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java ---- mysql-connector-j-5.1.38/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/fabric/jdbc/FabricMySQLDriver.java 2015-12-08 09:52:57.887620213 +0100 -@@ -28,6 +28,7 @@ - import java.sql.Driver; - import java.sql.DriverManager; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Properties; - import java.util.logging.Logger; - -@@ -103,7 +104,7 @@ - return super.parseURL(url.replaceAll("fabric:", ""), defaults); - } - -- public Logger getParentLogger() throws SQLException { -- throw new SQLException("no logging"); -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("no logging"); - } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/CallableStatement.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/CallableStatement.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/CallableStatement.java 2015-12-08 09:29:38.286340453 +0100 -@@ -33,10 +33,14 @@ - import java.sql.Blob; - import java.sql.Clob; - import java.sql.Date; -+import java.sql.NClob; - import java.sql.ParameterMetaData; - import java.sql.Ref; - import java.sql.ResultSet; -+import java.sql.RowId; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; - import java.sql.Time; - import java.sql.Timestamp; - import java.sql.Types; -@@ -2417,4 +2421,94 @@ - - return super.executeLargeBatch(); - } -+ -+ @Override -+ public void setNClob(String parameterName, NClob value) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(String parameterName, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getCharacterStream(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getCharacterStream(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getNCharacterStream(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getNCharacterStream(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob (int parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob (String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNString(String parameterName, String value) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setRowId(String parameterName, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/ConnectionImpl.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ConnectionImpl.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ConnectionImpl.java 2015-12-08 09:32:01.909242622 +0100 -@@ -35,12 +35,17 @@ - import java.nio.charset.CharsetEncoder; - import java.sql.Blob; - import java.sql.DatabaseMetaData; -+import java.sql.NClob; - import java.sql.ResultSet; - import java.sql.ResultSetMetaData; -+import java.sql.Savepoint; - import java.sql.SQLException; - import java.sql.SQLPermission; - import java.sql.SQLWarning; --import java.sql.Savepoint; -+import java.sql.SQLClientInfoException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; -+import java.sql.Struct; - import java.util.ArrayList; - import java.util.Calendar; - import java.util.Collections; -@@ -5587,4 +5592,69 @@ - public void setProfilerEventHandlerInstance(ProfilerEventHandler h) { - this.eventSink = h; - } -+ -+ @Override -+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getClientInfo(String name) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Properties getClientInfo() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClientInfo(String name, String value) throws SQLClientInfoException { -+ //throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClientInfo(Properties properties) throws SQLClientInfoException { -+ //throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isValid(int timeout) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML createSQLXML() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob createNClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Blob createBlob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Clob createClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/DatabaseMetaData.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/DatabaseMetaData.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/DatabaseMetaData.java 2015-12-08 09:34:19.920447597 +0100 -@@ -30,7 +30,9 @@ - import java.lang.reflect.Constructor; - import java.sql.PreparedStatement; - import java.sql.ResultSet; -+import java.sql.RowIdLifetime; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.Statement; - import java.sql.Types; - import java.util.ArrayList; -@@ -7889,4 +7891,24 @@ - public boolean generatedKeyAlwaysReturned() throws SQLException { - return true; - } -+ -+ @Override -+ public boolean autoCommitFailureClosesAllResultSets() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowIdLifetime getRowIdLifetime() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/CallableStatementWrapper.java 2015-12-08 10:01:06.280718457 +0100 -@@ -33,8 +33,12 @@ - import java.sql.CallableStatement; - import java.sql.Clob; - import java.sql.Date; -+import java.sql.NClob; - import java.sql.Ref; -+import java.sql.RowId; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; - import java.sql.Time; - import java.sql.Timestamp; - import java.util.Calendar; -@@ -2347,4 +2351,169 @@ - // throw SQLError.createSQLFeatureNotSupportedException(); - // } - -+ @Override -+ public T getObject(int parameterIndex, Class type) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T getObject(String parameterName, Class type) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBlob(String parameterName, InputStream inputStream) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClob(String parameterName, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNCharacterStream(String parameterName, Reader value) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setCharacterStream(String parameterName, java.io.Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBinaryStream(String parameterName, java.io.InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setAsciiStream(String parameterName, java.io.InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setCharacterStream(String parameterName, java.io.Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBinaryStream(String parameterName, java.io.InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setAsciiStream(String parameterName, java.io.InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClob (String parameterName, Clob x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBlob (String parameterName, Blob x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public java.io.Reader getCharacterStream(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public java.io.Reader getCharacterStream(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public java.io.Reader getNCharacterStream(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public java.io.Reader getNCharacterStream(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setSQLXML(String parameterName, SQLXML xmlObject) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob (String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob (int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBlob(String parameterName, InputStream inputStream, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClob(String parameterName, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(String parameterName, NClob value) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNCharacterStream(String parameterName, Reader value, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNString(String parameterName, String value) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setRowId(String parameterName, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(String parameterName) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(int parameterIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/ConnectionWrapper.java 2015-12-08 10:06:11.618782682 +0100 -@@ -24,9 +24,16 @@ - package com.mysql.jdbc.jdbc2.optional; - - import java.lang.reflect.Constructor; --import java.sql.SQLException; -+import java.sql.Blob; -+import java.sql.Clob; -+import java.sql.NClob; - import java.sql.Savepoint; -+import java.sql.SQLException; -+import java.sql.SQLClientInfoException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; - import java.sql.Statement; -+import java.sql.Struct; - import java.util.Map; - import java.util.Properties; - import java.util.TimeZone; -@@ -2872,4 +2879,68 @@ - public boolean isUseSSLExplicit() { - return this.mc.isUseSSLExplicit(); - } -+ -+ @Override -+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public java.sql.Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getClientInfo(String name) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Properties getClientInfo() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ @Override -+ public void setClientInfo(String name, String value) throws SQLClientInfoException { -+ //throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClientInfo(Properties properties) throws SQLClientInfoException { -+ //throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isValid(int timeout) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML createSQLXML() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob createNClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Blob createBlob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Clob createClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlConnectionPoolDataSource.java 2015-12-08 11:41:21.269740381 +0100 -@@ -25,6 +25,9 @@ - - import java.sql.Connection; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+ -+import java.util.logging.Logger; - - import javax.sql.ConnectionPoolDataSource; - import javax.sql.PooledConnection; -@@ -69,4 +72,10 @@ - - return mysqlPooledConnection; - } -+ -+ @Override -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlDataSource.java 2015-12-08 10:47:50.251616360 +0100 -@@ -26,8 +26,10 @@ - import java.io.PrintWriter; - import java.io.Serializable; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.Iterator; - import java.util.Properties; -+import java.util.logging.Logger; - - import javax.naming.NamingException; - import javax.naming.Reference; -@@ -429,4 +431,19 @@ - // public T unwrap(Class iface) throws SQLException { - // throw SQLError.createSQLFeatureNotSupportedException(); - // } -+ -+ @Override -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlPooledConnection.java 2015-12-08 11:40:57.780887627 +0100 -@@ -26,6 +26,7 @@ - import java.lang.reflect.Constructor; - import java.sql.Connection; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.HashMap; - import java.util.Iterator; - import java.util.Map; -@@ -33,6 +34,7 @@ - import javax.sql.ConnectionEvent; - import javax.sql.ConnectionEventListener; - import javax.sql.PooledConnection; -+import javax.sql.StatementEventListener; - - import com.mysql.jdbc.ExceptionInterceptor; - import com.mysql.jdbc.SQLError; -@@ -230,4 +232,12 @@ - protected ExceptionInterceptor getExceptionInterceptor() { - return this.exceptionInterceptor; - } --} -\ Manca newline alla fine del file -+ -+ @Override -+ public void addStatementEventListener(StatementEventListener listener) {} -+ -+ @Override -+ public void removeStatementEventListener(StatementEventListener listener) {} -+ -+ -+} -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXAConnection.java 2015-12-08 10:20:13.352619255 +0100 -@@ -27,6 +27,7 @@ - import java.sql.Connection; - import java.sql.ResultSet; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.Statement; - import java.util.ArrayList; - import java.util.Collections; -@@ -34,6 +35,7 @@ - import java.util.List; - import java.util.Map; - -+import javax.sql.StatementEventListener; - import javax.sql.XAConnection; - import javax.transaction.xa.XAException; - import javax.transaction.xa.XAResource; -@@ -612,4 +614,10 @@ - - return connToWrap; - } -+ -+ @Override -+ public void addStatementEventListener(StatementEventListener listener) {} -+ -+ @Override -+ public void removeStatementEventListener(StatementEventListener listener) {} - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/MysqlXADataSource.java 2015-12-08 11:41:10.622260427 +0100 -@@ -25,6 +25,9 @@ - - import java.sql.Connection; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+ -+import java.util.logging.Logger; - - import javax.sql.XAConnection; - -@@ -69,4 +72,11 @@ - - return MysqlXAConnection.getInstance((com.mysql.jdbc.Connection) conn, getLogXaCommands()); - } --} -\ Manca newline alla fine del file -+ -+ @Override -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ -+} -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/PreparedStatementWrapper.java 2015-12-08 09:58:13.636163459 +0100 -@@ -32,12 +32,16 @@ - import java.sql.Blob; - import java.sql.Clob; - import java.sql.Date; -+import java.sql.NClob; - import java.sql.ParameterMetaData; - import java.sql.PreparedStatement; - import java.sql.Ref; - import java.sql.ResultSet; - import java.sql.ResultSetMetaData; -+import java.sql.RowId; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; - import java.sql.Time; - import java.sql.Timestamp; - import java.util.Calendar; -@@ -1103,4 +1107,106 @@ - - return -1; // we actually never get here, but the compiler can't figure that out - } -+ -+ public void setNClob(String parameterName, NClob value) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void setNClob(String parameterName, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void setNClob(String parameterName, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(int parameterName, NClob value) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(int parameterName, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(int parameterName, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBlob(int parameterIndex, InputStream inputStream) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClob(int parameterIndex, Reader reader) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNCharacterStream(int parameterIndex, Reader value) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setCharacterStream(int parameterIndex, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBinaryStream(int parameterIndex, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setAsciiStream(int parameterIndex, InputStream x) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setCharacterStream(int parameterIndex, Reader reader, long length) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBinaryStream(int parameterIndex, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setAsciiStream(int parameterIndex, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setBlob(int parameterIndex, InputStream inputStream, long length) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClob(int parameterIndex, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNCharacterStream(int parameterIndex, Reader value, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNString(int parameterIndex, String value) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setRowId(int parameterIndex, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/StatementWrapper.java 2015-12-08 09:55:34.640943754 +0100 -@@ -27,6 +27,7 @@ - import java.sql.Connection; - import java.sql.ResultSet; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLWarning; - import java.sql.Statement; - -@@ -910,4 +911,39 @@ - checkAndFireConnectionError(sqlEx); - } - } -+ -+ @Override -+ public boolean isCloseOnCompletion() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void closeOnCompletion() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isPoolable() throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setPoolable(boolean poolable) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isClosed() throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/jdbc2/optional/SuspendableXAConnection.java 2015-12-08 10:21:38.622450562 +0100 -@@ -25,9 +25,11 @@ - - import java.lang.reflect.Constructor; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.HashMap; - import java.util.Map; - -+import javax.sql.StatementEventListener; - import javax.sql.XAConnection; - import javax.transaction.xa.XAException; - import javax.transaction.xa.XAResource; -@@ -199,4 +201,10 @@ - this.currentXAConnection.close(); - } - } -+ -+ @Override -+ public void addStatementEventListener(StatementEventListener listener) {} -+ -+ @Override -+ public void removeStatementEventListener(StatementEventListener listener) {} - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4Connection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4Connection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4Connection.java 2015-12-08 10:29:24.516673808 +0100 -@@ -27,11 +27,13 @@ - import java.sql.Clob; - import java.sql.SQLClientInfoException; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLXML; - import java.sql.NClob; - import java.sql.Struct; - import java.util.Properties; - import java.util.TimerTask; -+import java.util.concurrent.Executor; - - import com.mysql.jdbc.ConnectionImpl; - import com.mysql.jdbc.Messages; -@@ -197,7 +199,7 @@ - /** - * @see java.sql.Connection#createClob() - */ -- public Clob createClob() { -+ public com.mysql.jdbc.Clob createClob() throws SQLException { - return new com.mysql.jdbc.Clob(getExceptionInterceptor()); - } - -@@ -233,4 +235,24 @@ - return this.infoProvider; - } - } -+ -+ public int getNetworkTimeout() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void setNetworkTimeout(Executor executor, int millis) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void abort(Executor executor) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public String getSchema() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void setSchema(String schema) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4LoadBalancedMySQLConnection.java 2015-12-08 10:35:39.864323718 +0100 -@@ -27,11 +27,13 @@ - import java.sql.Clob; - import java.sql.SQLClientInfoException; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLXML; - import java.sql.NClob; - import java.sql.Struct; - import java.util.Properties; - import java.util.TimerTask; -+import java.util.concurrent.Executor; - - import com.mysql.jdbc.ConnectionImpl; - import com.mysql.jdbc.LoadBalancedMySQLConnection; -@@ -100,21 +102,24 @@ - /** - * @see java.sql.Connection#createBlob() - */ -- public Blob createBlob() { -+ @Override -+ public Blob createBlob() throws SQLException { - return this.getJDBC4Connection().createBlob(); - } - - /** - * @see java.sql.Connection#createClob() - */ -- public Clob createClob() { -+ @Override -+ public Clob createClob() throws SQLException { - return this.getJDBC4Connection().createClob(); - } - - /** - * @see java.sql.Connection#createNClob() - */ -- public NClob createNClob() { -+ @Override -+ public NClob createNClob() throws SQLException { - return this.getJDBC4Connection().createNClob(); - } - -@@ -123,4 +128,24 @@ - return this.getJDBC4Connection().getClientInfoProviderImpl(); - } - } -+ -+ public int getNetworkTimeout() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void setNetworkTimeout(Executor executor, int millis) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void abort(Executor executor) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public String getSchema() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ public void setSchema(String schema) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MultiHostMySQLConnection.java 2015-12-08 10:40:11.658036198 +0100 -@@ -109,7 +109,7 @@ - /** - * @see java.sql.Connection#createClob() - */ -- public Clob createClob() { -+ public Clob createClob() throws SQLException { - return this.getJDBC4Connection().createClob(); - } - -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4MySQLConnection.java 2015-12-08 10:32:18.950146061 +0100 -@@ -59,11 +59,14 @@ - - public T unwrap(java.lang.Class iface) throws java.sql.SQLException; - -- public Blob createBlob(); -+ @Override -+ public Blob createBlob() throws SQLException; - -- public Clob createClob(); -+ @Override -+ public Clob createClob() throws SQLException; - -- public NClob createNClob(); -+ @Override -+ public NClob createNClob() throws SQLException; - - /* - * Non standard methods: -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/JDBC4ReplicationMySQLConnection.java 2015-12-08 10:42:43.205627302 +0100 -@@ -100,21 +100,21 @@ - /** - * @see java.sql.Connection#createBlob() - */ -- public Blob createBlob() { -+ public Blob createBlob() throws SQLException { - return this.getJDBC4Connection().createBlob(); - } - - /** - * @see java.sql.Connection#createClob() - */ -- public Clob createClob() { -+ public Clob createClob() throws SQLException { - return this.getJDBC4Connection().createClob(); - } - - /** - * @see java.sql.Connection#createNClob() - */ -- public NClob createNClob() { -+ public NClob createNClob() throws SQLException { - return this.getJDBC4Connection().createNClob(); - } - -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/LoadBalancedMySQLConnection.java 2015-12-08 09:43:09.373440687 +0100 -@@ -23,7 +23,16 @@ - - package com.mysql.jdbc; - -+import java.sql.Array; -+import java.sql.Blob; -+import java.sql.Clob; -+import java.sql.NClob; -+import java.sql.SQLClientInfoException; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; -+import java.sql.Struct; -+import java.util.Properties; - - public class LoadBalancedMySQLConnection extends MultiHostMySQLConnection implements LoadBalancedConnection { - -@@ -65,4 +74,67 @@ - public void removeHostWhenNotInUse(String host) throws SQLException { - getThisAsProxy().removeHostWhenNotInUse(host); - } -+ -+ @Override -+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getClientInfo(String name) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Properties getClientInfo() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClientInfo(Properties properties) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public void setClientInfo(String name, String value) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public boolean isValid(int timeout) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML createSQLXML() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob createNClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Blob createBlob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Clob createClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/MultiHostMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/MultiHostMySQLConnection.java 2015-12-08 09:40:49.551288000 +0100 -@@ -23,13 +23,21 @@ - - package com.mysql.jdbc; - -+import java.sql.Array; -+import java.sql.Blob; - import java.sql.CallableStatement; -+import java.sql.Clob; - import java.sql.DatabaseMetaData; -+import java.sql.NClob; - import java.sql.PreparedStatement; -+import java.sql.Savepoint; -+import java.sql.SQLClientInfoException; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLWarning; --import java.sql.Savepoint; -+import java.sql.SQLXML; - import java.sql.Statement; -+import java.sql.Struct; - import java.util.Calendar; - import java.util.List; - import java.util.Map; -@@ -2467,4 +2475,67 @@ - public boolean isUseSSLExplicit() { - return getActiveMySQLConnection().isUseSSLExplicit(); - } -+ -+ @Override -+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getClientInfo(String name) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Properties getClientInfo() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClientInfo(Properties properties) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public void setClientInfo(String name, String value) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public boolean isValid(int timeout) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML createSQLXML() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob createNClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Blob createBlob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Clob createClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/NonRegisteringDriver.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/NonRegisteringDriver.java 2015-12-08 09:48:44.474030279 +0100 -@@ -31,6 +31,7 @@ - import java.net.URLDecoder; - import java.sql.DriverPropertyInfo; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.util.ArrayList; - import java.util.Iterator; - import java.util.List; -@@ -38,6 +39,7 @@ - import java.util.Properties; - import java.util.StringTokenizer; - import java.util.concurrent.ConcurrentHashMap; -+import java.util.logging.Logger; - - /** - * The Java SQL framework allows for multiple database drivers. Each driver should supply a class that implements the Driver interface -@@ -900,4 +902,9 @@ - } - } - } -+ -+ @Override -+ public Logger getParentLogger() throws SQLFeatureNotSupportedException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/PreparedStatement.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/PreparedStatement.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/PreparedStatement.java 2015-12-08 09:18:58.861657157 +0100 -@@ -43,9 +43,13 @@ - import java.sql.Clob; - import java.sql.DatabaseMetaData; - import java.sql.Date; -+import java.sql.NClob; - import java.sql.ParameterMetaData; - import java.sql.Ref; -+import java.sql.RowId; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; - import java.sql.Time; - import java.sql.Timestamp; - import java.sql.Types; -@@ -5093,4 +5097,19 @@ - public long executeLargeUpdate() throws SQLException { - return executeUpdateInternal(true, false); - } -+ -+ @Override -+ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException{ -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setNClob(int parameterIndex, NClob value) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setRowId(int parameterIndex, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/ReplicationMySQLConnection.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ReplicationMySQLConnection.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ReplicationMySQLConnection.java 2015-12-08 09:46:47.726747579 +0100 -@@ -23,7 +23,16 @@ - - package com.mysql.jdbc; - -+import java.sql.Array; -+import java.sql.Blob; -+import java.sql.Clob; -+import java.sql.NClob; -+import java.sql.SQLClientInfoException; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; -+import java.sql.SQLXML; -+import java.sql.Struct; -+import java.util.Properties; - import java.util.Properties; - import java.util.concurrent.Executor; - -@@ -173,4 +182,67 @@ - public void setProxy(MySQLConnection proxy) { - getThisAsProxy().setProxy(proxy); - } -+ -+ @Override -+ public Struct createStruct(String typeName, Object[] attributes) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Array createArrayOf(String typeName, Object[] elements) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getClientInfo(String name) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Properties getClientInfo() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void setClientInfo(Properties properties) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public void setClientInfo(String name, String value) throws SQLClientInfoException { -+ } -+ -+ @Override -+ public boolean isValid(int timeout) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML createSQLXML() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob createNClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Blob createBlob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Clob createClob() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/com/mysql/jdbc/ResultSetImpl.java mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java ---- mysql-connector-j-5.1.38/src/com/mysql/jdbc/ResultSetImpl.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/com/mysql/jdbc/ResultSetImpl.java 2015-12-08 09:22:34.388389716 +0100 -@@ -27,6 +27,7 @@ - import java.io.IOException; - import java.io.InputStream; - import java.io.ObjectInputStream; -+import java.io.Reader; - import java.io.StringReader; - import java.io.UnsupportedEncodingException; - import java.lang.reflect.Constructor; -@@ -36,9 +37,13 @@ - import java.net.URL; - import java.sql.Array; - import java.sql.Date; -+import java.sql.NClob; - import java.sql.Ref; -+import java.sql.RowId; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLWarning; -+import java.sql.SQLXML; - import java.sql.Time; - import java.sql.Timestamp; - import java.sql.Types; -@@ -7923,4 +7928,249 @@ - protected ExceptionInterceptor getExceptionInterceptor() { - return this.exceptionInterceptor; - } -+ -+ @Override -+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(int columnIndex, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(int columnIndex, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getNCharacterStream(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getNCharacterStream(String columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(String columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(String columnLabel) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob(String columnLabel) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNString(String columnLabel, String nString) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNString(int columnLabel, String nString) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public int getHoldability() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateRowId(int columnIndex, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateRowId(String columnLabel, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(String columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - } -diff -Nru mysql-connector-j-5.1.38/src/testsuite/regression/StatementRegressionTest.java mysql-connector-j-5.1.38.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java ---- mysql-connector-j-5.1.38/src/testsuite/regression/StatementRegressionTest.java 2015-12-02 02:13:22.000000000 +0100 -+++ mysql-connector-j-5.1.38.jdbc-4.1/src/testsuite/regression/StatementRegressionTest.java 2015-12-08 10:53:58.790597660 +0100 -@@ -47,12 +47,16 @@ - import java.sql.Connection; - import java.sql.DataTruncation; - import java.sql.Date; -+import java.sql.NClob; - import java.sql.PreparedStatement; - import java.sql.Ref; - import java.sql.ResultSet; - import java.sql.ResultSetMetaData; -+import java.sql.RowId; - import java.sql.SQLException; -+import java.sql.SQLFeatureNotSupportedException; - import java.sql.SQLWarning; -+import java.sql.SQLXML; - import java.sql.Statement; - import java.sql.Time; - import java.sql.Timestamp; -@@ -2264,7 +2268,8 @@ - - try { - pStmt = this.conn.prepareStatement("INSERT INTO testNullClob VALUES (?)"); -- pStmt.setClob(1, null); -+ Clob x = null; -+ pStmt.setClob(1, x); - pStmt.executeUpdate(); - } finally { - if (pStmt != null) { -@@ -4542,6 +4547,261 @@ - public int getBytesSize() throws SQLException { - return 0; - } -+ -+ @Override -+ public T getObject(int columnIndex, Class type) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T getObject(String columnLabel, Class type) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(int columnIndex, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(int columnIndex, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getNCharacterStream(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public Reader getNCharacterStream(String columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public String getNString(String columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public SQLXML getSQLXML(String columnLabel) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public NClob getNClob(String columnLabel) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNString(String columnLabel, String nString) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateNString(int columnLabel, String nString) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public int getHoldability() throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateRowId(int columnIndex, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public void updateRowId(String columnLabel, RowId x) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(int columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public RowId getRowId(String columnIndex) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } -+ -+ @Override -+ public T unwrap(Class iface) throws SQLException { -+ throw new SQLFeatureNotSupportedException("Not supported"); -+ } - }; - } - diff --git a/mysql-connector-java-hibernate.patch b/mysql-connector-java-hibernate.patch deleted file mode 100644 index ff39383..0000000 --- a/mysql-connector-java-hibernate.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up --recursive mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java ---- mysql-connector-java-5.1.36.orig/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java 2015-06-19 21:26:19.000000000 +0200 -+++ mysql-connector-java-5.1.36/src/com/mysql/fabric/hibernate/FabricMultiTenantConnectionProvider.java 2015-07-14 17:07:23.750395725 +0200 -@@ -27,7 +27,7 @@ import java.sql.Connection; - import java.sql.DriverManager; - import java.sql.SQLException; - --import org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider; -+import org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider; - - import com.mysql.fabric.FabricCommunicationException; - import com.mysql.fabric.FabricConnection; -diff -up --recursive mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java ---- mysql-connector-java-5.1.36.orig/src/demo/fabric/HibernateFabric.java 2015-06-19 21:26:20.000000000 +0200 -+++ mysql-connector-java-5.1.36/src/demo/fabric/HibernateFabric.java 2015-07-14 17:14:19.676360531 +0200 -@@ -30,7 +30,7 @@ import java.sql.Statement; - import org.hibernate.Session; - import org.hibernate.SessionFactory; - import org.hibernate.cfg.Configuration; --import org.hibernate.service.ServiceRegistryBuilder; -+import org.hibernate.boot.registry.StandardServiceRegistryBuilder; - - import com.mysql.fabric.hibernate.FabricMultiTenantConnectionProvider; - -@@ -107,13 +107,13 @@ public class HibernateFabric { - // creating this here allows passing needed params to the constructor - FabricMultiTenantConnectionProvider connProvider = new FabricMultiTenantConnectionProvider(fabricUrl, "employees", "employees", username, password, - fabricUser, fabricPassword); -- ServiceRegistryBuilder srb = new ServiceRegistryBuilder(); -- srb.addService(org.hibernate.service.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider); -+ StandardServiceRegistryBuilder srb = new StandardServiceRegistryBuilder(); -+ srb.addService(org.hibernate.engine.jdbc.connections.spi.MultiTenantConnectionProvider.class, connProvider); - srb.applySetting("hibernate.dialect", "org.hibernate.dialect.MySQLInnoDBDialect"); - - Configuration config = new Configuration(); - config.setProperty("hibernate.multiTenancy", "DATABASE"); - config.addResource("com/mysql/fabric/demo/employee.hbm.xml"); -- return config.buildSessionFactory(srb.buildServiceRegistry()); -+ return config.buildSessionFactory(srb.build()); - } - } diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 4c6f91d..74bd3fb 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,58 +1,27 @@ -%global builddir build-mysql-jdbc -%global distdir dist-mysql-jdbc +Name: mysql-connector-java +Epoch: 1 +Version: 8.0.30 +Release: %autorelease +Summary: Official JDBC driver for MySQL +License: GPL-2.0-only +URL: https://dev.mysql.com/downloads/connector/j/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch -Summary: Official JDBC driver for MySQL -Name: mysql-connector-java -Version: 5.1.38 -Release: 3%{?dist} -Epoch: 1 -License: GPLv2 with exceptions -URL: http://dev.mysql.com/downloads/connector/j/ -Source0: %{name}-%{version}-nojars.tar.xz +# Generated with generate-tarball.sh +Source0: %{name}-%{version}-nojars.tar.xz +Source1: generate-tarball.sh -# 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 -# src/lib/c3p0-0.9.1-pre6.jar -# src/lib/c3p0-0.9.1-pre6.src.zip -# src/lib/jboss-common-jdbc-wrapper.jar -# src/lib/jboss-common-jdbc-wrapper-src.jar -# src/lib/slf4j-api-1.6.1.jar -# -# See http://bugs.mysql.com/bug.php?id=28512 for details. +Patch: 0001-Remove-coverage-test.patch +Patch: 0002-Remove-authentication-plugin.patch +Patch: 0003-Remove-StatementsTest.patch +Patch: 0004-Port-to-Java-21.patch -# 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 -# Patch to build with JDBC 4.1/Java 7 -Patch0: %{name}-5.1.38-jdbc4.1.patch -# Add system libraries -Patch1: %{name}-5.1.38-build.patch -Patch2: %{name}-hibernate.patch - -BuildArch: noarch - -BuildRequires: ant >= 1.6.0 -BuildRequires: ant-contrib >= 1.0 -BuildRequires: apache-commons-logging -BuildRequires: c3p0 -BuildRequires: git -BuildRequires: hibernate-core -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: javapackages-local -BuildRequires: jta >= 1.0 -BuildRequires: junit -BuildRequires: slf4j - -Requires: jta >= 1.0 -Requires: slf4j +BuildRequires: javapackages-local-openjdk25 +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,293 +33,32 @@ IV JDBC driver and has a complete JDBC feature set that supports the capabilities of MySQL. %prep -%setup -q -n mysql-connector-j-%{version} +%autosetup -p1 -C -# fix line endings -for file in README README.md; do - sed -i.orig 's|\r||g' $file - touch -r $file.orig $file - rm $file.orig -done - -sed -i 's/>@.*%{version} - 1: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 diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..36643ec --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,9 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: main +execute: + how: tmt +context: + jpv_flavor: generic diff --git a/sources b/sources index eff112c..3e8ac7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5046a52bd83db0606aed412735f9abfd mysql-connector-java-5.1.38-nojars.tar.xz +SHA512 (mysql-connector-java-8.0.30-nojars.tar.xz) = 592cd88f7d2f7daec2513846a4f75d2f8b5bc0acec286c5da56e62cfc5366ed62b8bd5c4a120f41f0e2eae3a1889e1ff237dee80c021d27e732bdf604398442d