From 8fa7fb030b64bcd2822efa6081ae569bbc45d378 Mon Sep 17 00:00:00 2001
From: Zuzana Miklankova <zmiklank@redhat.com>
Date: Tue, 26 Apr 2022 10:34:44 +0200
Subject: [PATCH] rebase to upstream version 8.0.29

---
 mysql-connector-java.spec          |  7 +++++--
 remove-authentication-plugin.patch | 33 +++++++++++++++---------------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index deb43d2..2beb6ea 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -1,8 +1,8 @@
 
 Summary:       Official JDBC driver for MySQL
 Name:          mysql-connector-java
-Version:       8.0.28
-Release:       3%{?dist}
+Version:       8.0.29
+Release:       1%{?dist}
 Epoch:         1
 License:       GPLv2 with exceptions
 URL:           http://dev.mysql.com/downloads/connector/j/
@@ -106,6 +106,9 @@ ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-11-openjdk \
 %license LICENSE
 
 %changelog
+* Tue Apr 26 2022 Zuzana Miklankova <zmiklank@redhat.com> - 1:8.0.29-1
+- rebase to version 8.0.29
+
 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1:8.0.28-3
 - Rebuilt for java-17-openjdk as system jdk
 
diff --git a/remove-authentication-plugin.patch b/remove-authentication-plugin.patch
index d2ee0a2..a7e41e0 100644
--- a/remove-authentication-plugin.patch
+++ b/remove-authentication-plugin.patch
@@ -1,44 +1,43 @@
 From 47793b89300a19c5fd13b781f03dd580fc0186a6 Mon Sep 17 00:00:00 2001
 From: Ondrej Dubaj <odubaj@redhat.com>
 Date: Tue, 18 Jan 2022 14:58:57 +0100
-Subject: [PATCH] remove AuthenticationOciClient plugin due to missing
- oracle dependency
+Subject: [PATCH] remove AuthenticationOciClient plugin due to missing oracle dependency
 
 ---
  .../a/NativeAuthenticationProvider.java       |   2 -
- .../AuthenticationOciClient.java              | 175 ------------------
+ .../AuthenticationOciClient.java              | 177 ------------------
  .../cj/LocalizedErrorMessages.properties      |   6 -
- 3 files changed, 183 deletions(-)
+ 3 files changed, 185 deletions(-)
  delete mode 100644 src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
 
 diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
-index e1b59182..44bc5290 100644
+index 0d94061d..58bbf23b 100644
 --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
 +++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java
-@@ -57,7 +57,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringLengthDataType;
- import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType;
+@@ -58,7 +58,6 @@ import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType;
+ import com.mysql.cj.protocol.a.authentication.AuthenticationFidoClient;
  import com.mysql.cj.protocol.a.authentication.AuthenticationKerberosClient;
  import com.mysql.cj.protocol.a.authentication.AuthenticationLdapSaslClientPlugin;
 -import com.mysql.cj.protocol.a.authentication.AuthenticationOciClient;
  import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin;
  import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin;
  import com.mysql.cj.protocol.a.authentication.MysqlNativePasswordPlugin;
-@@ -255,7 +254,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider<Nati
+@@ -256,7 +255,6 @@ public class NativeAuthenticationProvider implements AuthenticationProvider<Nati
          pluginsToInit.add(new MysqlOldPasswordPlugin());
          pluginsToInit.add(new AuthenticationLdapSaslClientPlugin());
          pluginsToInit.add(new AuthenticationKerberosClient());
 -        pluginsToInit.add(new AuthenticationOciClient());
+         pluginsToInit.add(new AuthenticationFidoClient());
  
          // plugins from authenticationPluginClasses connection parameter
-         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 528731d7..00000000
+index 473e532f..00000000
 --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
 +++ /dev/null
-@@ -1,175 +0,0 @@
+@@ -1,177 +0,0 @@
 -/*
-- * Copyright (c) 2021, Oracle and/or its affiliates.
+- * Copyright (c) 2021, 2022, Oracle and/or its affiliates.
 - *
 - * This program is free software; you can redistribute it and/or modify it under
 - * the terms of the GNU General Public License, version 2.0, as published by the
@@ -119,6 +118,8 @@ index 528731d7..00000000
 -    @Override
 -    public void destroy() {
 -        reset();
+-        this.protocol = null;
+-        this.usernameCallbackHandler = null;
 -    }
 -
 -    @Override
@@ -139,7 +140,7 @@ index 528731d7..00000000
 -    @Override
 -    public void setAuthenticationParameters(String user, String password) {
 -        if (user == null && this.usernameCallbackHandler != null) {
--            // Fall-back to system login user.
+-            // Fall back to system login user.
 -            this.usernameCallbackHandler.handle(new UsernameCallback(System.getProperty("user.name")));
 -        }
 -    }
@@ -213,10 +214,10 @@ index 528731d7..00000000
 -    }
 -}
 diff --git a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties
-index 2b9704d9..20c3062e 100644
+index e4709a75..d29cdeb3 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
+@@ -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}''.
  
@@ -230,5 +231,5 @@ index 2b9704d9..20c3062e 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.34.1
+2.35.1