Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mysql-connector-java for
openSUSE:Factory checked in at 2021-07-25 20:09:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-java (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-java.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-java"
Sun Jul 25 20:09:12 2021 rev:33 rq:907801 version:8.0.25
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java.changes
2020-07-06 16:14:16.820395201 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-java.new.1899/mysql-connector-java.changes
2021-07-25 20:09:19.691439349 +0200
@@ -1,0 +2,487 @@
+Mon Jul 19 09:38:50 UTC 2021 - Johannes Grassler <johannes.grass...@suse.com>
+
+- Remove hibernate-check.patch (fixed upstream)
+- Remove mysql-connector-java-jdbc-4.1.patch (fixed upstream)
+- Remove disable-testsuite.patch mysql-connector-java-jdbc-4.1.patch (fixed
upstream)
+- Remove compile-jdk7.patch (fixed upstream)
+- Remove mysql-connector-java-sourcetarget.patch (fixed upstream)
+- Refresh javac-check.patch
+- Depend on log4j rather than log4j-mini and adjust log4j dependencies to
+ account for the lack of log4j12 Provides in some code streams.
+- Add missing Group tag
+- Update to 8.0.25 (SOC-11543)
+ Changes in 8.0.25
+ * No functional changes: version alignment with MySQL Server 8.0.25.
+ Changes in 8.0.24
+ * Bug#102188 (32526663), AccessControlException with
AuthenticationLdapSaslClientPlugin.
+ * Bug#22508715, SETSESSIONMAXROWS() CALL ON CLOSED CONNECTION RESULTS IN
NPE.
+ * Bug#102131 (32338451), UPDATABLERESULTSET NPE WHEN USING DERIVED QUERIES
OR VIEWS.
+ * Bug#101596 (32151143), GET THE 'HOST' PROPERTY ERROR AFTER CALLING
TRANSFORMPROPERTIES() METHOD.
+ * Bug#20391832, SETOBJECT() FOR TYPES.TIME RESULTS IN EXCEPTION WHEN VALUE
HAS FRACTIONAL PART.
+ * Bug#97730 (31699993), xdev api: ConcurrentModificationException at
Session.close.
+ * Bug#99708 (31510398), mysql-connector-java 8.0.20 ASSERTION FAILED:
Unknown message type: 57 s.close.
+ * Bug#32122553, EXTRA BYTE IN COM_STMT_EXECUTE.
+ * Bug#101558 (32141210), NULLPOINTEREXCEPTION WHEN EXECUTING INVALID QUERY
WITH USEUSAGEADVISOR ENABLED.
+ * Bug#102076 (32329915), CONTRIBUTION: MYSQL JDBC DRIVER
RESULTSET.GETLONG() THROWS NUMBEROUTOFRANGE.
+ * Bug#31747910, BUG 30474158 FIX IMPROVES JDBC COMPLIANCE BUT CHANGES
DEFAULT RESULTSETTYPE HANDLING.
+ * Bug#102321 (32405590), CALLING RESULTSETMETADATA.GETCOLUMNCLASSNAME
RETURNS WRONG VALUE FOR DATETIME.
+ * WL#14453, Pluggable authentication: new default behavior & user-less
authentications.
+ * WL#14392, Improve timeout error messages [classic].
+ * WL#14202, XProtocol: Support connection close notification.
+ Changes in 8.0.23
+ * Bug#21789378, FORCED TO SET SERVER TIMEZONE IN CONNECT STRING.
+ * Bug#95644 (30573281), JDBC GETDATE/GETTIME/GETTIMESTAMP INTERFACE
BEHAVIOR CHANGE AFTER UPGRADE 8.0.
+ * Bug#94457 (29402209), CONNECTOR/J RESULTSET.GETOBJECT( ...,
OFFSETDATETIME.CLASS ) THROWS.
+ * Bug#76775 (20959249), FRACTIONAL SECONDS IN TIME VALUES ARE NOT
AVAILABLE VIA JDBC.
+ * Bug#99013 (31074051), AN EXTRA HOUR GETS ADDED TO THE TIMESTAMP WHEN
SUBTRACTING INTERVAL 'N' DAYS.
+ * Bug#98695 (30962953), EXECUTION OF "LOAD DATA LOCAL INFILE" COMMAND
THROUGH JDBC FOR DATETIME COLUMN.
+ * Bug#101413 (32099505), JAVA.TIME.LOCALDATETIME CANNOT BE CAST TO
JAVA.SQL.TIMESTAMP.
+ * Bug#101242 (32046007), CANNOT USE BYTEARRAYINPUTSTREAM AS ARGUMENTS IN
PREPARED STATEMENTS AN MORE.
+ * WL#14274, Support for authentication_ldap_sasl_client(SCRAM-SHA-256)
authentication plugin.
+ * WL#14206, Support for authentication_ldap_sasl_client(GSSAPI)
authentication plugin.
+ * WL#14207, Replace language in APIs and source code/docs.
+ Changes in 8.0.22
+ * Bug#98667 (31711961), "All pipe instances are busy" exception on
multiple connections to named Pipe.
+ * Bug#96309 (31699357), MultiHost in loadbalance may lead to a TPS
reduction during a quick switch.
+ * Bug#99076 (31083755), Unclear exception/error when connecting with
jdbc:mysql to a mysqlx port.
+ * Bug#96870 (30304764), Contribution: Allow to disable
AbandonedConnectionCleanupThread completely.
+ * WL#14115, Support for authentication_ldap_sasl_client (SCRAM-SHA-1)
authentication plugin.
+ * WL#14096, Add option to specify LOAD DATA LOCAL allow list folder.
+ * WL#13780, Skip system-wide trust and key stores (incl. X DevAPI client
certs).
+ * WL#14017, XProtocol -- support for configurable compression algorithms.
+ * Bug#92903 (28834903), MySQL Connector/j should support wildcard names or
alternative names.
+ * Bug#99767 (31443178), Contribution: Check SubjectAlternativeName for TLS
instead of commonName.
+ * Bug#93444 (29015453), LOCALDATETIME PARAMETER VA UES ALTERED WHEN CLIENT
AND SERVER TIMEZONES DIFFER.
+ * WL#14052, Remove asynchronous variant of X Protocol.
+ * Bug#99713 (31418928), NPE DURING
COM.MYSQL.CJ.SERVERPREPAREDQUERYBINDVALUE.STOREDATE().
+ * WL#14068, Remove legacy integration with JBoss.
+ Changes in 8.0.21
+ * WL#14051, Upgrade Protocol Buffers dependency to protobuf-java-3.11.4.
+ * WL#14042, Upgrade testsuite to JUnit 5.
+ * Bug#98237 (30911870), PREPAREDSTATEMENT.SETOBJECT(I, "FALSE",
TYPES.BOOLEAN) ALWAYS SETS TRUE OR 1.
+ * WL#13008, DevAPI: Add schema validation to create collection.
+ Changes in 8.0.20
+ * Bug#30805426, IN CASE OF ISAUTHMETHODSWITCHREQUESTPACKET , TOSERVERS > 1
ARE IGNORED.
+ * Bug#97714 (30570249), Contribution: Expose elapsed time for query
interceptor
+ * Bug#97724 (30570721), Contribution: Allow \'3.\' formatted numbers.
+ * Bug#98536 (30877755), SIMPLEDATEFORMAT COULD CACHE A WRONG CALENDAR.
+ Fix for Bug#91112 (28125069), AGAIN WRONG JAVA.SQL.DATE.
+ * Bug#30474158, CONNECTOR/J 8 DOES NOT HONOR THE REQUESTED RESULTSETTYPE
SCROLL_INSENSITIVE ETC.
+ * Bug#98445 (30832513), Connection option
clientInfoProvider=ClientInfoProviderSP causes NPE.
+ * WL#12248, DevAPI: Connection compression.
+ * Bug#30636056, ResultSetUtil.resultSetToMap() can be unsafe to use.
+ * Bug#97757 (30584907), NULLPOINTEREXCEPTION WITH
CACHERESULTSETMETADATA=TRUE AND EXECUTEQUERY OF "SET".
+ Changes in 8.0.19
+ * WL#13346, Support for mult-host and failover.
+ * Bug#97413 (30477722), DATABASEMETADATA IS BROKEN AFTER SERVER WL#13528.
+ * WL#13367, DNS SRV support.
+ * WL#12736, DevAPI: Specify TLS ciphers to be used by a client or session.
+ * Bug#96383 (30119545) RS.GETTIMESTAMP() HAS * DIFFERENT RESULTS FOR TIME
FIELDS WITH USECURSORFETCH=TRUE.
+ * Bug#96059 (29999318), ERROR STREAMING MULTI RESULTSETS WITH
MYSQL-CONNECTOR-JAVA 8.0.X.
+ * Bug#96442 (30151808), INCORRECT DATE ERROR WHEN CALLING GETMETADATA ON
PREPARED STATEMENT.
+ Changes in 8.0.18
+ * WL#13347, Connectors should handle expired password sandbox without SET
operations.
+ * Bug#84098 (25223123), endless loop in LoadBalancedAutoCommitInterceptor.
+ * Bug#23721537, MULTI-SELECT WITH EXECUTEASYNC() GIVES IMPROPER ERROR.
+ * Bug#95741 (29898567), METADATA QUERY USES UPPER() AROUND NUMERIC
EXPRESSION.
+ * Bug#20913289, PSTMT.EXECUTEUPDATE() FAILS WHEN SQL MODE IS
NO_BACKSLASH_ESCAPES.
+ * Bug#80441 (22850444), SYNTAX ERROR ON RESULTSET.UPDATEROW() WITH
SQL_MODE NO_BACKSLASH_ESCAPES.
+ Changes in 8.0.17
+ * WL#13210, Generate Javadocs via ant.
+ * WL#12247, DevAPI: indexing array fields.
+ * WL#12726, DevAPI: Add overlaps and not_overlaps as operator.
+ * Bug#95503 (29821029), Operator IN not mapping consistently to the right
X Plugin operation.
+ * WL#12942, Update README.md and add new CONTRIBUTING.md.
+ * WL#13125, Support fully qualified hostnames longer than 60 characters.
+ * Bug#95210 (29807741), ClassCastException in BlobFromLocator when
connecting as jdbc:mysql:replication.
+ * Bug#29591275, THE JAR FILE NEEDS TO CONTAIN A README AND LICENSE FILE.
+ * WL#13124, Support new utf8mb4 bin collation.
+ * WL#13009, DevAPI: Deprecate methods.
+ * WL#11101, Remove de-cache and close of SSPSs on double call to close().
+ * Bug#89133 (27356869) CONTRIBUTION: UPDATE DA ABASEMETADATA.JAVA.
+ * Bug#11891000, DABATASEMETADATA.GETTABLES() IGNORES THE SCHEMA_PATTERN
ARGUMENT.
+ * Bug#94101 (29277648), SETTING LOGSLOWQUERIES SHOULD NOT AUTOMATICALLY
ENABLE PROFILESQL FOR QUERIES.
+ * Bug#74690 (20010454), PROFILEREVENT HOSTNAME HAS NO GETTER().
+ * Bug#70677 (17640628), CONNECTOR J WITH PROFILESQL - LOG CONTAINS LOTS OF
STACKTRACE DATA.
+ * Bug#41172 (11750577), PROFILEREVENT.PACK() THROWS
ARRAYINDEXOUTOFBOUNDSEXCEPTION.
+ * Bug#27453692, CHARACTERS GET GARBLED IN CONCAT() IN PS WHEN
USECURSORFETCH=TRUE.
+ * Bug#94585 (29452669), GETTABLENAME() RETURNS NULL FOR A QUERY HAVING
COUNT(*) WITH JDBC DRIVER V8.0.12.
+ * Bug#94442 (29446059), RESULTSETIMPL.GETDOUBLE IS INEFFICIENT BECAUSE OF
BIGDECIMAL (RE)CONSTRUCTIONS.
+ Changes in 8.0.16
+ * WL#12825, Remove third-party libraries from sources and bundles.
+ * Bug#93590 (29054329), javax.net.ssl.SSLException: closing inbound before
receiving peer's close_notify.
+ * Bug#94414 (29384853), Connector/J RPM package have version number in
path.
+ * Bug#27786499, REDUNDANT FILES IN DEBIAN PACKAGE FOR DEBIAN9(COMMUNITY
PACKAGE) FOR CJAVA.
+ * WL#12246, DevAPI: Prepared statement support.
+ * WL#10839, Adjust c/J tests to the new "ON" default for
explicit_defaults_for_timestamp.
+ * Bug#29329326, PLEASE AVOID SHOW PROCESSLIST IF POSSIBLE.
+ * WL#12460, DevAPI: Support new session reset functionality.
+ * WL#12459, DevAPI: Support connection-attributes.
+ * Bug#25650385, GETBYTE() RETURNS ERROR FOR BINARY() FLD.
+ * Bug#27784363, MYSQL 8.0 JDBC DRIVER THROWS NUMBERFORMATEXCEPTION FOR
TEXT DATA
+ * Bug#93007 (28860051), LoadBalancedConnectionProxy.getGlobalBlacklist bug.
+ * Bug#29186870, CONNECTOR/J REGRESSION: NOT RETURNING PRECISION
GETPROCEDURECOLUMNS.
+ * Bug#22038729, X DEVAPI: ANY API CALL AFTER A FAILED CALL PROC() RESULTS
IN HANG.
+ * Bug#29244101, ADD MAPPING FOR UTF8MB4_ZH_0900_AS_CS COLLATION.
+ * Bug#92819 (28834959), EXPRPARSER THROWS WRONGARGUMENTEXCEPTION WHEN
PARSING EMPTY JSON ARRAY.
+ * Bug#21921956, X DEVAPI: EXPRESSION PARSE ERROR WITH UNARY OPERATOR.
+ * Bug#94031 (29257922), WRONG JSON_UNQUOTE WORKAROUND.
+ * Bug#22931700, BINDINGS.GETBOOLEAN() ALWAYS RETURNS FALSE.
+ * Bug#25650912, ERROR MESSAGE NOT CLEAR WHEN WE PASS A CHAR DATA TO ANY
TABLE API.
+ * Bug#25642021, CHANGEUSER() FAILS WHEN ENABLEPACKETDEBUG=TRUE.
+ Changes in 8.0.15
+ * Bug#94051 (29261254), Not recommended default for 'allowLoadLocalInfile'.
+ Changes in 8.0.14
+ * WL#12298, Connectors: Expose metadata about source and binaries in
unified way.
+ * Bug#93111 (28894344), ConnectionUrl.java contains char U+00A7 (section
sign).
+ * WL#12621, DevAPI: Handling of Default Schema.
+ * Bug#93340 (28970166), C/J BUILD SCRIPT IS TOO VERBOSE
+ * WL#12462, DevAPI: Be prepared for initial notice on connection.
+ * Bug#28924137, WL#12463:IF COLLECTION DOESN'T EXIST, COLL.COUNT() IS
GIVING A WRONG ERROR MESSAGE.
+ * WL#12463, DevAPI: Standardize count method.
+ * Bug#92508 (28747636), mysql-connector in bootclasspath causing memory
leak.
+ * Bug#25650514, UPDATEROW() CALL FAILS WITH NPE WHEN SSPS=TRUE AND TABLE
HAS MULTI-FLD KEY.
+ * Bug#25650482, REFRESHROW() CALL AFTER UPDATEROW() API FAILS WHEN
USESERVERPREPSTMTS=TRUE.
+ * Bug#92536 (28692243), UPDATEING SERVER SIDE PREPSTMTS RESULTSET FAIL.
+ * Bug#92625 (28731795), CONTRIBUTION: FIX OBSERVED NPE IN CLEARINPUTSTREAM.
+ * Bug#23045642, ADDING NO-DOC (MYSQLCONNJ-696) RESULTS IN EXCEPTION.
+ * Bug#91065 (28101003), ZERODATETIMEBEHAVIOR=CONVERT_TO_NULL SHOULD NOT
APPLY TO 00:00:00 TIME COLUMNS.
+ * Bug#92574 (28706219), WHEN CONVERTING FROM VARCHAR TO JAVA BOOLEAN, 'N'
IS NOT SUPPORTED.
+ * Bug#25642226, CHANGEUSER() NOT SETTING THE DATABASE PROPERLY WITH SHA
USER.
+ * Bug#28606708, NAMED PIPE CONNECTION FOR X PROTOCOL RETURNS NPE, EXPECTED
PROPER ERROR MESSAGE.
+ Changes in 8.0.13
+ * Bug#91317 (28207422), Wrong defaults on collation mappings.
+ * WL#12245, DevAPI: Implement connect timeout.
+ * Bug#21774249, UNIT TEST FAILS WITH ERROR " 'CEST' IS UNRECOGNIZED TIME
ZONE".
+ * WL#11857, DevAPI: Implement connection pooling for xprotocol.
+ * Bug#91873 (28444461), REMOVE USEOLDUTF8BEHAVIOR CONNECTION PROPERTY.
+ * Bug#92264 (28594434), JSONPARSER PUTS UNNECESSARY MAXIMUM LIMIT ON
JSONNUMBER TO 10 DIGITS.
+ * WL#12110, Extend PropertyDefinitions.PropertyKey usage.
+ * Bug#81063 (23098159), w/ rewriteBatchedStatements, when 2 tables
involved, the rewriting not correct.
+ * Bug#84813 (25501750), rewriteBatchedStatements fails in INSERT.
+ * Bug#81196 (23227334), CONNECTOR/J NOT FOLLOWING DATABASE CHARACTER SET.
+ * Bug#72609 (18749544), SETDATE() NOT USING A PROLEPTIC GREGORIAN CALENDAR.
+ * Bug#87534 (26730196), UNION ALL query fails when useServerPrepStmts=true
on database connection.
+ * Bug#89948 (27658489), Batched statements are not committed for
useLocalTransactionState=true.
+ * BUG#22305979, WRONG RECORD UPDATED IF SENDFRACTIONALSECONDS=FALSE AND
SMT IS SCROLLABLE.
+ * Bug#27102307, CHANGE USESSL AND VERIFYSERVERCERTIFICATE TO SSLMODE
OPTION.
+ * Bug#28150662, CONNECTOR/J 8 MALFORMED DATABASE URL EXCEPTION WHIT
CORRECT URL STRING.
+ * Bug#91421 (28246270), ALLOWED VALUES FOR ZERODATETIMEBEHAVIOR ARE
INCOMPATIBLE WITH NETBEANS.
+ * Bug#23045604, XSESSION.GETURI() RETURNS NPE.
+ * Bug#21914769, NPE WHEN TRY TO EXECUTE INVALID JSON STRING.
+ * Bug#BUG#90887 (28034570), DATABASEMETADATAUSINGINFOSCHEMA#GETTABLES
FAILS IF METHOD ARGUMENTS ARE NULL.
+ * Bug#28207088, C/JAVA: UPDATECLOB(INT COLUMNLABEL, JAVA.SQL.CLOB CLOB) IS
FAILING.
+ * Bug#27629553, NPE FROM GETSESSION() FOR SSL CONNECTION WHEN NO PASSWORD
PASSED.
+ Changes in 8.0.12
+ * Bug#28208000, MASTER : HANG IN ASYNCHRONOUS SELECT TEST.
+ * WL#10544, Update MySQL 8.0 keywords list.
+ * WL#11858, DevAPI: Core API v1 alignment.
+ * Bug#27652379, NPE FROM GETSESSION(PROPERTIES) WHEN HOST PARAMETER IS
GIVEN IN SMALL LETTER.
+ * BUG#87600 (26724154), CONNECTOR THROWS 'MALFORMED DATABASE URL' ON NON
MYSQL CONNECTION-URLS.
+ * BUG#26089880, GETCONNECTION("MYSQLX://..") RETURNS NON-X PROTOCOL
CONNECTION.
+ * WL#11876, Improve connection properties design.
+ * WL#11933, Connector/J 8.0 X DevAPI reference documentation update.
+ * WL#11860, Ensure >= 75% code coverage.
+ * Bug#90753 (27977617), WAIT_TIMEOUT EXCEEDED MESSAGE NOT TRIGGERED.
+ * Bug#85941 (25924324), WASNULL NOT SET AFTER GETBYTES IS CALLED.
+ * Bug#28066709, COLLECTION.CREATEINDEX() TEST IS BROKEN AFTER WL#11808
IMPLEMENTATION.
+ * Bug#90872 (28027459), FILTERPARAMS CLASS IS NOT NEEDED.
+ * Bug#27522054, POSSIBLE ASYNC XPROTOCOL MESSAGE HANDLING PERF ISSUE.
+ The "xdevapi.useAsyncProtocol" connection property default value is
changed to "false".
+ Changes in 8.0.11
+ * WL#11293, DevAPI: Support new locking modes : NOWAIT and SKIP LOCKED.
+ * Bug#90029 (27678308), FAILURE WHEN GETTING GEOMCOLLECTION COLUMN TYPE.
+ * BUG#90024 (27677574), SOME TESTS FAILED AGAINST MYSQL 8.0.5 BECAUSE OF
DEPRECATED FEATURES REMOVAL.
+ * Bug#86741 (26314325), Multi-Host connection with autocommit=0
getAutoCommit maybe wrong.
+ * Bug#27231383, PROVIDE MAVEN-FRIENDLY COMMERCIAL PACKAGES WITHOUT "-BIN".
+ * Bug#26819691, SETTING PACKETDEBUGBUFFERSIZE=0 RESULTS IN CONNECTION
FAILURE.
++++ 290 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java.changes
++++ and
/work/SRC/openSUSE:Factory/.mysql-connector-java.new.1899/mysql-connector-java.changes
Old:
----
compile-jdk7.patch
disable-testsuite.patch
hibernate-check.patch
mysql-connector-java-5.1.49-suse.tar.xz
mysql-connector-java-jdbc-4.1.patch
mysql-connector-java-sourcetarget.patch
New:
----
mysql-connector-java-8.0.25-suse.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-java.spec ++++++
--- /var/tmp/diff_new_pack.niCDAg/_old 2021-07-25 20:09:20.223438756 +0200
+++ /var/tmp/diff_new_pack.niCDAg/_new 2021-07-25 20:09:20.223438756 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mysql-connector-java
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,30 +17,29 @@
Name: mysql-connector-java
-Version: 5.1.49
+Version: 8.0.25
Release: 0
Summary: Official JDBC Driver for MySQL
License: GPL-2.0-or-later
URL: https://dev.mysql.com/downloads/connector/j/
Source0: %{name}-%{version}-suse.tar.xz
+Group: Development/Languages/Java
# Script to repack upstream tarball
# ./generate-tarball.sh VERSION
Source99: generate-tarball.sh
Patch0: javac-check.patch
-Patch1: hibernate-check.patch
-Patch2: mysql-connector-java-jdbc-4.1.patch
-Patch3: disable-testsuite.patch
-Patch4: compile-jdk7.patch
-Patch5: mysql-connector-java-sourcetarget.patch
BuildRequires: ant
BuildRequires: ant-contrib
BuildRequires: apache-commons-logging
BuildRequires: geronimo-jta-1_1-api
+BuildRequires: git
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
-BuildRequires: javapackages-tools
+BuildRequires: javapackages-tools >= 5.3.1
+BuildRequires: javassist >= 3.23.1
BuildRequires: junit
BuildRequires: log4j12-mini
+BuildRequires: protobuf-java >= 3.9.2
BuildRequires: slf4j
BuildRequires: xz
Requires: jta >= 1.0
@@ -65,33 +64,16 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-
-# dup
-rm -f README
-# wrong end of line encoding
-sed -i -e 's/.$//' README.txt
# extra libs
mkdir -p lib
mkdir -p src/lib
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
-# disable jboss integration
-rm -rf src/com/mysql/jdbc/integration/jboss
-rm src/testsuite/regression/ConnectionRegressionTest.java
-rm src/testsuite/regression/DataSourceRegressionTest.java
-rm src/testsuite/simple/ReadOnlyCallableStatementTest.java
-rm src/testsuite/simple/jdbc4/StatementsTest.java
-# disable hibernate4 integration
-rm -rf src/com/mysql/fabric/hibernate
-rm -rf src/demo
export CLASSPATH=$(build-classpath \
ant-contrib \
@@ -100,34 +82,56 @@
jdbc-stdext\
jta \
junit \
- log4j12/log4j-12)
+ log4j12/log4j-12 \
+ protobuf)
%{ant} \
- -Dcom.mysql.jdbc.jdk5.javac=%javac \
- -Dcom.mysql.jdbc.jdk8.javac=%javac \
-Dsnapshot.version= \
-Dcom.mysql.jdbc.extra.libs=lib \
- -Dant.java.version=1.6 \
- -Dant.build.javac.source=1.6 \
- -Dant.build.javac.target=1.6 \
+ -Dant.java.version=1.8 \
+ -Dant.build.javac.source=1.8 \
+ -Dant.build.javac.target=1.8 \
+ -Dcom.mysql.cj.build.jdk=%{java_home} \
+ -Dcom.mysql.cj.build.jdk.javac=%{javac} \
+ -Dcom.mysql.cj.build.jdk.java=%{java} \
dist
%install
install -d -m 755 %{buildroot}%{_javadir}
-install ./build/%{name}-%{version}/%{name}-%{version}-bin.jar \
- %{buildroot}%{_javadir}/%{name}.jar
+install build/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar
%{buildroot}%{_javadir}/%{name}.jar
rm -rf %{buildroot}%{name}-%{version}/docs/release-test-output
# Install the Maven build information
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 src/doc/sources/pom.xml
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-sed -i 's/>@.*</>%{version}</' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 build/%{name}-%{version}-SNAPSHOT/pom.xml
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap JPP-%{name}.pom %{name}.jar
%files -f .mfiles
-%license COPYING
-%doc CHANGES README.txt
+%license LICENSE
+%doc CHANGES README
+
+# -Dcom.mysql.cj.build.jdk.javac=/usr/lib64/jvm/java-1.8.0/bin/javac \
+# -Dcom.mysql.cj.build.jdk.java=/usr/lib64/jvm/java-1.8.0/bin/java \
+ dist
+
+install -d -m 755 %{buildroot}%{_javadir}
+
+install build/%{name}-%{version}-SNAPSHOT/%{name}-%{version}-SNAPSHOT.jar
%{buildroot}%{_javadir}/%{name}.jar
+
+rm -rf %{buildroot}%{name}-%{version}/docs/release-test-output
+
+# Install the Maven build information
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 build/%{name}-%{version}-SNAPSHOT/pom.xml
%{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+sed -i 's/-SNAPSHOT//' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+%files -f .mfiles
+%license LICENSE
+%doc CHANGES README
%changelog
++++++ javac-check.patch ++++++
--- /var/tmp/diff_new_pack.niCDAg/_old 2021-07-25 20:09:20.247438729 +0200
+++ /var/tmp/diff_new_pack.niCDAg/_new 2021-07-25 20:09:20.247438729 +0200
@@ -1,14 +1,16 @@
Description: Disable the JDK check
Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -415,7 +415,7 @@
+Index: mysql-connector-java-8.0.25/build.xml
+===================================================================
+--- mysql-connector-java-8.0.25.orig/build.xml
++++ mysql-connector-java-8.0.25/build.xml
+@@ -401,7 +401,7 @@ See also com.mysql.cj.conf.PropertyDefin
<!-- Prepares files and settings for compiling driver. -->
-- <target name="init" depends="-compiler-check, -init-copy,
-init-filter-license, -init-no-crypto">
-+ <target name="init" depends="-init-copy, -init-filter-license,
-init-no-crypto">
+- <target name="init" depends="-extra-libs-check, -compiler-check,
-init-copy, -init-notices-commercial, -init-notices-gpl, -init-info-files">
++ <target name="init" depends="-extra-libs-check, -init-copy,
-init-notices-commercial, -init-notices-gpl, -init-info-files">
<!-- The following is needed for source distributions as the
classpath can't be dynamically altered, and not having this directory present
causes the
build to fail. -->
- <available file="${com.mysql.jdbc.docs.sourceDir}"
property="com.mysql.jdbc.docs.sourcesPresent" />
+ <available property="com.mysql.cj.prebuiltDocsPresent"
file="${com.mysql.cj.dist.dir.prebuilt.docs}" />
++++++ mysql-connector-java-5.1.49-suse.tar.xz ->
mysql-connector-java-8.0.25-suse.tar.xz ++++++
++++ 482287 lines of diff (skipped)
