From 53fd0ff2922ba7362d93955a99d6f53182dc0ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0abata?= Date: Thu, 15 Oct 2020 19:01:50 +0200 Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/mariadb-java-client#527357b58ec2b91f9579ebc445cb25eff1332cc0 --- .gitignore | 25 ++++ mariadb-java-client.spec | 261 +++++++++++++++++++++++++++++++++++++++ remove_waffle-jna.patch | 45 +++++++ sources | 1 + 4 files changed, 332 insertions(+) create mode 100644 mariadb-java-client.spec create mode 100644 remove_waffle-jna.patch create mode 100644 sources diff --git a/.gitignore b/.gitignore index e69de29..0341de8 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,25 @@ +/1.3.7.tar.gz +/1.5.0-RC1.tar.gz +/*.src.rpm +/1.5.2.tar.gz +/1.5.3.tar.gz +/1.5.4.tar.gz +/1.5.5.tar.gz +/2.0.2.tar.gz +/2.1.0.tar.gz +/2.2.0.tar.gz +/2.2.1.tar.gz +/2.2.2.tar.gz +/2.2.3.tar.gz +/2.2.4.tar.gz +/2.2.5.tar.gz +/2.2.6.tar.gz +/2.3.0.tar.gz +/2.4.0.tar.gz +/2.4.1.tar.gz +/2.4.3.tar.gz +/2.5.4.tar.gz +/2.6.0.tar.gz +/2.6.1.tar.gz +/2.6.2.tar.gz +/2.7.0.tar.gz diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec new file mode 100644 index 0000000..5278071 --- /dev/null +++ b/mariadb-java-client.spec @@ -0,0 +1,261 @@ +Name: mariadb-java-client +Version: 2.7.0 +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 +# optional dependency not in Fedora +Patch0: remove_waffle-jna.patch + +BuildArch: noarch +BuildRequires: maven-local +BuildRequires: mvn(net.java.dev.jna:jna) +BuildRequires: mvn(net.java.dev.jna:jna-platform) +BuildRequires: mvn(com.google.code.maven-replacer-plugin:replacer) +BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin) +# fedora 25 +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.osgi:osgi.cmpn) +BuildRequires: mvn(org.osgi:osgi.core) +# Since version 2.4.0 +# removing coverage test because of dependencies +#BuildRequires: mvn(org.jacoco:jacoco-maven-plugin) +# since version 1.5.2 missing optional dependency (windows) +#BuildRequires: mvn(com.github.dblock.waffle:waffle-jna) + +%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. + +%package javadoc +Summary: Javadoc for %{name} + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -qn mariadb-connector-j-%{version} + +# convert files from dos to unix line encoding +for file in README.md documentation/*.creole; do + sed -i.orig 's|\r||g' $file + touch -r $file.orig $file + rm $file.orig +done + +# 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 junit:junit +%pom_remove_dep com.amazonaws:aws-java-sdk-rds + +# 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/credential/aws + +sed -i 's|org.osgi.compendium|osgi.cmpn|' pom.xml + +# also remove the file using the removed plugin +rm -f src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/WindowsNativeSspiAuthentication.java +# patch the sources so that the missing file is not making trouble +%patch0 -p1 + +%mvn_file org.mariadb.jdbc:%{name} %{name} +%mvn_alias org.mariadb.jdbc:%{name} mariadb:mariadb-connector-java + +%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 + +# remove preconfigured OSGi manifest file and generate OSGi manifest file +# with maven-bundle-plugin instead of using maven-jar-plugin +rm src/main/resources/META-INF/MANIFEST.MF +%pom_xpath_set "pom:packaging" bundle +%pom_xpath_set "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive/pom:manifestFile" '${project.build.outputDirectory}/META-INF/MANIFEST.MF' +%pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-jar-plugin']/pom:configuration/pom:archive/pom:manifestEntries" + +%pom_add_plugin org.apache.felix:maven-bundle-plugin:2.5.4 . ' +true + + + ${project.groupId} + MariaDB JDBC Client + ${project.version}.0 + org.mariadb.jdbc.* + + !com.sun.jna.*, + javax.net;resolution:=optional, + javax.net.ssl;resolution:=optional, + javax.sql;resolution:=optional, + javax.transaction.xa;resolution:=optional + + + + + + bundle-manifest + process-classes + + manifest + + +' + +%build +# tests are skipped, while they require running application server +%mvn_build -f + +%install +%mvn_install + +%files -f .mfiles +%doc documentation/* README.md +%license LICENSE + +%files javadoc -f .mfiles-javadoc +%license LICENSE + +%changelog +* Fri Sep 25 2020 Ondrej Dubaj - 2.7.0-1 +- Rebase to version 2.7.0 (#1882558) + +* Sun Aug 30 2020 Fabio Valentini - 2.6.2-2 +- Remove unnecessary dependency on sonatype-oss-parent. + +* Wed Aug 19 2020 Ondrej Dubaj - 2.6.2-1 +- Rebase to version 2.6.2 (#1860212) + +* Tue Jul 28 2020 Fedora Release Engineering - 2.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sat Jul 11 2020 Jiri Vanek - 2.6.1-2 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jun 24 2020 Ondrej Dubaj - 2.6.1-1 +- Rebase to version 2.6.1 (#1850111) + +* Mon Mar 30 2020 Michal Schorm - 2.6.0-2 +- Remove the dependency on mariadb (#1818814) + +* Mon Mar 23 2020 Ondrej Dubaj - 2.6.0-1 +- Rebase to version 2.6.0 (#1815696) + +* Thu Feb 20 2020 Ondrej Dubaj - 2.5.4-1 +- Rebase to version 2.5.4 (#1752069) + +* Wed Feb 19 2020 Ondrej Dubaj - 2.4.3-3 +- Resolved FTBFS (#1799633) + +* Wed Jan 29 2020 Fedora Release Engineering - 2.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Sep 10 2019 Michal Schorm - 2.4.3-1 +- Rebase to version 2.4.3 + +* Tue Sep 10 2019 Michal Schorm - 2.4.1-3 +- Remove dependency to orphaned HikariCP + +* Thu Jul 25 2019 Fedora Release Engineering - 2.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Mar 27 2019 Jakub Janco - 2.4.1-1 +- new version + +* Fri Feb 01 2019 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Jan 29 2019 Jakub Janco - 2.4.0-1 +- new version + +* Mon Nov 26 2018 Jakub Janco - 2.3.0-1 +- new version + +* Tue Aug 07 2018 Jakub Janco - 2.2.6-1 +- new version + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 04 2018 Jakub Janco - 2.2.5-1 +- new version + +* Tue May 15 2018 Jakub Janco - 2.2.4-3 +- remove unused aws-java-sdk dependency + +* Sat May 05 2018 Jakub Janco - 2.2.4-2 +- Refactor pom, add tests package + +* Sat May 05 2018 Jakub Janco - 2.2.4-1 +- new version + +* Tue Mar 13 2018 Jakub Janco - 2.2.3-1 +- update version + +* Mon Feb 26 2018 Jakub Janco - 2.2.2-1 +- update version + +* Thu Feb 08 2018 Fedora Release Engineering - 2.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 03 2018 Jakub Janco - 2.2.1-1 +- Update to 2.2.1 + +* Tue Nov 21 2017 Jakub Janco - 2.2.0-1 +- Update to 2.2.0 + +* Tue Aug 29 2017 Tomas Repik - 2.1.0-1 +- Update to 2.1.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon Jun 26 2017 Tomas Repik - 2.0.2-1 +- version update + +* Fri Feb 10 2017 Fedora Release Engineering - 1.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Nov 28 2016 Tomas Repik - 1.5.5-1 +- version update + +* Mon Oct 03 2016 Tomas Repik - 1.5.3-1 +- version update + +* Wed Sep 14 2016 Tomas Repik - 1.5.2-1 +- version update + +* Tue Jun 21 2016 Tomas Repik - 1.4.6-1 +- version update + +* Mon Apr 18 2016 Tomas Repik - 1.4.2-1 +- version update + +* Wed Mar 23 2016 Tomas Repik - 1.3.7-1 +- version update +- BSD license added +- cosmetic updates in prep phase + +* Thu Mar 10 2016 Tomas Repik - 1.3.6-1 +- version update + +* Mon Feb 15 2016 Tomas Repik - 1.3.5-1 +- version update + +* Wed Jan 20 2016 Tomáš Repík - 1.3.3-3 +- generating OSGi manifest file with maven-bundle-plugin + +* Wed Dec 16 2015 Tomáš Repík - 1.3.3-2 +- installing LICENSE added +- conversion from dos to unix line encoding revised +- unnecessary tasks removed + +* Wed Dec 9 2015 Tomáš Repík - 1.3.3-1 +- Initial package diff --git a/remove_waffle-jna.patch b/remove_waffle-jna.patch new file mode 100644 index 0000000..e30649c --- /dev/null +++ b/remove_waffle-jna.patch @@ -0,0 +1,45 @@ +From c1e587054376db950495c02672675c801f454a6b Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Mon, 10 Feb 2020 18:08:39 +0100 +Subject: [PATCH] remove waffle-jna + +--- + .../send/authentication/gssapi/GssUtility.java | 18 ++---------------- + 1 file changed, 2 insertions(+), 16 deletions(-) + +diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java b/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java +index 810500e..127b580 100644 +--- a/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java ++++ b/src/main/java/org/mariadb/jdbc/internal/com/send/authentication/gssapi/GssUtility.java +@@ -5,26 +5,12 @@ import com.sun.jna.*; + public class GssUtility { + + /** +- * Get authentication method according to classpath. Windows native authentication is using +- * Waffle-jna. ++ * Get authentication method according to classpath. ++ * + * + * @return authentication method + */ + public static GssapiAuth getAuthenticationMethod() { +- try { +- // Waffle-jna has jna as dependency, so if not available on classpath, just use standard +- // authentication +- if (Platform.isWindows()) { +- try { +- Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl"); +- return new WindowsNativeSspiAuthentication(); +- } catch (ClassNotFoundException cle) { +- // waffle not in the classpath +- } +- } +- } catch (Throwable cle) { +- // jna jar's are not in classpath +- } + return new StandardGssapiAuthentication(); + } + } +-- +2.19.1 + diff --git a/sources b/sources new file mode 100644 index 0000000..b892f49 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (2.7.0.tar.gz) = 0163cff17027136692d94b58460ab8312cacd3aaf87e1b61020728874ccbf8d4afeb19133431882cd1764dd0a9e78c653c32b0e9c480d2366e8b997aa4df2a71