import mariadb-java-client-3.0.3-1.el9

.gitignore

@@ -1 +1 @@
-SOURCES/3.0.1.tar.gz
+SOURCES/3.0.3.tar.gz

.mariadb-java-client.metadata

@@ -1 +1 @@
-c15d552676b833cb76e279c00ddb33969f4821ff SOURCES/3.0.1.tar.gz
+be4c9984d1704b91295e2a598963aa1ad7027a42 SOURCES/3.0.3.tar.gz

SOURCES/compile_source_root.patch

@@ -0,0 +1,25 @@
+commit 5cee5e0b2a68d9a62cc5bb447dc1487457517238
+Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date:   Thu Feb 3 15:10:07 2022 +0100
+
+    [PATCH] change Java9 compile source root
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 6354ce0a..c6690f8b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -124,7 +124,7 @@
+                             <source>9</source>
+                             <target>9</target>
+                             <compileSourceRoots>
+-                                <compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
++                                <compileSourceRoot>${project.basedir}/src/main/java</compileSourceRoot>
+                             </compileSourceRoots>
+                             <multiReleaseOutput>true</multiReleaseOutput>
+                         </configuration>
+--
+2.34.1

SPECS/mariadb-java-client.spec

@@ -1,13 +1,16 @@
+%global build_javadoc 0
+
 Name:		mariadb-java-client
-Version:	3.0.1
+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
+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
+Patch1:		compile_source_root.patch
 
 BuildArch:	noarch
 BuildRequires:	maven-local
@@ -25,43 +28,58 @@ BuildRequires:  mvn(org.osgi:osgi.core)
 # since version 1.5.2 missing optional dependency (windows)
 #BuildRequires:	mvn(com.github.dblock.waffle:waffle-jna)
 
+%if %build_javadoc == 0
+Obsoletes:        %{name}-javadoc < 3.0.3
+%endif
+
 %description
 MariaDB Connector/J is a Type 4 JDBC driver, also known as the Direct to
 Database Pure Java Driver. It was developed specifically as a lightweight
 JDBC connector for use with MySQL and MariaDB database servers.
 
+%if %build_javadoc
 %package javadoc
 Summary:	Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
+%endif
 
 %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 
- 
+%pom_change_dep -r :org.osgi.compendium org.osgi:osgi.cmpn
+
 rm -r src/main/java/org/mariadb/jdbc/plugin/credential/aws
 
-sed -i 's/public void close() {/public void close() throws Exception {/' src/main/java/org/mariadb/jdbc/pool/Pool.java
+# 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 from 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
 
 # also remove the file using the removed plugin
 rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsNativeSspiAuthentication.java
 # patch the sources so that the missing file is not making trouble
 %patch0 -p1
+%patch1 -p1
 
 %mvn_file org.mariadb.jdbc:%{name} %{name}
 %mvn_alias org.mariadb.jdbc:%{name} mariadb:mariadb-connector-java
@@ -74,8 +92,11 @@ rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsN
 %pom_remove_plugin -r :maven-javadoc-plugin
 
 %build
+%if %build_javadoc == 0
+opts="-j"
+%endif
 # tests are skipped, while they require running application server
-%mvn_build -f
+%mvn_build -f $opts
 
 %install
 %mvn_install
@@ -84,10 +105,17 @@ rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsN
 %doc README.md
 %license LICENSE
 
+%if %build_javadoc
 %files javadoc -f .mfiles-javadoc
 %license LICENSE
+%endif
 
 %changelog
+* Thu Feb 03 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.3-1
+- Rebase to 3.0.3
+- Temporarily disable generation of -javadoc.rpm, due to missing feature in xmvn,
+  which leads to build crash
+
 * Wed Aug 18 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.0.1-1
 - Rebase to new major version 3.0.1 (it's Beta version)
 - Removed documentation/ folder, as it was removed by upstream
@@ -97,7 +125,7 @@ rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsN
   Related: rhbz#1991688
 
 * Wed Jun 30 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.7.1-4
-- Remove maven-javadoc-plugin dependency 
+- Remove maven-javadoc-plugin dependency
 
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.1-3
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937