diff --git a/javac-check.patch b/javac-check.patch index c413efc..89432f5 100644 --- a/javac-check.patch +++ b/javac-check.patch @@ -1,11 +1,9 @@ Description: Disable the JDK check Author: Emmanuel Bourg Forwarded: not-needed -Index: mysql-connector-j-8.0.31/build.xml -=================================================================== ---- mysql-connector-j-8.0.31.orig/build.xml -+++ mysql-connector-j-8.0.31/build.xml -@@ -405,7 +405,7 @@ See also com.mysql.cj.conf.PropertyDefin +--- a/build.xml ++++ b/build.xml +@@ -400,7 +400,7 @@ See also com.mysql.cj.conf.PropertyDefin diff --git a/mysql-connector-java-8.2.0.tar.gz b/mysql-connector-java-8.2.0.tar.gz deleted file mode 100644 index d4b8c46..0000000 --- a/mysql-connector-java-8.2.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c56456c13a32c92f633214de8f54757ae1b222ac5569fe63f7959fa195276ed -size 1902017 diff --git a/mysql-connector-java-8.4.0.tar.gz b/mysql-connector-java-8.4.0.tar.gz new file mode 100644 index 0000000..3b33cba --- /dev/null +++ b/mysql-connector-java-8.4.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80ec086b69041e286b0b5d503c593f999153c5ec686488ebc558a7a9f4832a56 +size 1919815 diff --git a/mysql-connector-java-remove-oci-support.patch b/mysql-connector-java-remove-oci-support.patch index 4fe9ae6..db7aa13 100644 --- a/mysql-connector-java-remove-oci-support.patch +++ b/mysql-connector-java-remove-oci-support.patch @@ -1,28 +1,24 @@ -Index: mysql-connector-j-8.2.0/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java -=================================================================== ---- mysql-connector-j-8.2.0.orig/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java -+++ mysql-connector-j-8.2.0/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeAuthenticationProvider.java -@@ -58,7 +58,6 @@ import com.mysql.cj.protocol.a.NativeCon - import com.mysql.cj.protocol.a.authentication.AuthenticationFidoClient; +--- 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 +@@ -48,7 +48,6 @@ import com.mysql.cj.protocol.a.NativeCon + import com.mysql.cj.protocol.a.NativeConstants.StringSelfDataType; 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.AuthenticationWebAuthnClient; import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin; import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin; -@@ -259,7 +258,6 @@ public class NativeAuthenticationProvide +@@ -249,7 +248,6 @@ public class NativeAuthenticationProvide pluginsToInit.add(new MysqlOldPasswordPlugin()); pluginsToInit.add(new AuthenticationLdapSaslClientPlugin()); pluginsToInit.add(new AuthenticationKerberosClient()); - pluginsToInit.add(new AuthenticationOciClient()); - pluginsToInit.add(new AuthenticationFidoClient()); pluginsToInit.add(new AuthenticationWebAuthnClient()); -Index: mysql-connector-j-8.2.0/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties -=================================================================== ---- mysql-connector-j-8.2.0.orig/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties -+++ mysql-connector-j-8.2.0/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties -@@ -49,18 +49,6 @@ AuthenticationLdapSaslClientPlugin.Missi + // plugins from authenticationPluginClasses connection parameter +--- a/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties ++++ b/src/main/resources/com/mysql/cj/LocalizedErrorMessages.properties +@@ -35,18 +35,6 @@ AuthenticationLdapSaslClientPlugin.Missi 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}''. diff --git a/mysql-connector-java-remove-opentelemetry-support.patch b/mysql-connector-java-remove-opentelemetry-support.patch new file mode 100644 index 0000000..685f84f --- /dev/null +++ b/mysql-connector-java-remove-opentelemetry-support.patch @@ -0,0 +1,43 @@ +--- a/src/main/core-impl/java/com/mysql/cj/NativeSession.java ++++ b/src/main/core-impl/java/com/mysql/cj/NativeSession.java +@@ -37,7 +37,6 @@ import java.util.concurrent.CopyOnWriteA + import java.util.function.Supplier; + + import com.mysql.cj.conf.HostInfo; +-import com.mysql.cj.conf.PropertyDefinitions.OpenTelemetry; + import com.mysql.cj.conf.PropertyKey; + import com.mysql.cj.conf.PropertySet; + import com.mysql.cj.conf.RuntimeProperty; +@@ -51,7 +50,6 @@ import com.mysql.cj.exceptions.MysqlErro + import com.mysql.cj.exceptions.OperationCancelledException; + import com.mysql.cj.interceptors.QueryInterceptor; + import com.mysql.cj.log.Log; +-import com.mysql.cj.otel.OpenTelemetryHandler; + import com.mysql.cj.protocol.ColumnDefinition; + import com.mysql.cj.protocol.NetworkResources; + import com.mysql.cj.protocol.ProtocolEntityFactory; +@@ -107,24 +105,6 @@ public class NativeSession extends CoreS + + public NativeSession(HostInfo hostInfo, PropertySet propSet) { + super(hostInfo, propSet); +- +- // Check Telemetry option. +- RuntimeProperty openTelemetry = this.propertySet.getEnumProperty(PropertyKey.openTelemetry); +- if (openTelemetry.getValue() == OpenTelemetry.PREFERRED || openTelemetry.getValue() == OpenTelemetry.REQUIRED) { +- if (!OpenTelemetryHandler.isOpenTelemetryApiAvailable()) { +- if (openTelemetry.getValue() == OpenTelemetry.REQUIRED) { +- throw ExceptionFactory.createException(Messages.getString("Connection.OtelApiNotFound")); +- } +- if (openTelemetry.isExplicitlySet()) { +- getLog().logInfo(Messages.getString("Connection.OtelApiNotFound")); +- } +- setTelemetryHandler(NoopTelemetryHandler.getInstance()); +- } else { +- setTelemetryHandler(new OpenTelemetryHandler()); +- } +- } else { +- setTelemetryHandler(NoopTelemetryHandler.getInstance()); +- } + } + + public void connect(HostInfo hi, String user, String password, String database, int loginTimeout, TransactionEventHandler transactionManager) diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index 03463cc..9b35b50 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,3 +1,66 @@ +------------------------------------------------------------------- +Mon May 27 10:09:41 UTC 2024 - Gus Kenion +- Patch mysql-connector-java-remove-opentelemetry-support.patch + removes OpenTelemetry support, which was added upstream +- Refresh the following patches for updated codebase: + * javac-check.patch + * reproducible-build.patch + * mysql-connector-java-remove-oci-support.patch +- Update to 8.4.0 + * WL#16174, Support for VECTOR data type. + * Fix for Bug#36380711, Tests failing due to removal of + deprecated features. + * Fix for Bug#113600 (Bug#36171575), Contribution: Fix join + condition for retrieval of imported primary keys. Thanks to + Henning Pöttker for his contribution. + * WL#16196, GPL License Exception Update. + * Fix for Bug#111031 (Bug#35392222), Contribution: Update + SyntaxRegressionTest.java. Thanks to Abby Palmero for her + contribution. + * Fix for Bug#113599 (Bug#36171571), Contribution: Replace + StringBuffer with StringBuilder in ValueEncoders. Thanks to + Henning Pöttker for his contribution. + * Fix for Bug#91550 (Bug#28297874), DatabaseMetaData specifies + incorrect extra name characters. + * Fix for Bug#113129 (Bug#36043145), setting the FetchSize on a + Statement object does not affect. + * Fix for Bug#22931632, GETPARAMETERBINDINGS() ON A PS RETURNS + NPE WHEN NOT ALL PARAMETERS ARE BOUND. + * WL#16147, Remove support for FIDO authentication. + * Fix for Bug#110286 (Bug#35152855), Only call + Messages.getString(...) when it's needed (when the SQLException + is thrown). Thanks to Janick Reynders for his contribution. + * Fix for Bug#23143279, CLIENT HANG WHEN LOADBALANCESTRATEGY IS + BESTRESPONSETIME. +- Includes changes from 8.3.0 + * Fix for Bug#107107 (Bug#34101635), Redundant "Reset stmt" when + setting useServerPrepStmts&cachePrepStmts to true. Thanks to + Marcos Albe for his contribution. + * Fix for Bug#19845752, COMMENT PARSING IS NOT PROPER IN + CONNECTOR JDBC. + * Fix for Bug#112884 (Bug#36043166), Setting a large timeout + leads to errors when executing SQL. + * WL#16077, Upgrade 3rd party libraries and tools. + * WL#16074, Upgrade Protocol Buffers dependency to + protobuf*java-3.25.1. + * Fix for Bug#35929119, Issue with mysql-connector-j 8.0.33 + connector (XDEVAPI) - getsession is slow. + * Fix for Bug#111107 (Bug#36023972), + CallableStatement::getParameterMetaData reports incorrect + parameterCount. + * Fix for Bug#109546 (Bug#34958912), executeUpdate throws + SQLException on queries that are only comments. + * Fix for Bug#112195 (Bug#35749998), getWarnings() of + StatementImpl contains all warnings. + * Fix for Bug#111360 (Bug#35488208), Unexpected list of permitted ciphers. + * Fix for Bug#96582 (Bug#30222032), + jdbc.MysqlParameterMetadata#isNullable doesnt check whether to + be simple. + * Fix for Bug#95796 (Bug#29907618), Parameter metadata inferred + incorrectly when procedure or function doesn't exist. + * Fix for Bug#73774 (Bug#19531305), Can't execute a stored + procedure if exists function with same name. + ------------------------------------------------------------------- Wed Feb 21 21:41:53 UTC 2024 - Fridrich Strba diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 3ff6927..1ee3c2e 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -18,7 +18,7 @@ %define new_name mysql-connector-j Name: mysql-connector-java -Version: 8.2.0 +Version: 8.4.0 Release: 0 Summary: Official JDBC Driver for MySQL License: GPL-2.0-or-later @@ -38,6 +38,7 @@ Patch0: javac-check.patch # therefore it's removed during prep phase Patch1: %{name}-remove-oci-support.patch Patch2: reproducible-build.patch +Patch3: %{name}-remove-opentelemetry-support.patch BuildRequires: ant BuildRequires: ant-contrib BuildRequires: apache-commons-logging @@ -82,6 +83,7 @@ set that supports the capabilities of MySQL. %patch -P 0 -p1 %patch -P 1 -p1 %patch -P 2 -p1 +%patch -P 3 -p1 %if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150200 # ship protobuf generated files compatible with protobuf 3.9.2 @@ -95,6 +97,11 @@ tar -xvf %{SOURCE1} -C . # remove OCI support rm -rf src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java +# remove OpenTelemetry support +rm -rf src/main/core-impl/java/com/mysql/cj/otel/OpenTelemetryHandler.java +rm -rf src/main/core-impl/java/com/mysql/cj/otel/OpenTelemetrySpan.java +rm -rf src/main/core-impl/java/com/mysql/cj/otel/OpenTelemetryScope.java + # extra libs mkdir -p lib mkdir -p src/lib @@ -109,7 +116,7 @@ export CLASSPATH=$(build-classpath \ ant-contrib \ commons-logging \ slf4j \ - jdbc-stdext\ + jdbc-stdext \ jta \ junit \ reload4j \ diff --git a/reproducible-build.patch b/reproducible-build.patch index a8fddb5..6eee470 100644 --- a/reproducible-build.patch +++ b/reproducible-build.patch @@ -1,6 +1,6 @@ ---- mysql-connector-j-8.1.0/src/main/core-api/java/com/mysql/cj/conf/PropertyDefinitions.java 2023-09-26 06:49:03.580772166 +0200 -+++ mysql-connector-j-8.1.0/src/main/core-api/java/com/mysql/cj/conf/PropertyDefinitions.java 2023-09-26 06:53:10.775563886 +0200 -@@ -30,7 +30,7 @@ +--- a/src/main/core-api/java/com/mysql/cj/conf/PropertyDefinitions.java ++++ b/src/main/core-api/java/com/mysql/cj/conf/PropertyDefinitions.java +@@ -21,7 +21,7 @@ package com.mysql.cj.conf; import java.util.Collections; @@ -9,7 +9,7 @@ import java.util.Map; import com.mysql.cj.Messages; -@@ -895,7 +895,7 @@ +@@ -894,7 +894,7 @@ public class PropertyDefinitions { // };