From 2fd788a4bc9bb00538c5fdbd45790c0a8dba71c5 Mon Sep 17 00:00:00 2001 From: Zuzana Miklankova Date: Fri, 28 Jan 2022 09:07:32 +0100 Subject: [PATCH] Rebase on 3.0.3 --- mariadb-java-client.spec | 41 +++++++++++++++++++++++++--------------- sources | 2 +- 2 files changed, 27 insertions(+), 16 deletions(-) diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec index 68a3efd..df47d55 100644 --- a/mariadb-java-client.spec +++ b/mariadb-java-client.spec @@ -1,13 +1,13 @@ -Name: mariadb-java-client -Version: 3.0.1 -Release: 2%{?dist} -Summary: Connects applications developed in Java to MariaDB and MySQL databases +Name: mariadb-java-client +Version: 3.0.3 +Release: 1%{?dist} +Summary: Connects applications developed in Java to MariaDB and MySQL databases # added BSD license because of https://bugzilla.redhat.com/show_bug.cgi?id=1291558#c13 -License: BSD and LGPLv2+ -URL: https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ -Source0: https://github.com/MariaDB/mariadb-connector-j/archive/%{version}.tar.gz +License: BSD and LGPLv2+ +URL: https://mariadb.com/kb/en/mariadb/about-mariadb-connector-j/ +Source0: https://github.com/mariadb-corporation/mariadb-connector-j/archive/refs/tags/%{version}.tar.gz # optional dependency not in Fedora -Patch0: remove_waffle-jna.patch +Patch0: remove_waffle-jna.patch BuildArch: noarch BuildRequires: maven-local @@ -37,26 +37,34 @@ Summary: Javadoc for %{name} This package contains the API documentation for %{name}. %prep -%setup -qn mariadb-connector-j-%{version}-beta +%setup -qn mariadb-connector-j-%{version} # remove missing optional dependency waffle-jna %pom_remove_dep com.github.waffle:waffle-jna %pom_remove_dep ch.qos.logback:logback-classic -%pom_remove_dep com.amazonaws:aws-java-sdk-rds -%pom_remove_dep com.amazonaws:aws-java-sdk-bom +%pom_remove_dep software.amazon.awssdk:bom +%pom_remove_dep software.amazon.awssdk:rds %pom_remove_dep org.junit:junit-bom +%pom_remove_dep org.junit.jupiter:junit-jupiter-engine +%pom_remove_dep org.slf4j:slf4j-api %pom_add_dep net.java.dev.jna:jna %pom_add_dep net.java.dev.jna:jna-platform +# add slf4j dep again, this time not dependent on any specific version %pom_add_dep org.slf4j:slf4j-api # use latest OSGi implementation %pom_change_dep -r :org.osgi.core org.osgi:osgi.core -%pom_change_dep -r :org.osgi.compendium org.osgi:osgi.cmpn - -rm -r src/main/java/org/mariadb/jdbc/plugin/credential/aws +%pom_change_dep -r :org.osgi.compendium org.osgi:osgi.cmpn + +rm -r src/main/java/org/mariadb/jdbc/plugin/credential/aws +# removing dependencies and 'provides', which mariadb-java-client cannot process from module-info.java +sed -i '/aws/d' src/main/java9/module-info.java +sed -i '/waffle/d' src/main/java9/module-info.java +# removing missing dependencies form META-INF, so that the mariadb-java-client module would be valid +sed -i '/aws/d' src/main/resources/META-INF/services/org.mariadb.jdbc.plugin.CredentialPlugin +sed -i '/aws/d' src/test/resources/META-INF/services/org.mariadb.jdbc.plugin.CredentialPlugin -sed -i 's/public void close() {/public void close() throws Exception {/' src/main/java/org/mariadb/jdbc/pool/Pool.java # also remove the file using the removed plugin rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsNativeSspiAuthentication.java @@ -88,6 +96,9 @@ rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsN %license LICENSE %changelog +* Thu Jan 27 2022 Zuzana Miklankova - 3.0.3-1 +- Rebase to version 3.0.3 + * Thu Jan 20 2022 Fedora Release Engineering - 3.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 0ddcd1b..b632cc7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (3.0.1.tar.gz) = 10e8137f9899ba7834363d19985d8c355250daf01ca41a30db5e0cedbf134df6efcac0709e37fe76ddb560848879bbce92b26c3d23816211fa543a1bc573c5eb +SHA512 (3.0.3.tar.gz) = cf4dafc53a8b51becbb87cf61b5dec93f339f6d8d1ec04eaf804ea4e8f43afe541f8af1dbb1c54d79a24c42b89d099e87935a287d7449a87422f79fa187020cc