pool/mysql-connector-java
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1219713 from Java:packages

Browse Source 
Build against the freshest protobuf

OBS-URL: https://build.opensuse.org/request/show/1219713
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mysql-connector-java?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger 2024-10-31 15:09:26 +00:00 committed by Git OBS Bridge
commit c15aaef608
8 changed files with 78 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-connector-java-8.4.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80ec086b69041e286b0b5d503c593f999153c5ec686488ebc558a7a9f4832a56
size 1919815

3
mysql-connector-java-9.1.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6135c92ccc2859538e909650597034f1a9247941f4513411305a1ff79eaab7d5
size 2060757

BIN
mysql-connector-java-generated-for-protobuf-3.9.2.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

12
mysql-connector-java-remove-oci-support.patch
View File

@ -5,22 +5,22 @@
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.AuthenticationOpenidConnectClient;
import com.mysql.cj.protocol.a.authentication.AuthenticationWebAuthnClient;
import com.mysql.cj.protocol.a.authentication.CachingSha2PasswordPlugin;
import com.mysql.cj.protocol.a.authentication.MysqlClearPasswordPlugin;
@@ -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 AuthenticationWebAuthnClient());
pluginsToInit.add(new AuthenticationOpenidConnectClient());
// 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}''.
@@ -40,18 +40,6 @@ AuthenticationOpenidConnect.MissingIdTok
AuthenticationOpenidConnect.FailReadIdTokenFile=Failed reading the OpenID Identity Token file specified in the connection property ''idTokenFile''.
AuthenticationOpenidConnect.InvalidIdTokenFile=The file specified in the connection property ''idTokenFile'' contains an invalid OpenID Identity Token.
-AuthenticationOciClientPlugin.ConfigFileNotFound=OCI configuration file not found.
-AuthenticationOciClientPlugin.OciSdkNotFound=The OCI SDK cannot be found or it is not installed.
@ -34,6 +34,6 @@
-AuthenticationOciClientPlugin.SecurityTokenTooBig=Invalid security token file. File size above 10 KB.
-AuthenticationOciClientPlugin.FailedReadingSecurityTokenFile=Failed reading the security token file referenced in the OCI configuration entry ''security_token_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''.
AuthenticationProvider.BadDisabledAuthenticationPlugin=Can''t disable the default authentication plugin. Either remove "{0}" from the disabled authentication plugins list, or choose a different default authentication plugin.

12
mysql-connector-java-remove-opentelemetry-support.patch
View File

