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

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