Merge branch 'master' into develop

bnd.bnd

@@ -0,0 +1,21 @@
+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: \
+    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

pom.xml

@@ -24,6 +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.2.0</bnd-maven-plugin.version>
     </properties>
 
     <licenses>
@@ -181,6 +182,7 @@
                                 javax.naming,javax.naming.ldap,javax.management,javax.sql,javax.net;resolution:=optional,javax.net.ssl;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,org.slf4j;resolution:=optional
                             </Import-Package>
                         </manifestEntries>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>
@@ -249,6 +251,22 @@
                 <version>3.0.0-M5</version>
             </plugin>
 
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+                <version>${bnd-maven-plugin.version}</version>
+                <configuration>
+                    <bndfile>bnd.bnd</bndfile>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bnd-process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
         </plugins>
     </build>