.gitignore

@@ -1 +1 @@
-SOURCES/mariadb-connector-j-3.4.0.tar.gz
+SOURCES/3.0.3.tar.gz

.mariadb-java-client.metadata

@@ -1 +1 @@
-05170b4ee97ce5642d1973c223a4d2e48c179288 SOURCES/mariadb-connector-j-3.4.0.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,18 +1,18 @@
 %global build_javadoc 0
 
 Name:		mariadb-java-client
-Version:        3.4.0
+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:        LGPL-2.1-only
+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#/mariadb-connector-j-%{version}.tar.gz
+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
-ExclusiveArch:  %{java_arches} noarch
 BuildRequires:	maven-local
 BuildRequires:	mvn(net.java.dev.jna:jna)
 BuildRequires:	mvn(net.java.dev.jna:jna-platform)
@@ -28,38 +28,41 @@ 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 -q -n mariadb-connector-j-%{version}
+%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 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
-# used in buildtime for generating OSGI metadata
-%pom_remove_plugin biz.aQute.bnd:bnd-maven-plugin
 
 %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
-# make the slf4j dependency version-independent
-%pom_remove_dep org.slf4j:slf4j-api
 %pom_add_dep org.slf4j:slf4j-api
 
-# use the latest OSGi implementation
+# 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
 
@@ -68,13 +71,15 @@ 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 from META-INF, so that the mariadb-java-client module would be valid
-# 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
-rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsNativeSspiAuthentication.java
 
+# 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
@@ -82,12 +87,16 @@ rm -f src/main/java/org/mariadb/jdbc/plugin/authentication/addon/gssapi/WindowsN
 %pom_remove_plugin org.jacoco:jacoco-maven-plugin
 %pom_remove_plugin org.apache.maven.plugins:maven-source-plugin
 %pom_remove_plugin org.sonatype.plugins:nexus-staging-maven-plugin
+%pom_remove_plugin com.coveo:fmt-maven-plugin
 %pom_remove_plugin -r :maven-gpg-plugin
 %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
@@ -96,103 +105,30 @@ 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
-* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.4.0-1
+* Thu Feb 03 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.3-1
-- Rebuilt for MSVSphere 10
+- Rebase to 3.0.3
-
+- Temporarily disable generation of -javadoc.rpm, due to missing feature in xmvn,
-* Mon Aug 12 2024 Marián Konček <mkoncek@redhat.com> - 3.4.0-1
+  which leads to build crash
-- Synchronize with Fedora version
-
-* Fri Aug 09 2024 Marián Konček <mkoncek@redhat.com> - 3.3.2-5
-- Rebuild without generated Requires
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 3.3.2-4
-- Bump release for June 2024 mass rebuild
-
-* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Dec 22 2023 Zuzana Miklankova <zmiklank@redhat.com> - 3.3.2-1
-- Rebase to version 3.3.2
-
-* Thu Aug 31 2023 Zuzana Miklankova <zmiklank@redhat.com> - 3.2.0-1
-- Rebase to version 3.2.0
-
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue May 02 2023 Zuzana Miklankova <zmiklank@redhat.com> - 3.1.4-1
-- Rebase to version 3.1.4
-
-* Thu Apr 06 2023 Zuzana Miklankova <zmiklank@redhat.com> - 3.1.3-1
-- Rebase to version 3.1.3
-
-* Thu Jan 26 2023 Zuzana Miklankova <zmiklank@redhat.com> - 3.1.2-1
-- Rebase to version 3.1.2
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jan 12 2023 Zuzana Miklankova <zmiklank@redhat.com> - 3.1.1-1
-- Rebase to version 3.1.1
-
-* Wed Nov 09 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.9-1
-- Rebase to version 3.0.9
-
-* Fri Sep 23 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.8-1
-- Rebase to version 3.0.8
-
-* Fri Aug 05 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.7-1
-- Rebase to version 3.0.7
-
-* Thu Jul 21 2022 Ondrej Sloup <osloup@redhat.com> - 3.0.6-1
-- Fix mixed spaces and tabs
-- Rebase to version 3.0.6 (rhbz#2102401)
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.5-2
-- Rebuilt for Drop i686 JDKs
-
-* Thu May 26 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.5-1
-- Rebase to version 3.0.5
-
-* Mon Mar 28 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.4-1
-- Rebase to version 3.0.4
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.0.3-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Mon Jan 31 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.3-2
-- Disable javadoc build, because xmvn is not able to build it
-
-* Thu Jan 27 2022 Zuzana Miklankova <zmiklank@redhat.com> - 3.0.3-1
-- Rebase to version 3.0.3
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
 * Wed Aug 18 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.0.1-1
-- Rebase to version 3.0.1
+- Rebase to new major version 3.0.1 (it's Beta version)
-
+- Removed documentation/ folder, as it was removed by upstream
-* Fri Jul 23 2021 Ondrej Dubaj <odubaj@redhat.com> - 3.0.0-1
-- Rebase to version 3.0.0
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Fri Jul 09 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.7.3-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.1-5
-- Rebase to version 2.7.3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Wed May 12 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.7.2-2
+* Wed Jun 30 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.7.1-4
 - Remove maven-javadoc-plugin dependency
 
-* Wed May 05 2021 Ondrej Dubaj <odubaj@redhat.com> - 2.7.2-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.7.1-3
-- Rebase to version 2.7.2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild