ARIES-2029 finalize unbundling of cxf
Signed-off-by: Raymond Auge <rotty3000@apache.org>
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index 15bc100..0ff302b 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
--standalone: true
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -32,7 +31,6 @@
-resolve.effective: resolve, active
-runrequires: \
- osgi.identity;filter:='(osgi.identity=com.sun.xml.bind.jaxb-osgi)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest)'
-runsystemcapabilities: ${native_capability}
@@ -43,27 +41,37 @@
org.apache.cxf.osgi.http.transport.disable=true,\
org.apache.felix.http.host=localhost,\
org.osgi.service.http.port=*,\
- org.apache.aries.spifly.auto.consumers=jakarta.xml.bind-api,\
- org.apache.aries.spifly.auto.providers=com.sun.xml.bind.jaxb-osgi
+ org.apache.aries.spifly.auto.consumers=jakarta.*,\
+ org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
- org.apache.aries.jax.rs.itests-fragment;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.jaxb.json.cxf-jettison;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
+ org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-extension-providers;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.2,3.4.3)',\
org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
org.apache.felix.http.jetty;version='[4.1.4,4.1.5)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-jaxrs_2.1_spec;version='[1.1.0,1.1.1)',\
+ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
+ org.codehaus.jettison.jettison;version='[1.4.1,1.4.2)',\
org.osgi.service.jaxrs;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.1,1.1.2)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+ stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
order=sortbynameversion,\
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
index eade11a..47ffc9b 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-itest/pom.xml
@@ -61,20 +61,6 @@
</build>
<dependencies>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>${project.version}</version>
@@ -91,10 +77,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>osgi.enroute.junit.wrapper</artifactId>
</dependency>
<dependency>
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/bnd.bnd b/integrations/cxf-jettison/cxf-jettison-jaxrs/bnd.bnd
index 43cc902..4b1e439 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/bnd.bnd
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/bnd.bnd
@@ -15,44 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-Import-Package:\
- !com.sun.*,\
- !javax.cache.*,\
- !javax.imageio.*,\
- !javax.json.*,\
- !javax.jws.*,\
- !javax.security.*,\
- !javax.servlet.*,\
- !javax.tools.*,\
- !javax.validation.*,\
- !javax.wsdl.*,\
- !net.sf.cglib.proxy.*,\
- !org.apache.abdera.*,\
- !org.apache.aries.*,\
- !org.apache.cxf.aegis.*,\
- !org.apache.log4j.*,\
- !org.apache.neethi.*,\
- !org.apache.velocity.*,\
- !org.apache.xerces.*,\
- !org.apache.xml.resolver.*,\
- !org.apache.xmlbeans.*,\
- !org.atmosphere.*,\
- !org.dom4j.*,\
- !org.junit.*,\
- !org.jvnet.fastinfoset.*,\
- !org.jvnet.staxex.*,\
- !org.ietf.jgss.*,\
- !org.objectweb.asm.*,\
- !org.osgi.service.blueprint.*,\
- !org.osgi.service.http,\
- !org.relaxng.datatype.*,\
- !org.slf4j.spi.*,\
- !org.springframework.*,\
- !org.codehaus.*,\
- *
-
--includeresource:\
- lib/component-dsl.jar=org.apache.aries.component-dsl.component-dsl-*.jar;lib:=true,\
- lib/cxf-rt-rs-extension-providers.jar=cxf-rt-rs-extension-providers-*.jar;lib:=true,\
- lib/cxf-rt-rs-json-basic.jar=cxf-rt-rs-json-basic-*.jar;lib:=true,\
- @jettison-*.jar
+-conditionalpackage: org.apache.aries.component.dsl.*
\ No newline at end of file
diff --git a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
index 9254a16..7441a20 100644
--- a/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
+++ b/integrations/cxf-jettison/cxf-jettison-jaxrs/pom.xml
@@ -31,20 +31,6 @@
<dependencies>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.aries.component-dsl</groupId>
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
</dependency>
@@ -53,22 +39,10 @@
<artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-json-basic</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.4.1</version>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index 36c2165..b536f5f 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
--standalone: true
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -40,7 +39,9 @@
osgi.console=, \
org.apache.cxf.osgi.http.transport.disable=true,\
org.apache.felix.http.host=localhost,\
- org.osgi.service.http.port=*
+ org.osgi.service.http.port=*,\
+ org.apache.aries.spifly.auto.consumers=jakarta.*,\
+ org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
com.fasterxml.jackson.core.jackson-annotations;version='[2.12.1,2.12.2)',\
@@ -49,21 +50,31 @@
com.fasterxml.jackson.jaxrs.jackson-jaxrs-base;version='[2.12.1,2.12.2)',\
com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;version='[2.12.1,2.12.2)',\
com.fasterxml.jackson.module.jackson-module-jaxb-annotations;version='[2.12.1,2.12.2)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.jackson;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.jackson.itest;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
+ org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.2,3.4.3)',\
org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
org.apache.felix.http.jetty;version='[4.1.4,4.1.5)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-jaxrs_2.1_spec;version='[1.1.0,1.1.1)',\
+ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;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.1,1.1.2)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+ stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
order=sortbynameversion,\
diff --git a/integrations/jackson/jackson-itest/pom.xml b/integrations/jackson/jackson-itest/pom.xml
index 02675f8..fc38c5b 100644
--- a/integrations/jackson/jackson-itest/pom.xml
+++ b/integrations/jackson/jackson-itest/pom.xml
@@ -63,20 +63,6 @@
</build>
<dependencies>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>${project.version}</version>
@@ -86,11 +72,6 @@
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.jackson</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -102,14 +83,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>osgi.enroute.junit.wrapper</artifactId>
</dependency>
<dependency>
diff --git a/integrations/jackson/jackson-jaxrs/pom.xml b/integrations/jackson/jackson-jaxrs/pom.xml
index 8700537..4ebe27c 100644
--- a/integrations/jackson/jackson-jaxrs/pom.xml
+++ b/integrations/jackson/jackson-jaxrs/pom.xml
@@ -36,19 +36,21 @@
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.aries.component-dsl</groupId>
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index c4b182b..29d3b48 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
--standalone: true
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -27,6 +26,9 @@
org.slf4j.helpers;version=${slf4j.version},\
org.slf4j.spi;version=${slf4j.version}
+-runblacklist: \
+ osgi.identity;filter:='(&(osgi.identity=org.apache.commons.lang3)(version<3.7))'
+
-runfw: org.eclipse.osgi
-resolve.effective: resolve, active
@@ -41,7 +43,9 @@
osgi.console=, \
org.apache.cxf.osgi.http.transport.disable=true,\
org.apache.felix.http.host=localhost,\
- org.osgi.service.http.port=*
+ org.osgi.service.http.port=*,\
+ org.apache.aries.spifly.auto.consumers=jakarta.*,\
+ org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
com.fasterxml.jackson.core.jackson-annotations;version='[2.10.1,2.10.2)',\
@@ -49,6 +53,8 @@
com.fasterxml.jackson.core.jackson-databind;version='[2.10.1,2.10.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.10.1,2.10.2)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.10.1,2.10.2)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
io.github.classgraph.classgraph;version='[4.6.32,4.6.33)',\
io.swagger.core.v3.swagger-annotations;version='[2.1.0,2.1.1)',\
io.swagger.core.v3.swagger-core;version='[2.1.0,2.1.1)',\
@@ -62,17 +68,25 @@
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.commons.lang3;version='[3.11.0,3.11.1)',\
+ org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.2,3.4.3)',\
org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
org.apache.felix.http.jetty;version='[4.1.4,4.1.5)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-jaxrs_2.1_spec;version='[1.1.0,1.1.1)',\
+ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;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.1,1.1.2)',\
org.yaml.snakeyaml;version='[1.24.0,1.24.1)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+ stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
order=sortbynameversion,\
diff --git a/integrations/openapi/openapi-itest/pom.xml b/integrations/openapi/openapi-itest/pom.xml
index 45a87c7..384f552 100644
--- a/integrations/openapi/openapi-itest/pom.xml
+++ b/integrations/openapi/openapi-itest/pom.xml
@@ -63,11 +63,6 @@
</build>
<dependencies>
<dependency>
- <groupId>io.swagger.core.v3</groupId>
- <artifactId>swagger-jaxrs2</artifactId>
- <version>${openapi.version}</version>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>3.18.1</version>
@@ -88,11 +83,6 @@
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.openapi.resource</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_2.1_spec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -104,14 +94,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>osgi.enroute.junit.wrapper</artifactId>
</dependency>
<dependency>
diff --git a/integrations/openapi/openapi-resource/bnd.bnd b/integrations/openapi/openapi-resource/bnd.bnd
index 4b04e7a..13ef2e7 100644
--- a/integrations/openapi/openapi-resource/bnd.bnd
+++ b/integrations/openapi/openapi-resource/bnd.bnd
@@ -15,8 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-# Ideally we would not include this, but for some reason the Shiro JAX-RS
-# Support is not an OSGi bundle
-
Export-Package: org.apache.aries.jaxrs.openapi;version=${openapi.version}
+
-conditionalpackage: org.apache.aries.component.dsl.*
\ No newline at end of file
diff --git a/integrations/openapi/openapi-resource/pom.xml b/integrations/openapi/openapi-resource/pom.xml
index 088ef3f..07509c3 100644
--- a/integrations/openapi/openapi-resource/pom.xml
+++ b/integrations/openapi/openapi-resource/pom.xml
@@ -33,20 +33,6 @@
<dependencies>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>${project.version}</version>
@@ -65,15 +51,19 @@
<version>${openapi.version}</version>
<exclusions>
<exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.activation</groupId>
+ <artifactId>jakarta.activation-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/integrations/shiro/shiro-authc/bnd.bnd b/integrations/shiro/shiro-authc/bnd.bnd
index e1f663b..22aae57 100644
--- a/integrations/shiro/shiro-authc/bnd.bnd
+++ b/integrations/shiro/shiro-authc/bnd.bnd
@@ -18,6 +18,6 @@
# Ideally we would not include this, but for some reason the Shiro JAX-RS
# Support is not an OSGi bundle
-Export-Package: org.apache.shiro.web.jaxrs;version=${shiro.version}
+-includepackage: org.apache.shiro.web.jaxrs;version=${shiro.version}
-conditionalpackage: org.apache.aries.component.dsl.*
diff --git a/integrations/shiro/shiro-authc/pom.xml b/integrations/shiro/shiro-authc/pom.xml
index b24e6ba..d2f1394 100644
--- a/integrations/shiro/shiro-authc/pom.xml
+++ b/integrations/shiro/shiro-authc/pom.xml
@@ -47,14 +47,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/integrations/shiro/shiro-authz/bnd.bnd b/integrations/shiro/shiro-authz/bnd.bnd
index e1f663b..22aae57 100644
--- a/integrations/shiro/shiro-authz/bnd.bnd
+++ b/integrations/shiro/shiro-authz/bnd.bnd
@@ -18,6 +18,6 @@
# Ideally we would not include this, but for some reason the Shiro JAX-RS
# Support is not an OSGi bundle
-Export-Package: org.apache.shiro.web.jaxrs;version=${shiro.version}
+-includepackage: org.apache.shiro.web.jaxrs;version=${shiro.version}
-conditionalpackage: org.apache.aries.component.dsl.*
diff --git a/integrations/shiro/shiro-authz/pom.xml b/integrations/shiro/shiro-authz/pom.xml
index 181b809..72bafe0 100644
--- a/integrations/shiro/shiro-authz/pom.xml
+++ b/integrations/shiro/shiro-authz/pom.xml
@@ -47,14 +47,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
</dependencies>
<build>
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index 25a5a17..d4f961f 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
--standalone: true
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -33,7 +32,7 @@
-runrequires: \
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.shiro.itest)',\
- org.apache.felix.gogo;filter:='(implementation.name=gogo.shell)'
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runsystemcapabilities: ${native_capability}
@@ -41,15 +40,25 @@
logback.configurationFile=file:${.}/src/test/resources/logback.xml,\
org.apache.cxf.osgi.http.transport.disable=true,\
org.apache.felix.http.host=localhost,\
- org.osgi.service.http.port=*
+ org.osgi.service.http.port=*,\
+ org.apache.aries.spifly.auto.consumers=jakarta.*,\
+ org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.shiro.authc;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.shiro.authz;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.shiro.itest;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
+ org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.2,3.4.3)',\
org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.runtime;version='[1.1.4,1.1.5)',\
@@ -60,11 +69,13 @@
org.apache.geronimo.specs.geronimo-jaxrs_2.1_spec;version='[1.1.0,1.1.1)',\
org.apache.shiro.core;version='[1.7.0,1.7.1)',\
org.apache.shiro.lang;version='[1.7.0,1.7.1)',\
+ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;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.1,1.1.2)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+ stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
order=sortbynameversion,\
diff --git a/integrations/shiro/shiro-itest/pom.xml b/integrations/shiro/shiro-itest/pom.xml
index 3466140..6d09acf 100644
--- a/integrations/shiro/shiro-itest/pom.xml
+++ b/integrations/shiro/shiro-itest/pom.xml
@@ -90,10 +90,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>osgi.enroute.junit.wrapper</artifactId>
</dependency>
<dependency>
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index 84dbcf0..d2e60dd 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
--standalone: true
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -35,7 +34,6 @@
-resolve.effective: resolve, active
-runrequires: \
- osgi.identity;filter:='(osgi.identity=com.sun.xml.bind.jaxb-osgi)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.example)',\
osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
@@ -46,15 +44,22 @@
org.apache.cxf.osgi.http.transport.disable=true,\
org.apache.felix.http.host=localhost,\
org.osgi.service.http.port=8080,\
- org.apache.aries.spifly.auto.consumers=jakarta.xml.bind-api,\
- org.apache.aries.spifly.auto.providers=com.sun.xml.bind.jaxb-osgi
+ org.apache.aries.spifly.auto.consumers=jakarta.*,\
+ org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.example;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
+ org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.2,3.4.3)',\
org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.runtime;version='[1.1.4,1.1.5)',\
@@ -64,9 +69,11 @@
org.apache.felix.scr;version='[2.1.24,2.1.25)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-jaxrs_2.1_spec;version='[1.1.0,1.1.1)',\
+ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;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.1,1.1.2)'
+ org.osgi.util.promise;version='[1.1.1,1.1.2)',\
+ stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
order=sortbynameversion,\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index db88e87..c339444 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
--standalone: true
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -35,7 +34,6 @@
-resolve.effective: resolve, active
-runrequires: \
- osgi.identity;filter:='(osgi.identity=com.sun.xml.bind.jaxb-osgi)',\
osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.whiteboard)'
-runsystemcapabilities: ${native_capability}
@@ -45,22 +43,31 @@
org.apache.cxf.osgi.http.transport.disable=true,\
org.apache.felix.http.host=localhost,\
org.osgi.service.http.port=8080,\
- org.apache.aries.spifly.auto.consumers=jakarta.xml.bind-api,\
- org.apache.aries.spifly.auto.providers=com.sun.xml.bind.jaxb-osgi
+ org.apache.aries.spifly.auto.consumers=jakarta.*,\
+ org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
+ org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.2,3.4.3)',\
org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
org.apache.felix.http.jetty;version='[4.1.4,4.1.5)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-jaxrs_2.1_spec;version='[1.1.0,1.1.1)',\
+ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;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.1,1.1.2)'
+ org.osgi.util.promise;version='[1.1.1,1.1.2)',\
+ stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
order=sortbynameversion,\
diff --git a/jax-rs.example/pom.xml b/jax-rs.example/pom.xml
index 88f6124..16883ba 100644
--- a/jax-rs.example/pom.xml
+++ b/jax-rs.example/pom.xml
@@ -81,27 +81,10 @@
</build>
<dependencies>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
@@ -113,31 +96,5 @@
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.cm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.component.annotations</artifactId>
- <version>1.4.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.http.whiteboard</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.function</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.util.promise</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 7ea500a..9aa3231 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
--standalone: true
-runpath: \
ch.qos.logback.classic,\
ch.qos.logback.core,\
@@ -35,8 +34,8 @@
-resolve.effective: resolve, active
-runrequires: \
- osgi.identity;filter:='(osgi.identity=com.sun.xml.bind.jaxb-osgi)',\
- osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)'
+ osgi.identity;filter:='(osgi.identity=org.apache.aries.jax.rs.itests)',\
+ osgi.identity;filter:='(osgi.identity=org.apache.felix.gogo.command)'
-runsystemcapabilities: ${native_capability}
-runproperties: \
@@ -45,26 +44,37 @@
org.apache.cxf.osgi.http.transport.disable=true,\
org.apache.felix.http.host=localhost,\
org.osgi.service.http.port=*,\
- org.apache.aries.spifly.auto.consumers=jakarta.xml.bind-api,\
- org.apache.aries.spifly.auto.providers=com.sun.xml.bind.jaxb-osgi
+ org.apache.aries.spifly.auto.consumers=jakarta.*,\
+ org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.itests;version='[2.0.0,2.0.1)',\
- org.apache.aries.jax.rs.itests-fragment;version='[2.0.0,2.0.1)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.0,2.0.1)',\
org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
+ org.apache.cxf.cxf-core;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.2,3.4.3)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.2,3.4.3)',\
org.apache.felix.configadmin;version='[1.9.20,1.9.21)',\
+ org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
+ org.apache.felix.gogo.runtime;version='[1.1.4,1.1.5)',\
+ org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
org.apache.felix.http.jetty;version='[4.1.4,4.1.5)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
org.apache.geronimo.specs.geronimo-jaxrs_2.1_spec;version='[1.1.0,1.1.1)',\
+ org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;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.1,1.1.2)',\
osgi.enroute.hamcrest.wrapper;version='[1.3.0,1.3.1)',\
- osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)'
+ osgi.enroute.junit.wrapper;version='[4.12.0,4.12.1)',\
+ stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
order=sortbynameversion,\
diff --git a/jax-rs.itests/pom.xml b/jax-rs.itests/pom.xml
index cc88352..58d2dcd 100644
--- a/jax-rs.itests/pom.xml
+++ b/jax-rs.itests/pom.xml
@@ -68,28 +68,6 @@
</build>
<dependencies>
<dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.aries.jax.rs</groupId>
<artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
<version>${project.version}</version>
@@ -104,10 +82,6 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
</dependency>
<dependency>
diff --git a/jax-rs.itests/src/main/java/test/JaxrsTest.java b/jax-rs.itests/src/main/java/test/JaxrsTest.java
index 5f8ef66..3723d41 100644
--- a/jax-rs.itests/src/main/java/test/JaxrsTest.java
+++ b/jax-rs.itests/src/main/java/test/JaxrsTest.java
@@ -2369,6 +2369,8 @@
runtimeDTO = runtime.getRuntimeDTO();
assertEquals(0, runtimeDTO.failedResourceDTOs.length);
+ response = webTarget.request().get();
+
assertEquals(
"This should say hello", "Hello test",
response.readEntity(String.class));
@@ -2452,6 +2454,8 @@
runtimeDTO = runtime.getRuntimeDTO();
assertEquals(0, runtimeDTO.failedResourceDTOs.length);
+ response = webTarget.request().get();
+
assertEquals(
"This should say hello", "Hello test",
response.readEntity(String.class));
diff --git a/jax-rs.whiteboard/bnd.bnd b/jax-rs.whiteboard/bnd.bnd
index edd641e..2926951 100644
--- a/jax-rs.whiteboard/bnd.bnd
+++ b/jax-rs.whiteboard/bnd.bnd
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-Conditional-Package: org.apache.aries.component.dsl.*
-Import-Package: org.apache.cxf.jaxrs.client,*
+Provide-Capability: osgi.implementation;osgi.implementation="aries.jax-rs";version:Version="${Bundle-Version}"
-Provide-Capability: osgi.implementation;osgi.implementation="aries.jax-rs";version:Version="${Bundle-Version}"
\ No newline at end of file
+-conditionalpackage: org.apache.aries.component.dsl.*
\ No newline at end of file
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 5bb1a15..7c683d6 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -31,34 +31,10 @@
<dependencies>
<dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>biz.aQute.bnd.annotation</artifactId>
- <version>${bnd.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.apache.aries.component-dsl</groupId>
<artifactId>org.apache.aries.component-dsl.component-dsl</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.3_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
@@ -67,16 +43,12 @@
<artifactId>cxf-rt-rs-sse</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-tools-common</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.extender</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.3_spec</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -84,18 +56,10 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.namespace.service</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.service.jaxrs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
</dependency>
<dependency>
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java
index 6dfdd45..44ab2c2 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/activator/CxfJaxrsBundleActivator.java
@@ -65,6 +65,11 @@
@Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}")
public class CxfJaxrsBundleActivator implements BundleActivator {
+ public static final List<Class<?>> INTERNALLY_REQUIRED_CLASSES = Arrays.asList(
+ com.ctc.wstx.stax.WstxInputFactory.class,
+ com.sun.xml.bind.annotation.XmlLocation.class
+ );
+
private static final Logger _log = LoggerFactory.getLogger(
CxfJaxrsBundleActivator.class);
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/cxf/jaxrs/client/PromiseRxInvokerImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/cxf/jaxrs/client/PromiseRxInvokerImpl.java
index fc7781f..7ad5dc3 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/cxf/jaxrs/client/PromiseRxInvokerImpl.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/cxf/jaxrs/client/PromiseRxInvokerImpl.java
@@ -29,7 +29,6 @@
import org.osgi.util.promise.Promise;
import org.osgi.util.promise.PromiseFactory;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
diff --git a/pom.xml b/pom.xml
index 87ed0d9..674bdc7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<bnd.version>5.1.2</bnd.version>
- <cxf.version>3.2.14</cxf.version>
+ <cxf.version>3.4.2</cxf.version>
<dsl.version>1.2.2</dsl.version>
<jackson.version>2.12.1</jackson.version>
<jaxb.version>2.3.3</jaxb.version>
@@ -69,6 +69,12 @@
<dependencyManagement>
<dependencies>
<dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bnd.annotation</artifactId>
+ <version>${bnd.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
@@ -76,13 +82,22 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-core</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-tools-common</artifactId>
<version>${cxf.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity-engine-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
@@ -97,17 +112,6 @@
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>${cxf.version}</version>
- <exclusions>
- <exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
@@ -117,13 +121,25 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -132,12 +148,20 @@
<version>${cxf.version}</version>
<exclusions>
<exclusion>
- <groupId>javax.annotation</groupId>
- <artifactId>javax.annotation-api</artifactId>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
</exclusion>
<exclusion>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -268,6 +292,12 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
+ <artifactId>org.osgi.service.component.annotations</artifactId>
+ <version>1.4.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.service.http.whiteboard</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
@@ -306,37 +336,6 @@
</dependency>
<dependency>
- <groupId>jakarta.xml.ws</groupId>
- <artifactId>jakarta.xml.ws-api</artifactId>
- <version>${jaxb.version}</version>
- <scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- <version>${jaxb.version}</version>
- <exclusions>
- <exclusion>
- <groupId>jakarta.activation</groupId>
- <artifactId>jakarta.activation-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jakarta.annotation</groupId>
- <artifactId>jakarta.annotation-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-osgi</artifactId>
<version>${jaxb.version}</version>
@@ -351,8 +350,12 @@
<artifactId>geronimo-jaxrs_2.1_spec</artifactId>
</dependency>
<dependency>
+ <groupId>biz.aQute.bnd</groupId>
+ <artifactId>biz.aQute.bnd.annotation</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
+ <artifactId>org.osgi.service.jaxrs</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -546,9 +549,17 @@
<profiles>
<profile>
- <id>java-release</id>
+ <id>java-release-8</id>
<activation>
- <jdk>9,)</jdk>
+ <jdk>1.8</jdk>
+ </activation>
+ <properties>
+ </properties>
+ </profile>
+ <profile>
+ <id>java-release-9+</id>
+ <activation>
+ <jdk>[9,)</jdk>
</activation>
<properties>
<java.build.version>${java.specification.version}</java.build.version>
@@ -556,6 +567,32 @@
<maven.compiler.source>${java.build.version}</maven.compiler.source>
<maven.compiler.target>${java.build.version}</maven.compiler.target>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ <version>${jaxb.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.xml.ws</groupId>
+ <artifactId>jakarta.xml.ws-api</artifactId>
+ </dependency>
+ </dependencies>
</profile>
</profiles>
