Accepting request 1194888 from Java:packages

bsc#1229150

OBS-URL: https://build.opensuse.org/request/show/1194888
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mysql-connector-java?expand=0&rev=51

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

mysql-connector-java-remove-oci-support.patch

@@ -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
-@@ -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.
+@@ -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}''.
  
 -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.

mysql-connector-java-remove-opentelemetry-support.patch

@@ -1,14 +1,14 @@
---- 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;
+--- 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;
  
  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;
-@@ -54,7 +53,6 @@ import com.mysql.cj.exceptions.MysqlErro
+@@ -51,7 +50,6 @@
  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;
-@@ -110,24 +108,7 @@ public class NativeSession extends CoreS
+@@ -107,24 +105,7 @@
  
      public NativeSession(HostInfo hostInfo, PropertySet propSet) {
          super(hostInfo, propSet);

mysql-connector-java.changes

@@ -1,123 +1,3 @@
--------------------------------------------------------------------
-Mon Oct  6 06:10:44 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Do not require jta >= 1.0, but directly the geronimo-jta-1_1-api.
-  After the removal of update-alternatives from the geronimo-specs
-  package, the virtual provides were removed.
-
--------------------------------------------------------------------
-Thu Apr 24 11:08:50 UTC 2025 - Fridrich Strba <fstrba@suse.com>
-
-- Upgrade to Version 9.3.0
-  - Fixes CVE-2025-30706, bsc#1241693
-  - Fix for Bug#117294 (Bug#37523180), Updatable ResultSet fails
-    with 'Parameter index out of range'.
-  - Fix for Bug#20802830, RESULTSET UPDATE METHODS NOT CHECKING
-    VALIDITY OF RESULTSET.
-  - WL#16723, DatabaseMetaData clean up.
-  - WL#16756, Implement missing methods in
-    DatabaseMetaDataUsingInfoSchema.
-  - Fix for Bug#20279671, PROCEDURE EXECUTION FAILS WHEN THE
-    PARAMETER NAME CONTAINS ESCAPE CHARACTER.
-  - Fix for Bug#37311996, allow only Krb5LoginModule in Kerberos
-    authentication.
-  - Fix for Bug#19857207, EXECUTE ON CALLABLESTATEMENT RESULTS
-    IN ARRAYINDEXOUTOFBOUNDSEXCEPTION.
-  - Fix for Bug#117027 (Bug#37415840), Mysql connector use an
-    uneffective way to match numericValue.
-  - Fix for Bug#19829452, PARAMETER INDEX VALIDATION NOT PROPER
-    IN CALLABLESTATEMENT.
-
--------------------------------------------------------------------
-Mon Jan 27 13:48:27 UTC 2025 - Gus Kenion <gus.kenion@suse.com>
-
-- Upgrade to Version 9.2.0
-  - Fix for Bug#116318 (Bug#37152533), useServerPrepStmts
-    useLocalTransactionState cause first execute rollback failure.
-  - Fix for Bug#116955 (Bug#37383012), Tests fail after server
-    changed cipher for xdevapi.
-  - Fix for Bug#63992 (Bug#14598872), getTables did not return a
-    result for table names with a dot in it.
-  - WL#16558, Upgrade 3rd party libraries and tools.
-  - Fix for Bug#37125271, RPM depends on java-headless 1:1.8.0
-    which makes java8 unnessessarily be installed.
-  - Fix for Bug#115586 (Bug#36850047), When upgrading to mysql
-    connetor/j-8.4.0, creating a connection becomes too slow.
-  - Fix for Bug#116630 (Bug#37272802), Tests fail on Windows if
-    test database has upper/mixed case chars.
-  - Fix for Bug#71143 (Bug#17967091), Calling ResultSet.updateRow
-    should not set all field values in UPDATE.
-  - Fix for Bug#103437 (Bug#32807360), Syntax error when calling
-    PreparedStatement.getMetadata() with LIMIT placeholded.
-  - Fix for Bug#96786 (Bug#30280035), Retrieving streaming result
-    set fails when closeOnCompletion is enabled.
-  - Fix for Bug#21983318, QUERYTIMEOUT VALUE RESETTING TO 0 AFTER
-    PREPSTMT.EXECUTEBATCH() EXECUTION.
-  - Fix for Bug#116113 (Bug#37063728), DatabaseMetaData#getTables
-    doesn't work properly for delimited identifiers.
-
--------------------------------------------------------------------
-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>
-
-- Fix build after removal of the default %%{java_home} define
-
 -------------------------------------------------------------------
 Tue Aug 20 08:17:53 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

mysql-connector-java.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package mysql-connector-java
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,13 +18,20 @@
 
 %define new_name mysql-connector-j
 Name:           mysql-connector-java
-Version:        9.3.0
+Version:        8.4.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
@@ -41,11 +48,10 @@ BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  javassist >= 3.28.0
 BuildRequires:  junit
-BuildRequires:  protobuf-devel >= 26
-BuildRequires:  protobuf-java >= 26
+BuildRequires:  protobuf-java >= 3.9.2
 BuildRequires:  slf4j
 BuildRequires:  xz
-Requires:       geronimo-jta-1_1-api
+Requires:       jta >= 1.0
 Requires:       slf4j
 Provides:       mm.mysql = %{version}
 Obsoletes:      mm.mysql < %{version}
@@ -79,6 +85,15 @@ 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
 
@@ -90,10 +105,10 @@ rm -rf src/main/core-impl/java/com/mysql/cj/otel/OpenTelemetryScope.java
 # extra libs
 mkdir -p lib
 mkdir -p src/lib
-ln -f -s `find-jar ant/ant-contrib` lib/ant-contrib.jar
-ln -f -s `find-jar slf4j/api` lib/slf4j-api.jar
-ln -s `find-jar javassist` lib/javassist.jar
-ln -s `find-jar protobuf` lib/protobuf.jar
+ln -f -s %{_datadir}/java/ant/ant-contrib.jar lib/ant-contrib.jar
+ln -f -s %{_datadir}/java/slf4j/api.jar lib/slf4j-api.jar
+ln -s %{_datadir}/java/javassist.jar lib/javassist.jar
+ln -s %{_datadir}/java/protobuf.jar lib/protobuf.jar
 
 %build
 
@@ -102,18 +117,19 @@ export CLASSPATH=$(build-classpath \
     commons-logging \
     slf4j \
     jdbc-stdext \
-    geronimo-jta-1.1-api \
+    jta \
     junit \
     reload4j \
     protobuf)
-ant \
+%{ant} \
     -Dsnapshot.version= \
     -Dcom.mysql.jdbc.extra.libs=lib \
     -Dant.java.version=1.8 \
     -Dant.build.javac.source=1.8 \
     -Dant.build.javac.target=1.8 \
-    -Dcom.mysql.cj.build.jdk.javac=javac \
-    -Dcom.mysql.cj.build.jdk.java=java \
+    -Dcom.mysql.cj.build.jdk=%{java_home} \
+    -Dcom.mysql.cj.build.jdk.javac=%javac \
+    -Dcom.mysql.cj.build.jdk.java=%java \
     build
 
 %install
@@ -129,7 +145,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}","mysql:%{name}"
+%add_maven_depmap JPP-%{new_name}.pom %{new_name}.jar -a com.mysql:%{name}
 
 %files -f .mfiles
 %{_javadir}/%{name}.jar

reproducible-build.patch

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