From cc0aa96cf36fb6750bb12e6f1ab0f97283b1f2a0 Mon Sep 17 00:00:00 2001
From: diego Dupin <diego.dupin@mariadb.com>
Date: Tue, 22 Mar 2022 10:59:35 +0100
Subject: [PATCH] [CONJ-925] OSGI correction

---
 bnd.bnd | 26 +++++++++++++++++---------
 pom.xml |  2 +-
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/bnd.bnd b/bnd.bnd
index 2dd77d869..f189fdab7 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,13 +1,21 @@
-Export-Package: org.mariadb.jdbc
+Export-Package: org.mariadb.jdbc;org.mariadb.jdbc.client;org.mariadb.jdbc.client.util;org.mariadb.jdbc.client.socket;org.mariadb.jdbc.message;org.mariadb.jdbc.type;org.mariadb.jdbc.export;org.mariadb.jdbc.plugin;org.mariadb.jdbc.plugin.codec;org.mariadb.jdbc.plugin.authentication.standard;org.mariadb.jdbc.plugin.authentication.addon;org.mariadb.jdbc.plugin.credential.aws;org.mariadb.jdbc.plugin.credential.env;org.mariadb.jdbc.plugin.credential.system;org.mariadb.jdbc.plugin.tls.main
 
 Import-Package: \
-  com.sun.jna;\
-  com.sun.jna.platform.win32;resolution:=optional,\
-  software.amazon.awssdk.*;resolution:=optional,\
-  waffle.windows.auth;\
-  waffle.windows.auth.impl;resolution:=optional,\
-  org.slf4j;version="[1.7,3.0)";resolution:=optional, \
-  org.ietf.jgss;resolution:=optional, \
-  *
+    javax.naming,\
+    javax.naming.ldap,\
+    javax.management,\
+    javax.sql,\
+    org.slf4j;resolution:=optional, \
+    javax.net;resolution:=optional,\
+    javax.net.ssl;resolution:=optional,\
+    com.sun.jna;resolution:=optional,\
+    com.sun.jna.platform.win32;resolution:=optional,\
+    javax.transaction.xa;resolution:=optional,\
+    waffle.windows.auth;resolution:=optional,\
+    waffle.windows.auth.impl;resolution:=optional,\
+    org.ietf.jgss;resolution:=optional,\
+    javax.security.auth.login;resolution:=optional,\
+    javax.security.auth.x500;resolution:=optional,\
+    software.amazon.awssdk.*;resolution:=optional
 
 -fixupmessages: "Classes found in the wrong directory:";is:=ignore
diff --git a/pom.xml b/pom.xml
index 839ca29c1..c91b78840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <jacoco.version>0.8.7</jacoco.version>
         <waffle-jna.version>3.1.1</waffle-jna.version>
         <mysql-connector-java.version>8.0.28</mysql-connector-java.version>
-        <bnd-maven-plugin.version>6.1.0</bnd-maven-plugin.version>
+        <bnd-maven-plugin.version>6.2.0</bnd-maven-plugin.version>
     </properties>
 
     <licenses>