Bump bnd.version from 5.1.0 to 5.1.2
Signed-off-by: Raymond Augé <rotty3000@apache.org>
diff --git a/cdi-executable/base.bndrun b/cdi-executable/base.bndrun
index fb1f4f4..4522c03 100644
--- a/cdi-executable/base.bndrun
+++ b/cdi-executable/base.bndrun
@@ -35,8 +35,7 @@
org.slf4j.helpers;version=1.7.28,\
org.slf4j.spi;version=1.7.28,\
sun.invoke,\
- sun.misc,\
- ${bndjava15temorarysupplementalpackages}
+ sun.misc
-runblacklist.base: \
osgi.identity;filter:='(osgi.identity=biz.aQute.bndlib)'
diff --git a/cdi-executable/owb-executable.bndrun b/cdi-executable/owb-executable.bndrun
index 3db2bf9..a2e3bf1 100644
--- a/cdi-executable/owb-executable.bndrun
+++ b/cdi-executable/owb-executable.bndrun
@@ -39,7 +39,7 @@
org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.util.function;version='[1.1.0,1.1.1)',\
diff --git a/cdi-extension-mp-config/base-itest.bndrun b/cdi-extension-mp-config/base-itest.bndrun
index b665da8..b66bd01 100644
--- a/cdi-extension-mp-config/base-itest.bndrun
+++ b/cdi-extension-mp-config/base-itest.bndrun
@@ -37,8 +37,7 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc,\
- ${bndjava15temorarysupplementalpackages}
+ sun.misc
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-extension-mp-config/owb-itest.bndrun b/cdi-extension-mp-config/owb-itest.bndrun
index a64e0d5..f9eb077 100644
--- a/cdi-extension-mp-config/owb-itest.bndrun
+++ b/cdi-extension-mp-config/owb-itest.bndrun
@@ -41,7 +41,7 @@
org.apache.geronimo.specs.geronimo-jcdi_2.0_spec;version='[1.1.0,1.1.1)',\
org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.test.common;version='[0.9.0,0.9.1)',\
diff --git a/cdi-extension-mp-jwt-auth/base-itest.bndrun b/cdi-extension-mp-jwt-auth/base-itest.bndrun
index b665da8..b66bd01 100644
--- a/cdi-extension-mp-jwt-auth/base-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/base-itest.bndrun
@@ -37,8 +37,7 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc,\
- ${bndjava15temorarysupplementalpackages}
+ sun.misc
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-extension-mp-jwt-auth/owb-itest.bndrun b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
index a00171c..7103e36 100644
--- a/cdi-extension-mp-jwt-auth/owb-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
@@ -59,7 +59,7 @@
org.apache.johnzon.osgi;version='[1.2.8,1.2.9)',\
org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
diff --git a/cdi-extension-mp-jwt-auth/pom.xml b/cdi-extension-mp-jwt-auth/pom.xml
index 7ac95ba..d3e7d73 100644
--- a/cdi-extension-mp-jwt-auth/pom.xml
+++ b/cdi-extension-mp-jwt-auth/pom.xml
@@ -255,6 +255,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
</exclusion>
diff --git a/cdi-extension-mp-metrics/base-itest.bndrun b/cdi-extension-mp-metrics/base-itest.bndrun
index b665da8..b66bd01 100644
--- a/cdi-extension-mp-metrics/base-itest.bndrun
+++ b/cdi-extension-mp-metrics/base-itest.bndrun
@@ -37,8 +37,7 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc,\
- ${bndjava15temorarysupplementalpackages}
+ sun.misc
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=${project.artifactId})',\
diff --git a/cdi-extension-mp-metrics/owb-itest.bndrun b/cdi-extension-mp-metrics/owb-itest.bndrun
index a053903..d63b8fc 100644
--- a/cdi-extension-mp-metrics/owb-itest.bndrun
+++ b/cdi-extension-mp-metrics/owb-itest.bndrun
@@ -52,7 +52,7 @@
org.apache.johnzon.osgi;version='[1.2.8,1.2.9)',\
org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
diff --git a/cdi-itests/base-itest.bndrun b/cdi-itests/base-itest.bndrun
index fa4af5c..82c7f16 100644
--- a/cdi-itests/base-itest.bndrun
+++ b/cdi-itests/base-itest.bndrun
@@ -36,8 +36,7 @@
org.slf4j.helpers;version=1.7.25,\
org.slf4j.spi;version=1.7.25,\
sun.invoke,\
- sun.misc,\
- ${bndjava15temorarysupplementalpackages}
+ sun.misc
-runrequires.base: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.cdi.extra)',\
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 27aec5b..d0316c5 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -19,7 +19,7 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
-runbundles: \
- biz.aQute.junit;version='[5.1.0,5.1.1)',\
+ biz.aQute.junit;version='[5.1.2,5.1.3)',\
javax.servlet.jsp-api;version='[2.3.3,2.3.4)',\
openwebbeans-impl;version='[2.0.13,2.0.14)',\
openwebbeans-spi;version='[2.0.13,2.0.14)',\
@@ -56,7 +56,7 @@
org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
org.apache.xbean.asm7-shaded;version='[4.13.0,4.13.1)',\
- org.apache.xbean.bundleutils;version='[4.15.0,4.15.1)',\
+ org.apache.xbean.bundleutils;version='[4.18.0,4.18.1)',\
org.apache.xbean.finder-shaded;version='[4.13.0,4.13.1)',\
org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index 441cf38..0db0bf3 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -20,7 +20,7 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
-runbundles: \
- biz.aQute.junit;version='[5.1.0,5.1.1)',\
+ biz.aQute.junit;version='[5.1.2,5.1.3)',\
jboss-classfilewriter;version='[1.2.4,1.2.5)',\
org.apache.aries.cdi.extender;version='[1.1.4,1.1.5)',\
org.apache.aries.cdi.extension.jaxrs;version='[1.1.4,1.1.5)',\
diff --git a/pom.xml b/pom.xml
index ce256a0..4b2edc4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,6 @@
<properties>
<revision>1.1.4-SNAPSHOT</revision>
<java.build.version>1.8</java.build.version>
- <!-- <maven.compiler.release>${java.build.version}</maven.compiler.release> -->
<maven.compiler.source>${java.build.version}</maven.compiler.source>
<maven.compiler.target>${java.build.version}</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -44,7 +43,7 @@
<bnd.baseline.skip>false</bnd.baseline.skip>
<!-- Versions -->
- <bnd.version>5.1.0</bnd.version>
+ <bnd.version>5.1.2</bnd.version>
<byte.buddy.version>1.10.6</byte.buddy.version>
<jax.rs.whiteboard.version>1.0.6</jax.rs.whiteboard.version>
<jaxb.api.version>2.3.2</jaxb.api.version>
@@ -58,51 +57,6 @@
<slf4j.version>1.7.30</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>
@@ -445,6 +399,19 @@
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>java-release</id>
+ <activation>
+ <jdk>9,)</jdk>
+ </activation>
+ <properties>
+ <java.build.version>${java.vm.specification.version}</java.build.version>
+ <maven.compiler.release>${java.build.version}</maven.compiler.release>
+ <maven.compiler.source>${java.build.version}</maven.compiler.source>
+ <maven.compiler.target>${java.build.version}</maven.compiler.target>
+ </properties>
+ </profile>
</profiles>
<build>
