You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2020/04/06 14:26:27 UTC
[aries-cdi] branch master updated: fix testing and re-add
resolution results for IDE testing
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
The following commit(s) were added to refs/heads/master by this push:
new 611ab33 fix testing and re-add resolution results for IDE testing
611ab33 is described below
commit 611ab33602a24f26bb0b1954d1e25a513f8e68dd
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Mon Apr 6 10:06:43 2020 -0400
fix testing and re-add resolution results for IDE testing
Signed-off-by: Raymond Augé <ro...@apache.org>
---
cdi-executable/pom.xml | 6 --
cdi-extension-mp-config/owb-itest.bndrun | 30 +++++++
cdi-extension-mp-config/pom.xml | 114 ++++++++++++++++++---------
cdi-extension-mp-config/weld-itest.bndrun | 30 +++++++
cdi-extension-mp-jwt-auth/owb-itest.bndrun | 52 +++++++++++++
cdi-extension-mp-jwt-auth/pom.xml | 117 +++++++++++++++++++---------
cdi-extension-mp-jwt-auth/weld-itest.bndrun | 49 ++++++++++++
cdi-extension-mp-metrics/owb-itest.bndrun | 45 +++++++++++
cdi-extension-mp-metrics/pom.xml | 113 ++++++++++++++++++---------
cdi-extension-mp-metrics/weld-itest.bndrun | 44 +++++++++++
cdi-itests/owb-itest.bndrun | 46 +++++++++++
cdi-itests/pom.xml | 60 ++++++++++----
cdi-itests/weld-itest.bndrun | 43 ++++++++++
pom.xml | 3 +
14 files changed, 618 insertions(+), 134 deletions(-)
diff --git a/cdi-executable/pom.xml b/cdi-executable/pom.xml
index 3c0ef6f..959556c 100644
--- a/cdi-executable/pom.xml
+++ b/cdi-executable/pom.xml
@@ -71,9 +71,6 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-resolver-maven-plugin</artifactId>
- <configuration>
- <includeDependencyManagement>true</includeDependencyManagement>
- </configuration>
<executions>
<execution>
<id>owb-resolve</id>
@@ -104,9 +101,6 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-export-maven-plugin</artifactId>
- <configuration>
- <includeDependencyManagement>true</includeDependencyManagement>
- </configuration>
<executions>
<execution>
<id>owb-export</id>
diff --git a/cdi-extension-mp-config/owb-itest.bndrun b/cdi-extension-mp-config/owb-itest.bndrun
index 0d26e61..1569a25 100644
--- a/cdi-extension-mp-config/owb-itest.bndrun
+++ b/cdi-extension-mp-config/owb-itest.bndrun
@@ -18,3 +18,33 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
+-runbundles: \
+ assertj-core;version='[3.15.0,3.15.1)',\
+ openwebbeans-impl;version='[2.0.13,2.0.14)',\
+ openwebbeans-spi;version='[2.0.13,2.0.14)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config-tests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ 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.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.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='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/cdi-extension-mp-config/pom.xml b/cdi-extension-mp-config/pom.xml
index 1fd80fc..dc20fee 100644
--- a/cdi-extension-mp-config/pom.xml
+++ b/cdi-extension-mp-config/pom.xml
@@ -49,19 +49,23 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <bnd><![CDATA[
- Export-Package: \
- org.eclipse.microprofile.config.*
- -includepackage: org.apache.geronimo.config.*
- -cdiannotations:
- -noclassforname: true
- -fixupmessages: "Split package...";is:=ignore
- -bundleannotations: \
- !org.eclipse.microprofile.config.*,\
- org.apache.aries.cdi.extension.mp.config.*
- ]]></bnd>
- </configuration>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <configuration>
+ <bnd><![CDATA[
+ Export-Package: org.eclipse.microprofile.config.*
+ -includepackage: org.apache.geronimo.config.*
+ -cdiannotations:
+ -noclassforname: true
+ -fixupmessages: "Split package...";is:=ignore
+ -bundleannotations: \
+ !org.eclipse.microprofile.config.*,\
+ org.apache.aries.cdi.extension.mp.config.*
+ ]]></bnd>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>net.bytebuddy</groupId>
@@ -234,17 +238,75 @@
<bnd><![CDATA[
p = org.apache.aries.cdi.extension.mp.config.test
Export-Package: !${p}.tb*,${p}.*
- Test-Cases: ${classes;HIERARCHY_ANNOTATED;org.junit.Test;CONCRETE}
-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
-includeresource: \
tb01.jar
]]></bnd>
- <testCases>useTestCasesHeader</testCases>
+ <testCases>junit4</testCases>
<includeClassesDir>false</includeClassesDir>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <excludes>
+ <exclude>org/apache/aries/cdi/extension/mp/config/test/tb*/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <configuration>
+ <bundles>
+ <bundle>target/${project.build.finalName}-tests.jar</bundle>
+ </bundles>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>owb-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- This is the plugin runs the OSGi integration tests. -->
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -253,9 +315,6 @@
<bundles>
<bundle>target/${project.build.finalName}-tests.jar</bundle>
</bundles>
- <failOnChanges>false</failOnChanges>
- <includeDependencyManagement>true</includeDependencyManagement>
- <resolve>true</resolve>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -305,25 +364,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- <excludes>
- <exclude>org/apache/aries/cdi/extension/mp/config/test/tb*/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/cdi-extension-mp-config/weld-itest.bndrun b/cdi-extension-mp-config/weld-itest.bndrun
index a7025c4..caf9adc 100644
--- a/cdi-extension-mp-config/weld-itest.bndrun
+++ b/cdi-extension-mp-config/weld-itest.bndrun
@@ -19,3 +19,33 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
+-runbundles: \
+ assertj-core;version='[3.15.0,3.15.1)',\
+ jboss-classfilewriter;version='[1.2.4,1.2.5)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config-tests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ 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.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
+ org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
+ org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec;version='[2.0.0,2.0.1)',\
+ org.jboss.weld.osgi-bundle;version='[3.1.3,3.1.4)',\
+ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
+ org.osgi.test.common;version='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/cdi-extension-mp-jwt-auth/owb-itest.bndrun b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
index 0d26e61..56b7bdc 100644
--- a/cdi-extension-mp-jwt-auth/owb-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/owb-itest.bndrun
@@ -18,3 +18,55 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
+-runbundles: \
+ assertj-core;version='[3.15.0,3.15.1)',\
+ 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)',\
+ openwebbeans-web;version='[2.0.13,2.0.14)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-jwt-auth;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-jwt-auth-tests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.owb;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.commons.io;version='[2.6.0,2.6.1)',\
+ org.apache.commons.logging;version='[1.2.0,1.2.1)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-jaxrs_2.1_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.geronimo.specs.geronimo-json_1.1_spec;version='[1.3.0,1.3.1)',\
+ org.apache.geronimo.specs.geronimo-jsonb_1.0_spec;version='[1.2.0,1.2.1)',\
+ org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
+ org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
+ org.apache.johnzon.core;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.jsonb;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.mapper;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.osgi;version='[1.2.3,1.2.4)',\
+ 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.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)',\
+ org.osgi.test.common;version='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/cdi-extension-mp-jwt-auth/pom.xml b/cdi-extension-mp-jwt-auth/pom.xml
index 1afd270..3af3d78 100644
--- a/cdi-extension-mp-jwt-auth/pom.xml
+++ b/cdi-extension-mp-jwt-auth/pom.xml
@@ -49,20 +49,25 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <bnd><![CDATA[
- Export-Package: \
- org.eclipse.microprofile.auth.*,\
- org.eclipse.microprofile.jwt.*
- -includepackage: org.apache.geronimo.microprofile.impl.jwtauth.*
- -cdiannotations:
- -noclassforname: true
- -fixupmessages: "Split package...";is:=ignore
- -bundleannotations: \
- !org.eclipse.microprofile.*,\
- org.apache.aries.cdi.extension.mp.jwt.*
- ]]></bnd>
- </configuration>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <configuration>
+ <bnd><![CDATA[
+ Export-Package: \
+ org.eclipse.microprofile.auth.*,\
+ org.eclipse.microprofile.jwt.*
+ -includepackage: org.apache.geronimo.microprofile.impl.jwtauth.*
+ -cdiannotations:
+ -noclassforname: true
+ -fixupmessages: "Split package...";is:=ignore
+ -bundleannotations: \
+ !org.eclipse.microprofile.*,\
+ org.apache.aries.cdi.extension.mp.jwt.*
+ ]]></bnd>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>net.bytebuddy</groupId>
@@ -378,7 +383,6 @@
com.nimbusds.*,\
net.minidev.json.*,\
org.eclipse.microprofile.jwt.tck.util
- Test-Cases: ${classes;HIERARCHY_ANNOTATED;org.junit.Test;CONCRETE}
-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
-includeresource: \
@microprofile-jwt-auth-tck-[0-9.]*-tests.jar!/privateKey.pem,\
@@ -386,12 +390,71 @@
tb01.jar
-fixupmessages: "Split package...";is:=ignore
]]></bnd>
- <testCases>useTestCasesHeader</testCases>
+ <testCases>junit4</testCases>
<includeClassesDir>false</includeClassesDir>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <excludes>
+ <exclude>org/apache/aries/cdi/extension/mp/jwt/test/tb*/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <configuration>
+ <bundles>
+ <bundle>target/${project.build.finalName}-tests.jar</bundle>
+ </bundles>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>owb-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- This is the plugin runs the OSGi integration tests. -->
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -400,9 +463,6 @@
<bundles>
<bundle>target/${project.build.finalName}-tests.jar</bundle>
</bundles>
- <failOnChanges>false</failOnChanges>
- <includeDependencyManagement>true</includeDependencyManagement>
- <resolve>true</resolve>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -452,25 +512,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- <excludes>
- <exclude>org/apache/aries/cdi/extension/mp/jwt/test/tb*/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/cdi-extension-mp-jwt-auth/weld-itest.bndrun b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
index a7025c4..40b70b3 100644
--- a/cdi-extension-mp-jwt-auth/weld-itest.bndrun
+++ b/cdi-extension-mp-jwt-auth/weld-itest.bndrun
@@ -19,3 +19,52 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
+-runbundles: \
+ assertj-core;version='[3.15.0,3.15.1)',\
+ jboss-classfilewriter;version='[1.2.4,1.2.5)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-config;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-jwt-auth;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-jwt-auth-tests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.commons.io;version='[2.6.0,2.6.1)',\
+ org.apache.commons.logging;version='[1.2.0,1.2.1)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-jaxrs_2.1_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.geronimo.specs.geronimo-json_1.1_spec;version='[1.3.0,1.3.1)',\
+ org.apache.geronimo.specs.geronimo-jsonb_1.0_spec;version='[1.2.0,1.2.1)',\
+ org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
+ org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
+ org.apache.johnzon.core;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.jsonb;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.mapper;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.osgi;version='[1.2.3,1.2.4)',\
+ org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
+ org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
+ org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec;version='[2.0.0,2.0.1)',\
+ org.jboss.weld.osgi-bundle;version='[3.1.3,3.1.4)',\
+ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
+ org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ org.osgi.test.common;version='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/cdi-extension-mp-metrics/owb-itest.bndrun b/cdi-extension-mp-metrics/owb-itest.bndrun
index 0d26e61..f13a376 100644
--- a/cdi-extension-mp-metrics/owb-itest.bndrun
+++ b/cdi-extension-mp-metrics/owb-itest.bndrun
@@ -18,3 +18,48 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
+-runbundles: \
+ assertj-core;version='[3.15.0,3.15.1)',\
+ openwebbeans-impl;version='[2.0.13,2.0.14)',\
+ openwebbeans-spi;version='[2.0.13,2.0.14)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-metrics;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-metrics-tests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.commons.logging;version='[1.2.0,1.2.1)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-jaxrs_2.1_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.geronimo.specs.geronimo-json_1.1_spec;version='[1.3.0,1.3.1)',\
+ org.apache.geronimo.specs.geronimo-jsonb_1.0_spec;version='[1.2.0,1.2.1)',\
+ org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
+ org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
+ org.apache.johnzon.core;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.jsonb;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.mapper;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.osgi;version='[1.2.3,1.2.4)',\
+ 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.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)',\
+ org.osgi.test.common;version='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/cdi-extension-mp-metrics/pom.xml b/cdi-extension-mp-metrics/pom.xml
index 96c8684..ebc3ce8 100644
--- a/cdi-extension-mp-metrics/pom.xml
+++ b/cdi-extension-mp-metrics/pom.xml
@@ -49,18 +49,23 @@
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-maven-plugin</artifactId>
- <configuration>
- <bnd><![CDATA[
- Export-Package: org.eclipse.microprofile.metrics.*
- -includepackage: org.apache.geronimo.microprofile.metrics.*
- -cdiannotations:
- -noclassforname: true
- -fixupmessages: "Split package...";is:=ignore
- -bundleannotations: \
- !org.eclipse.microprofile.metrics.*,\
- org.apache.aries.cdi.extension.mp.metrics.*
- ]]></bnd>
- </configuration>
+ <executions>
+ <execution>
+ <id>bnd-process</id>
+ <configuration>
+ <bnd><![CDATA[
+ Export-Package: org.eclipse.microprofile.metrics.*
+ -includepackage: org.apache.geronimo.microprofile.metrics.*
+ -cdiannotations:
+ -noclassforname: true
+ -fixupmessages: "Split package...";is:=ignore
+ -bundleannotations: \
+ !org.eclipse.microprofile.metrics.*,\
+ org.apache.aries.cdi.extension.mp.metrics.*
+ ]]></bnd>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>net.bytebuddy</groupId>
@@ -274,18 +279,76 @@
<bnd><![CDATA[
p = org.apache.aries.cdi.extension.mp.metrics.test
Export-Package: !${p}.tb*,${p}.*
- Test-Cases: ${classes;HIERARCHY_ANNOTATED;org.junit.Test;CONCRETE}
-make: (*).(jar); type=bnd; recipe="${.}/bnd/$1.bnd"
-includeresource: \
tb01.jar
-fixupmessages: "Split package...";is:=ignore
]]></bnd>
- <testCases>useTestCasesHeader</testCases>
+ <testCases>junit4</testCases>
<includeClassesDir>false</includeClassesDir>
</configuration>
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ <configuration>
+ <archive>
+ <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+ </archive>
+ <excludes>
+ <exclude>org/apache/aries/cdi/extension/mp/metrics/test/tb*/**</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <configuration>
+ <bundles>
+ <bundle>target/${project.build.finalName}-tests.jar</bundle>
+ </bundles>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>owb-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
<!-- This is the plugin runs the OSGi integration tests. -->
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -294,9 +357,6 @@
<bundles>
<bundle>target/${project.build.finalName}-tests.jar</bundle>
</bundles>
- <failOnChanges>false</failOnChanges>
- <includeDependencyManagement>true</includeDependencyManagement>
- <resolve>true</resolve>
<scopes>
<scope>compile</scope>
<scope>runtime</scope>
@@ -346,25 +406,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>test-jar</id>
- <goals>
- <goal>test-jar</goal>
- </goals>
- <configuration>
- <archive>
- <manifestFile>${project.build.testOutputDirectory}/META-INF/MANIFEST.MF</manifestFile>
- </archive>
- <excludes>
- <exclude>org/apache/aries/cdi/extension/mp/metrics/test/tb*/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/cdi-extension-mp-metrics/weld-itest.bndrun b/cdi-extension-mp-metrics/weld-itest.bndrun
index a7025c4..282d695 100644
--- a/cdi-extension-mp-metrics/weld-itest.bndrun
+++ b/cdi-extension-mp-metrics/weld-itest.bndrun
@@ -19,3 +19,47 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
+-runbundles: \
+ assertj-core;version='[3.15.0,3.15.1)',\
+ jboss-classfilewriter;version='[1.2.4,1.2.5)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-metrics;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.mp-metrics-tests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.7,1.0.8)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.commons.logging;version='[1.2.0,1.2.1)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-jaxrs_2.1_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.geronimo.specs.geronimo-json_1.1_spec;version='[1.3.0,1.3.1)',\
+ org.apache.geronimo.specs.geronimo-jsonb_1.0_spec;version='[1.2.0,1.2.1)',\
+ org.apache.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
+ org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
+ org.apache.johnzon.core;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.jsonb;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.mapper;version='[1.2.3,1.2.4)',\
+ org.apache.johnzon.osgi;version='[1.2.3,1.2.4)',\
+ org.apache.servicemix.bundles.junit;version='[4.12.0,4.12.1)',\
+ org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
+ org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec;version='[2.0.0,2.0.1)',\
+ org.jboss.weld.osgi-bundle;version='[3.1.3,3.1.4)',\
+ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
+ org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ org.osgi.test.common;version='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/cdi-itests/owb-itest.bndrun b/cdi-itests/owb-itest.bndrun
index 0d26e61..05626cd 100644
--- a/cdi-itests/owb-itest.bndrun
+++ b/cdi-itests/owb-itest.bndrun
@@ -18,3 +18,49 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*weld*)'
+-runbundles: \
+ biz.aQute.junit;version='[5.0.1,5.0.2)',\
+ 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)',\
+ openwebbeans-web;version='[2.0.13,2.0.14)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.jndi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.owb;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.itests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.owb;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.6,1.0.7)',\
+ org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\
+ org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.util;version='[1.0.0,1.0.1)',\
+ org.apache.commons.logging;version='[1.2.0,1.2.1)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-jaxrs_2.1_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.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.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)',\
+ org.osgi.test.common;version='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/cdi-itests/pom.xml b/cdi-itests/pom.xml
index b38c48d..144e6f1 100644
--- a/cdi-itests/pom.xml
+++ b/cdi-itests/pom.xml
@@ -244,23 +244,38 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>org/apache/aries/cdi/test/beans/**</exclude>
- <exclude>org/apache/aries/cdi/test/components/**</exclude>
- <exclude>org/apache/aries/cdi/test/tb*/**</exclude>
- </excludes>
- </configuration>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>bnd-resolver-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>owb-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>owb-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ <execution>
+ <id>weld-resolve</id>
+ <phase>package</phase>
+ <goals>
+ <goal>resolve</goal>
+ </goals>
+ <configuration>
+ <bndruns>
+ <bndrun>weld-itest.bndrun</bndrun>
+ </bndruns>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
<artifactId>bnd-testing-maven-plugin</artifactId>
- <configuration>
- <includeDependencyManagement>true</includeDependencyManagement>
- <resolve>true</resolve>
- </configuration>
<executions>
<execution>
<id>owb-test</id>
@@ -297,24 +312,35 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-install-plugin</artifactId>
+ <artifactId>maven-deploy-plugin</artifactId>
<executions>
<execution>
- <id>default-install</id>
+ <id>default-deploy</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
- <artifactId>maven-deploy-plugin</artifactId>
+ <artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
- <id>default-deploy</id>
+ <id>default-install</id>
<phase>none</phase>
</execution>
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>org/apache/aries/cdi/test/beans/**</exclude>
+ <exclude>org/apache/aries/cdi/test/components/**</exclude>
+ <exclude>org/apache/aries/cdi/test/tb*/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-gpg-plugin</artifactId>
<executions>
<execution>
diff --git a/cdi-itests/weld-itest.bndrun b/cdi-itests/weld-itest.bndrun
index a7025c4..28e075a 100644
--- a/cdi-itests/weld-itest.bndrun
+++ b/cdi-itests/weld-itest.bndrun
@@ -19,3 +19,46 @@
-runblacklist: \
osgi.identity;filter:='(osgi.identity=*owb*)'
+-runbundles: \
+ biz.aQute.junit;version='[5.0.1,5.0.2)',\
+ jboss-classfilewriter;version='[1.2.4,1.2.5)',\
+ org.apache.aries.cdi.extender;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.jaxrs;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.jndi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.common;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.servlet.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extension.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.extra;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.itests;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.spi;version='[1.1.2,1.1.3)',\
+ org.apache.aries.cdi.weld;version='[1.1.2,1.1.3)',\
+ org.apache.aries.jax.rs.whiteboard;version='[1.0.6,1.0.7)',\
+ org.apache.aries.jndi.api;version='[1.1.0,1.1.1)',\
+ org.apache.aries.jndi.core;version='[1.0.2,1.0.3)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.2.4,1.2.5)',\
+ org.apache.aries.util;version='[1.0.0,1.0.1)',\
+ org.apache.commons.logging;version='[1.2.0,1.2.1)',\
+ org.apache.felix.configadmin;version='[1.9.10,1.9.11)',\
+ org.apache.felix.converter;version='[1.0.12,1.0.13)',\
+ org.apache.felix.gogo.command;version='[1.1.0,1.1.1)',\
+ org.apache.felix.gogo.runtime;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.shell;version='[1.1.2,1.1.3)',\
+ org.apache.felix.http.jetty;version='[4.0.14,4.0.15)',\
+ org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
+ org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-atinject_1.0_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-el_2.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-interceptor_1.2_spec;version='[1.1.0,1.1.1)',\
+ org.apache.geronimo.specs.geronimo-jaxrs_2.1_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.httpcomponents.httpclient;version='[4.5.3,4.5.4)',\
+ org.apache.httpcomponents.httpcore;version='[4.4.6,4.4.7)',\
+ org.jboss.logging.jboss-logging;version='[3.3.2,3.3.3)',\
+ org.jboss.spec.javax.ejb.jboss-ejb-api_3.2_spec;version='[2.0.0,2.0.1)',\
+ org.jboss.weld.osgi-bundle;version='[3.1.3,3.1.4)',\
+ org.osgi.service.cdi;version='[1.0.0,1.0.1)',\
+ org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ org.osgi.test.common;version='[1.0.0,1.0.1)',\
+ org.osgi.test.junit4;version='[1.0.0,1.0.1)',\
+ org.osgi.util.function;version='[1.1.0,1.1.1)',\
+ org.osgi.util.promise;version='[1.1.0,1.1.1)'
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index acfbb29..b747edb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -424,6 +424,7 @@
<version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
+ <includeDependencyManagement>true</includeDependencyManagement>
<resolve>false</resolve>
</configuration>
</plugin>
@@ -446,6 +447,7 @@
<version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
+ <includeDependencyManagement>true</includeDependencyManagement>
<reportOptional>false</reportOptional>
</configuration>
</plugin>
@@ -455,6 +457,7 @@
<version>${bnd.version}</version>
<configuration>
<failOnChanges>false</failOnChanges>
+ <includeDependencyManagement>true</includeDependencyManagement>
<resolve>false</resolve>
</configuration>
</plugin>