rpms/mysql-connector-java
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rebase to version 8.0.28

Browse source
This commit is contained in:
Zuzana Miklankova 2022-01-18 15:13:55 +01:00
commit ceef1d97bc
6 changed files with 52 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -21,3 +21,4 @@
/mysql-connector-java-8.0.25-nojars.tar.xz
/mysql-connector-java-8.0.26-nojars.tar.xz
/mysql-connector-java-8.0.27-nojars.tar.xz
/mysql-connector-java-8.0.28-nojars.tar.xz

5
mysql-connector-java.spec
View file

@ -1,7 +1,7 @@
Summary: Official JDBC driver for MySQL
Name: mysql-connector-java
Version: 8.0.27
Version: 8.0.28
Release: 1%{?dist}
Epoch: 1
License: GPLv2 with exceptions
@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \
%license LICENSE
%changelog
* Tue Jan 18 2022 Zuzana Miklankova <zmiklank@redhat.com> - 1:8.0.28-1
- rebase to version 8.0.28
* Tue Oct 19 2021 Zuzana Miklankova <zmiklank@redhat.com> - 1:8.0.27-1
- rebase to version 8.0.27

31
remove-StatementsTest.patch
View file

@ -1,17 +1,17 @@
From b113bc5ed38da669a0cf2b88bf35905218b01cfd Mon Sep 17 00:00:00 2001
From b9a7a929f547d1408c42aca31603d52518f6296b Mon Sep 17 00:00:00 2001
From: Zuzana Miklankova <zmiklank@redhat.com>
Date: Tue, 19 Oct 2021 15:31:36 +0200
Subject: [PATCH] removing StatementsTest because of missing dependencies
Date: Tue, 18 Jan 2022 15:04:09 +0100
Subject: [PATCH] patch
---
.../regression/StatementRegressionTest.java | 51 -------------------
1 file changed, 51 deletions(-)
.../regression/StatementRegressionTest.java | 50 -------------------
1 file changed, 50 deletions(-)
diff --git a/src/test/java/testsuite/regression/StatementRegressionTest.java b/src/test/java/testsuite/regression/StatementRegressionTest.java
index 5845c71e..f68fd9dd 100644
index b5c53e9a..89483a07 100644
--- a/src/test/java/testsuite/regression/StatementRegressionTest.java
+++ b/src/test/java/testsuite/regression/StatementRegressionTest.java
@@ -151,7 +151,6 @@ import com.mysql.cj.util.TimeUtil;
@@ -154,7 +154,6 @@ import com.mysql.cj.util.TimeUtil;
import testsuite.BaseQueryInterceptor;
import testsuite.BaseTestCase;
import testsuite.UnreliableSocketFactory;
@ -19,7 +19,7 @@ index 5845c71e..f68fd9dd 100644
/**
* Regression tests for the Statement class
@@ -11599,21 +11598,6 @@ public class StatementRegressionTest extends BaseTestCase {
@@ -11602,20 +11601,6 @@ public class StatementRegressionTest extends BaseTestCase {
}
}
@ -37,15 +37,13 @@ index 5845c71e..f68fd9dd 100644
- return null;
- });
- }
-
/**
* Tests fix for Bug#71929 (18346501), Prefixing query with double comments cancels query DML validation.
*
@@ -11639,39 +11623,4 @@ public class StatementRegressionTest extends BaseTestCase {
});
@@ -11643,41 +11628,6 @@ public class StatementRegressionTest extends BaseTestCase {
}
}
-
- /**
- * Test fix for Bug#103612 (32902019), Incorrectly identified WITH...SELECT as unsafe for read-only connections.
- *
@ -80,7 +78,10 @@ index 5845c71e..f68fd9dd 100644
- testConn.close();
- } while ((useSPS = !useSPS) || (readOnly = !readOnly));
- }
}
-
/**
* Tests fix for Bug#101389 (32089018), GETWARNINGS SHOULD CHECK WARNING COUNT BEFORE SENDING SHOW.
*
--
2.31.1
2.34.1

29
remove-authentication-plugin.patch
View file

@ -1,8 +1,8 @@
From 74cb8dc7c3100f5dddfe640519488dc8e2a49bd1 Mon Sep 17 00:00:00 2001
From 47793b89300a19c5fd13b781f03dd580fc0186a6 Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Tue, 19 Oct 2021 14:35:41 +0200
Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle
dependency
Date: Tue, 18 Jan 2022 14:58:57 +0100
Subject: [PATCH] remove AuthenticationOciClient plugin due to missing
oracle dependency
---
.../a/NativeAuthenticationProvider.java | 2 -
@ -12,18 +12,18 @@ Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle
delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
index b53ea98..c1f1a41 100644
index e1b59182..44bc5290 100644
--- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
+++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
@@ -55,7 +55,6 @@ import com.mysql.cj.protocol.ServerSession;
import com.mysql.cj.protocol.a.NativeConstants.IntegerDataType;
import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType;
@@ -57,7 +57,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType;
import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType;
-import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient;
import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient;
import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin;
-import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient;
import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin;
@@ -254,7 +253,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider<Nati
import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin;
import com.mysql.cj.protocol.a.authentication.MysqlNativePasswordPlugin;
@@ -255,7 +254,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider<Nati
pluginsToInit.add(new MysqlOldPasswordPlugin());
pluginsToInit.add(new AuthenticationLdapSaslClientPlugin());
pluginsToInit.add(new AuthenticationKerberosClient());
@ -33,7 +33,7 @@ index b53ea98..c1f1a41 100644
String authenticationPluginClasses = this.propertySet.getStringProperty(PropertyKey.authenticationPlugins).getValue();
diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
deleted file mode 100644
index 7d444ba..0000000
index 528731d7..00000000
--- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
+++ /dev/null
@@ -1,175 +0,0 @@
@ -155,7 +155,7 @@ index 7d444ba..0000000
-
- if (!this.sourceOfAuthData.equals(PLUGIN_NAME) || fromServer.getPayloadLength() == 0) {
- // Cannot do anything with whatever payload comes from the server, so just skip this iteration and wait for a Protocol::AuthSwitchRequest or a
- // Protocol::AuthMoreData.
- // Protocol::AuthNextFactor.
- toServer.add(new NativePacketPayload(0));
- return true;
- }
@ -213,7 +213,7 @@ index 7d444ba..0000000
- }
-}
diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
index 6b8dd34..d853ee0 100644
index 2b9704d9..20c3062e 100644
--- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
+++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
@@ -44,12 +44,6 @@ AuthenticationLdapSaslClientPlugin.MissingLdapServerHostname=An LDAP Server host
@ -230,4 +230,5 @@ index 6b8dd34..d853ee0 100644
AuthenticationProvider.BadDefaultAuthenticationPlugin=Improper value "{0}" for property ''defaultAuthenticationPlugin''.
AuthenticationProvider.DefaultAuthenticationPluginIsNotListed=Default authentication plugin "{0}" is neither one of the built-in plugins nor one of the plugins listed in ''authenticationPlugins''.
--
2.31.1
2.34.1

28
remove-coverage-test.patch
View file

@ -1,17 +1,17 @@
From 398f1c3885c565ae080cb40046728612b583d90d Mon Sep 17 00:00:00 2001
From aca78bd6710ba4f7556c44abfb9e7ae6793c8e3d Mon Sep 17 00:00:00 2001
From: Ondrej Dubaj <odubaj@redhat.com>
Date: Tue, 11 May 2021 09:45:27 +0200
Date: Tue, 18 Jan 2022 14:51:24 +0100
Subject: [PATCH] Remove coverage test
---
build.xml | 157 ------------------------------------------------------
1 file changed, 157 deletions(-)
build.xml | 159 ------------------------------------------------------
1 file changed, 159 deletions(-)
diff --git a/build.xml b/build.xml
index a7d82b62..bd0355b4 100644
index c65df525..cc39d88d 100644
--- a/build.xml
+++ b/build.xml
@@ -1285,76 +1285,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -1285,79 +1285,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</condition>
<echo>${com.mysql.cj.testsuite.message.test.mode}</echo>
@ -32,6 +32,9 @@ index a7d82b62..bd0355b4 100644
- </and>
- </condition>
-
- <!-- ant 1.10.10 and above print report summaries to the console from where test counts can be retrieved. -->
- <antversion property="com.mysql.cj.testsuite.ant.version" atleast="1.10.10" />
-
- <junitlauncher haltOnFailure="false" printSummary="true" failureProperty="com.mysql.cj.testsuite.junit.fail">
- <classpath refid="com.mysql.cj.testsuite.build.classpath" />
-
@ -44,7 +47,7 @@ index a7d82b62..bd0355b4 100644
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" />
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </test>
@ -58,7 +61,7 @@ index a7d82b62..bd0355b4 100644
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" />
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </test>
@ -73,7 +76,7 @@ index a7d82b62..bd0355b4 100644
- <jvmarg value="${com.mysql.cj.testsuite.test.coverage.jvmargfinal}" />
- <syspropertyset refid="junit.system.properties" />
- </fork>
- <listener classname="testsuite.JUnitSummary" />
- <listener classname="testsuite.JUnitSummary" unless="com.mysql.cj.testsuite.ant.version" />
- <listener type="legacy-xml" sendSysOut="true" sendSysErr="true" />
- <listener type="legacy-plain" sendSysOut="true" sendSysErr="true" />
- </testclasses>
@ -88,7 +91,7 @@ index a7d82b62..bd0355b4 100644
<!-- Don't fail the build if we're doing coverage test. -->
<fail message="Tests failed. Check logs and/or reports in '${com.mysql.cj.testsuite.junit.results}'.">
@@ -1367,93 +1297,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
@@ -1370,92 +1297,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o
</target>
@ -178,10 +181,9 @@ index a7d82b62..bd0355b4 100644
- <isset property="com.mysql.cj.coverage.report.dir" />
- </condition>
- </target>
-
<!-- ***************************** -->
<!-- ***** RPM/DEB PACKAGING ***** -->
--
2.31.1
2.34.1

2
sources
View file

@ -1 +1 @@
SHA512 (mysql-connector-java-8.0.27-nojars.tar.xz) = db07ad394a1558123fd3e6b353685e804b0863dc412bfba2375666aa9ccc44e023888b043e836a6dffcef237ce212fa55ddc3738373243bd0ef03e4c4713efe7
SHA512 (mysql-connector-java-8.0.28-nojars.tar.xz) = 5b8c66b28463849334a03679866914fc2b9c7d5e3c01308f9467e9b5d3fcbc934b3cdb4b46b611ab60d5ea2cda77c7458840773d56d1fb5d0cf7d2b37653de6c