@ -1,14 +1,14 @@
--- mysql-connector-j-8.4.0/src/main/core-impl/java/com/mysql/cj/NativeSession.java 2024-08-20 09:40:16.912267863 +0200
+++ mysql-connector-j-8.4.0/src/main/core-impl/java/com/mysql/cj/NativeSession.java 2024-08-20 10:15:54.394893409 +0200
@@ -37,7 +37,6 @@
import java.util.function.Supplier;
--- a/src/main/core-impl/java/com/mysql/cj/NativeSession.java
+++ b/src/main/core-impl/java/com/mysql/cj/NativeSession.java
@@ -40,7 +40,6 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
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 @@
@@ -54,7 +53,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;
@ -16,7 +16,7 @@
import com.mysql.cj.protocol.ColumnDefinition;
import com.mysql.cj.protocol.NetworkResources;
import com.mysql.cj.protocol.ProtocolEntityFactory;
@@ -107,24 +105,7 @@
@@ -110,24 +108,7 @@ public class NativeSession extends CoreS
public NativeSession(HostInfo hostInfo, PropertySet propSet) {
super(hostInfo, propSet);

57
mysql-connector-java.changes
View File

@ -1,3 +1,60 @@
-------------------------------------------------------------------
Mon Oct 21 12:20:07 UTC 2024 - Gus Kenion <gus.kenion@suse.com>
- Upgrade to Version 9.1.0
* Fix for Bug#116114 (Bug#37067812), Connector/J is writing
incorrect values when passed negative dates.
* Fix for Bug#96623 (Bug#30221117), batch update with
rewriteBatchedStatements&useServerPrepStmts send fail request.
* Fix for Bug#114705 (Bug#36539680), Contribution: make
trustStorePassword be null if
this.trustStoreSettings.keyStorePassword is null.
* Fix for Bug#84117 (Bug#25247468),
includeThreadNamesAsStatementComment ignored when using
prepared statement.
* Fix for Bug#101054 (Bug#32544786), Batched Query >
maxAllowedPacket size causes an ArrayIndexOutOfBoundsException.
* Fix for Bug#108415 (Bug#34579258), NullPointerException in
AbstractQuery::stopQueryTimer.
* Fix for Bug#115265 (Bug#36843227), Second stored procedure call
with cacheCallableStmts might fail.
* Fix for Bug#36936407, PrepareCall method doesn't work as
expected when DB name is involved.
* WL#16490, OpenID Connect authentication support.
* Fix for Bug#112790 (Bug#35936477), Statement.getGeneratedKeys()
returns unexpected value.
* Fix for Bug#113509 (Bug#36154975), closeOnCompletion cause no
statement reuse and server memory leak.
* Fix for Bug#109418 (Bug#36043556), batch insert threw an
unexpected exception.
* Fix for Bug#114410 (Bug#36434816), Code performance issue.
* Fix for Bug#110586 (Bug#35254470), got unexpected result when
the data type was set to ZEROFILL.
- Includes changes from version 9.0.0
* WL#16391, Upgrade 3rd party libraries and tools.
* Fix for Bug#114846 (Bug#36574322), Auto-closeable X dev session.
* Fix for Bug#114989 (Bug#36612566), Setting null value in
setClientInfo throws an NPE.
* WL#16376, Set 'caching_sha2_password' as default fallback
authentication plugin.
* WL#16342, Update MySQL error codes mapping.
* WL#16353, Refresh the list of acceptable TLS ciphers.
* Fix for Bug#114687 (Bug#36529541), Tests fail after
mysql_native_password has been made optional in server.
* WL#16319, Remove deprecated insensitive terminology based
methods.
* WL#16324, Update static MySQL keywords list.
* Fix for Bug#110512 (Bug#35223851), Contribution: Replace
synchronized with ReentrantLock.
* Fix for Bug#108830 (Bug#34721173), LIMIT clause, setMaxRows and
cursor combined returns wrong number or rows.
- Refactored mysql-connector-java-remove-oci-support.patch for
v9.1.0
- Refactored
mysql-connector-java-remove-opentelemetry-support.patch for
v9.1.0
- Refactored reproducible-build.patch for v9.1.0
-------------------------------------------------------------------
Sun Sep 29 19:50:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>

25
mysql-connector-java.spec
View File

@ -18,20 +18,13 @@
%define new_name mysql-connector-j
Name: mysql-connector-java
Version: 8.4.0
Version: 9.1.0
Release: 0
Summary: Official JDBC Driver for MySQL
License: GPL-2.0-or-later
Group: Development/Languages/Java
URL: https://dev.mysql.com/downloads/connector/j/
Source0: https://github.com/mysql/mysql-connector-j/archive/refs/tags/%{version}.tar.gz#:/%{name}-%{version}.tar.gz
# NOTE:
# the following file contains the generated protobuf files with
# previous versions of protoc (protobuf) that are needed to build
# in previous SUSE distros.
# Source from:
# https://github.com/mysql/mysql-connector-j/commit/6976d9d779b498c254fc5cab5e69cfc74fc3e4f0
Source1: mysql-connector-java-generated-for-protobuf-3.9.2.tar.xz
Patch0: javac-check.patch
# NOTE: Oracle OCI is not packaged yet
# The patch doesn't remove the file AuthenticationOciClient.java
@ -48,7 +41,8 @@ BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
BuildRequires: javassist >= 3.28.0
BuildRequires: junit
BuildRequires: protobuf-java >= 3.9.2
BuildRequires: protobuf-devel >= 26
BuildRequires: protobuf-java >= 26
BuildRequires: slf4j
BuildRequires: xz
Requires: jta >= 1.0
@ -85,15 +79,6 @@ set that supports the capabilities of MySQL.
%patch -P 2 -p1
%patch -P 3 -p1
%if 0%{?suse_version} <= 1500
# ship protobuf generated files compatible with protobuf 3.9.2
# which is the version we have in SLE15 SP2, the files were taken
# from commit 6976d9d779b498c254fc5cab5e69cfc74fc3e4f0, which is
# the last version compatible with that version of protobuf and
# are equivalent in functionality
tar -xvf %{SOURCE1} -C .
%endif
# remove OCI support
rm -rf src/main/protocol-impl/java/com/mysql/cj/protocol/a/authentication/AuthenticationOciClient.java
@ -121,7 +106,7 @@ export CLASSPATH=$(build-classpath \
junit \
reload4j \
protobuf)
%{ant} \
ant \
-Dsnapshot.version= \
-Dcom.mysql.jdbc.extra.libs=lib \
-Dant.java.version=1.8 \
@ -144,7 +129,7 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
# Install the Maven build information as new name
%{mvn_install_pom} build/%{new_name}-%{version}-SNAPSHOT/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{new_name}.pom
%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar -a com.mysql:%{name}
%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar -a "com.mysql:%{name}","mysql:%{name}"
%files -f .mfiles
%{_javadir}/%{name}.jar

2
reproducible-build.patch
View File

@ -9,7 +9,7 @@
import java.util.Map;
import com.mysql.cj.Messages;
@@ -894,7 +894,7 @@ public class PropertyDefinitions {
@@ -899,7 +899,7 @@ public class PropertyDefinitions {
//
};