diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec
index 4b6471d..b037da4 100644
--- a/mariadb-java-client.spec
+++ b/mariadb-java-client.spec
@@ -1,6 +1,6 @@
Name: mariadb-java-client
-Version: 2.4.3
-Release: 3%{?dist}
+Version: 2.5.4
+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+
@@ -19,6 +19,8 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.sonatype.oss:oss-parent:pom:)
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)
@@ -53,6 +55,15 @@ done
%pom_remove_dep ch.qos.logback:logback-classic
%pom_remove_dep junit:junit
%pom_remove_dep com.zaxxer:HikariCP
+%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
@@ -76,7 +87,6 @@ rm src/main/resources/META-INF/MANIFEST.MF
%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
@@ -119,6 +129,9 @@ rm src/main/resources/META-INF/MANIFEST.MF
%license LICENSE
%changelog
+* 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)
diff --git a/remove_waffle-jna.patch b/remove_waffle-jna.patch
index fe35e40..e30649c 100644
--- a/remove_waffle-jna.patch
+++ b/remove_waffle-jna.patch
@@ -1,8 +1,17 @@
+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 15c61c85..7276e91e 100644
+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,25 +5,12 @@ import com.sun.jna.Platform;
+@@ -5,26 +5,12 @@ import com.sun.jna.*;
public class GssUtility {
/**
@@ -15,18 +24,22 @@ index 15c61c85..7276e91e 100644
*/
public static GssapiAuth getAuthenticationMethod() {
- try {
-- //Waffle-jna has jna as dependency, so if not available on classpath, just use standard authentication
+- // 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
+- // waffle not in the classpath
- }
- }
- } catch (Throwable cle) {
-- //jna jar's are not in classpath
+- // jna jar's are not in classpath
- }
return new StandardGssapiAuthentication();
}
-
+ }
+--
+2.19.1
+