diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 03a8e8e..f754326 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,7 +21,7 @@
   JDKxx_Matrix:
     strategy:
       matrix:
-        java: [ 8, 11, 14 ]
+        java: [ 8, 11, 14, 15-ea ]
         os: [ ubuntu-latest ]
         include:
         - os: windows-latest
@@ -38,11 +38,11 @@
     - name: Build
       shell: bash
       run: |
-        mvn -U -e -B -ntp -X install
+        mvn -U -e -B -ntp install
   JDKxx_Matrix-Experimental:
     strategy:
       matrix:
-        java: [ 8, 11, 14 ]
+        java: [ 8, 11, 14, 15-ea ]
         os: [ ubuntu-latest ]
         include:
         - os: windows-latest
@@ -58,4 +58,4 @@
         java-version: ${{ matrix.java }}
     - name: Build
       run: |
-        mvn -U -e -B -ntp -X install -Pexperimental
+        mvn -U -e -B -ntp install -Pexperimental
diff --git a/cdi-executable/base.bndrun b/cdi-executable/base.bndrun
index 4522c03..fb1f4f4 100644
--- a/cdi-executable/base.bndrun
+++ b/cdi-executable/base.bndrun
@@ -35,7 +35,8 @@
 	org.slf4j.helpers;version=1.7.28,\
 	org.slf4j.spi;version=1.7.28,\
 	sun.invoke,\
-	sun.misc
+	sun.misc,\
+	${bndjava15temorarysupplementalpackages}
 
 -runblacklist.base: \
 	osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
diff --git a/cdi-extension-mp-config/base-itest.bndrun b/cdi-extension-mp-config/base-itest.bndrun
index b66bd01..b665da8 100644
--- a/cdi-extension-mp-config/base-itest.bndrun
+++ b/cdi-extension-mp-config/base-itest.bndrun
@@ -37,7 +37,8 @@
 	org.slf4j.helpers;version=1.7.25,\
 	org.slf4j.spi;version=1.7.25,\
 	sun.invoke,\
-	sun.misc
+	sun.misc,\
+	${bndjava15temorarysupplementalpackages}
 
 -runrequires.base: \
 	osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-extension-mp-jwt-auth/base-itest.bndrun b/cdi-extension-mp-jwt-auth/base-itest.bndrun
index b66bd01..b665da8 100644
--- a/cdi-extension-mp-jwt-auth/base-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/base-itest.bndrun
@@ -37,7 +37,8 @@
 	org.slf4j.helpers;version=1.7.25,\
 	org.slf4j.spi;version=1.7.25,\
 	sun.invoke,\
-	sun.misc
+	sun.misc,\
+	${bndjava15temorarysupplementalpackages}
 
 -runrequires.base: \
 	osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-extension-mp-metrics/base-itest.bndrun b/cdi-extension-mp-metrics/base-itest.bndrun
index b66bd01..b665da8 100644
--- a/cdi-extension-mp-metrics/base-itest.bndrun
+++ b/cdi-extension-mp-metrics/base-itest.bndrun
@@ -37,7 +37,8 @@
 	org.slf4j.helpers;version=1.7.25,\
 	org.slf4j.spi;version=1.7.25,\
 	sun.invoke,\
-	sun.misc
+	sun.misc,\
+	${bndjava15temorarysupplementalpackages}
 
 -runrequires.base: \
 	osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-itests/base-itest.bndrun b/cdi-itests/base-itest.bndrun
index 82c7f16..fa4af5c 100644
--- a/cdi-itests/base-itest.bndrun
+++ b/cdi-itests/base-itest.bndrun
@@ -36,7 +36,8 @@
 	org.slf4j.helpers;version=1.7.25,\
 	org.slf4j.spi;version=1.7.25,\
 	sun.invoke,\
-	sun.misc
+	sun.misc,\
+	${bndjava15temorarysupplementalpackages}
 
 -runrequires.base: \
 	osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extra)',\
diff --git a/pom.xml b/pom.xml
index 0ce418d..fd6b3b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,6 +56,51 @@
 		<slf4j.version>1.7.28</slf4j.version>
 		<surefire.version>2.12</surefire.version>
 		<weld.version>3.1.3.Final</weld.version>
+		<bndjava15temorarysupplementalpackages><![CDATA[
+			javax.crypto,
+			javax.crypto.spec,
+			javax.imageio,
+			javax.imageio.stream,
+			javax.management,
+			javax.management.modelmbean,
+			javax.management.remote,
+			javax.naming,
+			javax.naming.directory,
+			javax.naming.ldap,
+			javax.naming.spi,
+			javax.net,
+			javax.net.ssl,
+			javax.rmi.ssl,
+			javax.security.auth,
+			javax.security.auth.callback,
+			javax.security.auth.login,
+			javax.security.auth.x500,
+			javax.sql,
+			javax.swing,
+			javax.swing.border,
+			javax.swing.tree,
+			javax.transaction.xa,
+			javax.xml.datatype,
+			javax.xml.namespace,
+			javax.xml.parsers,
+			javax.xml.stream,
+			javax.xml.stream.events,
+			javax.xml.stream.util,
+			javax.xml.transform,
+			javax.xml.transform.dom,
+			javax.xml.transform.sax,
+			javax.xml.transform.stax,
+			javax.xml.transform.stream,
+			javax.xml.validation,
+			javax.xml.xpath,
+			org.ietf.jgss,
+			org.w3c.dom,
+			org.w3c.dom.bootstrap,
+			org.w3c.dom.ls,
+			org.xml.sax,
+			org.xml.sax.ext,
+			org.xml.sax.helpers
+		]]></bndjava15temorarysupplementalpackages>
 	</properties>
 
 	<licenses>
@@ -316,17 +361,6 @@
 					</releases>
 				</repository>
 			</repositories>
-
-			<pluginRepositories>
-				<pluginRepository>
-					<id>bnd-snapshots</id>
-					<url>https://bndtools.jfrog.io/bndtools/libs-snapshot/</url>
-					<layout>default</layout>
-					<releases>
-						<enabled>false</enabled>
-					</releases>
-				</pluginRepository>
-			</pluginRepositories>
 		</profile>
 
 		<profile>