Merge pull request #199 from jbonofre/ARIES-2090
[ARIES-2090] Refactore and fix Karaf features
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index dfcc81c..5606c46 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -53,27 +53,32 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
+ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.jaxb.json.cxf-jettison;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest-tests;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-extension-providers;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-extension-providers;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.jetty;version='[4.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
- 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.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.apache.ws.xmlschema.core;version='[2.3.0,2.3.1)',\
- org.codehaus.jettison.jettison;version='[1.4.1,1.4.2)',\
+ org.codehaus.jettison.jettison;version='[1.5.3,1.5.4)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
org.osgi.util.promise;version='[1.2.0,1.2.1)',\
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index db9d5f2..dc172ec 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -52,29 +52,33 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.jackson.core.jackson-annotations;version='[2.13.2,2.13.3)',\
- com.fasterxml.jackson.core.jackson-core;version='[2.13.2,2.13.3)',\
- com.fasterxml.jackson.core.jackson-databind;version='[2.13.2,2.13.3)',\
- com.fasterxml.jackson.jaxrs.jackson-jaxrs-base;version='[2.13.2,2.13.3)',\
- com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;version='[2.13.2,2.13.3)',\
- com.fasterxml.jackson.module.jackson-module-jaxb-annotations;version='[2.13.2,2.13.3)',\
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ com.fasterxml.jackson.core.jackson-annotations;version='[2.14.1,2.14.2)',\
+ com.fasterxml.jackson.core.jackson-core;version='[2.14.1,2.14.2)',\
+ com.fasterxml.jackson.core.jackson-databind;version='[2.14.1,2.14.2)',\
+ com.fasterxml.jackson.jaxrs.jackson-jaxrs-base;version='[2.14.1,2.14.2)',\
+ com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;version='[2.14.1,2.14.2)',\
+ com.fasterxml.jackson.module.jackson-module-jaxb-annotations;version='[2.14.1,2.14.2)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.jackson;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.jackson.itest-tests;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.jetty;version='[4.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
- 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.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.apache.ws.xmlschema.core;version='[2.3.0,2.3.1)',\
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index 3c8987b..e4546b5 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -61,31 +61,35 @@
com.fasterxml.jackson.core.jackson-databind;version='[2.13.2,2.13.3)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.13.2,2.13.3)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.13.2,2.13.3)',\
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
io.github.classgraph.classgraph;version='[4.8.138,4.8.139)',\
io.swagger.core.v3.swagger-annotations;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-core;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-integration;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-jaxrs2;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-models;version='[2.2.0,2.2.1)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
jakarta.validation.jakarta.validation-api;version='[2.0.2,2.0.3)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.openapi.itest-tests;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.openapi.resource;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
org.apache.felix.http.jetty;version='[4.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
- 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.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.apache.ws.xmlschema.core;version='[2.3.0,2.3.1)',\
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index a4ff864..e4ab06c 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -67,7 +67,7 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- assertj-core;version='[3.22.0,3.22.1)',\
+ assertj-core;version='[3.23.1,3.23.2)',\
com.fasterxml.jackson.core.jackson-annotations;version='[2.13.2,2.13.3)',\
com.fasterxml.jackson.core.jackson-core;version='[2.13.2,2.13.3)',\
com.fasterxml.jackson.core.jackson-databind;version='[2.13.2,2.13.3)',\
@@ -75,24 +75,31 @@
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.13.2,2.13.3)',\
com.fasterxml.jackson.jaxrs.jackson-jaxrs-base;version='[2.13.2,2.13.3)',\
com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;version='[2.13.2,2.13.3)',\
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
com.jayway.jsonpath.json-path;version='[2.4.0,2.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
io.github.classgraph.classgraph;version='[4.8.138,4.8.139)',\
io.swagger.core.v3.swagger-annotations;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-core;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-integration;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-jaxrs2;version='[2.2.0,2.2.1)',\
io.swagger.core.v3.swagger-models;version='[2.2.0,2.2.1)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
jakarta.validation.jakarta.validation-api;version='[2.0.2,2.0.3)',\
+ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
junit-jupiter-api;version='[5.8.2,5.8.3)',\
junit-jupiter-engine;version='[5.8.2,5.8.3)',\
junit-jupiter-params;version='[5.8.2,5.8.3)',\
junit-platform-commons;version='[1.8.2,1.8.3)',\
junit-platform-engine;version='[1.8.2,1.8.3)',\
junit-platform-launcher;version='[1.8.2,1.8.3)',\
- net.javacrumbs.json-unit.json-unit-assertj;version='[2.34.0,2.34.1)',\
- net.javacrumbs.json-unit.json-unit-core;version='[2.34.0,2.34.1)',\
- net.javacrumbs.json-unit.json-unit-json-path;version='[2.34.0,2.34.1)',\
+ net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
+ net.javacrumbs.json-unit.json-unit-assertj;version='[2.36.0,2.36.1)',\
+ net.javacrumbs.json-unit.json-unit-core;version='[2.36.0,2.36.1)',\
+ net.javacrumbs.json-unit.json-unit-json-path;version='[2.36.0,2.36.1)',\
net.minidev.accessors-smart;version='[1.2.0,1.2.1)',\
net.minidev.json-smart;version='[2.3.0,2.3.1)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
@@ -100,25 +107,24 @@
org.apache.aries.jax.rs.rest.management;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.rest.management.itest-tests;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
org.apache.commons.lang3;version='[3.12.0,3.12.1)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
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.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
- 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.geronimo.specs.geronimo-json_1.1_spec;version='[1.5.0,1.5.1)',\
- org.apache.johnzon.core;version='[1.2.15,1.2.16)',\
- org.apache.johnzon.mapper;version='[1.2.15,1.2.16)',\
+ org.apache.johnzon.core;version='[1.2.19,1.2.20)',\
+ org.apache.johnzon.mapper;version='[1.2.19,1.2.20)',\
org.apache.ws.xmlschema.core;version='[2.3.0,2.3.1)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.objectweb.asm;version='[5.0.4,5.0.5)',\
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index 1a7251b..6fac491 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -53,30 +53,35 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
+ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.shiro.authc;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.shiro.authz;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.shiro.itest-tests;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
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.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
- 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.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
- org.apache.shiro.core;version='[1.9.0,1.9.1)',\
- org.apache.shiro.web.jaxrs;version='[1.9.0,1.9.1)',\
+ org.apache.shiro.core;version='[1.10.1,1.10.2)',\
+ org.apache.shiro.web.jaxrs;version='[1.10.1,1.10.2)',\
org.apache.ws.xmlschema.core;version='[2.3.0,2.3.1)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
org.osgi.util.function;version='[1.2.0,1.2.1)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index b30bb92..02a9da6 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -61,25 +61,30 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
+ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.example;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
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.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
org.apache.felix.scr;version='[2.2.0,2.2.1)',\
- 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.3.0,2.3.1)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index 906c278..7e1b0c6 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -61,23 +61,28 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
+ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
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.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
- 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.3.0,2.3.1)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
diff --git a/jax-rs.features/pom.xml b/jax-rs.features/pom.xml
index d705959..4b2d07f 100644
--- a/jax-rs.features/pom.xml
+++ b/jax-rs.features/pom.xml
@@ -32,6 +32,20 @@
<name>Apache Aries JAX-RS Whiteboard Karaf Features</name>
<packaging>pom</packaging>
+ <properties>
+ <karaf.version>4.4.2</karaf.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
+ <artifactId>framework</artifactId>
+ <version>${karaf.version}</version>
+ <type>kar</type>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
<build>
<resources>
<resource>
@@ -53,6 +67,41 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>file:${project.build.directory}/feature/feature.xml</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/framework/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</descriptor>
+ <descriptor>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</descriptor>
+ </descriptors>
+ <distribution>org.apache.karaf.features:framework</distribution>
+ <javase>9</javase>
+ <framework>
+ <feature>framework</feature>
+ </framework>
+ <features>
+ <feature>aries-jax-rs-whiteboard</feature>
+ <feature>aries-jax-rs-whiteboard-jackson</feature>
+ <feature>aries-jax-rs-whiteboard-jettison</feature>
+ <feature>aries-jax-rs-whiteboard-openapi</feature>
+ <feature>aries-jax-rs-whiteboard-rest-management</feature>
+ <feature>aries-jax-rs-whiteboard-shiro</feature>
+ </features>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.3.0</version>
@@ -66,7 +115,7 @@
<configuration>
<artifacts>
<artifact>
- <file>target/feature/feature.xml</file>
+ <file>${project.build.directory}/feature/feature.xml</file>
<type>xml</type>
</artifact>
</artifacts>
diff --git a/jax-rs.features/src/main/feature/feature.xml b/jax-rs.features/src/main/feature/feature.xml
index 5fad4c6..910cfe3 100644
--- a/jax-rs.features/src/main/feature/feature.xml
+++ b/jax-rs.features/src/main/feature/feature.xml
@@ -21,22 +21,63 @@
<feature version="${project.version}" name="aries-jax-rs-whiteboard">
<feature>http-whiteboard</feature>
+ <feature>cxf-specs</feature>
+ <feature>cxf-jaxrs</feature>
+ <feature>cxf-sse</feature>
<bundle dependency="true">mvn:org.apache.aries.spec/org.apache.aries.javax.jax.rs-api/1.0.1</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.function/1.1.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.util.promise/1.1.0</bundle>
<bundle dependency="true">mvn:org.osgi/org.osgi.service.jaxrs/1.0.0</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.annotation-api-1.3/1.3_1</bundle>
+ <bundle dependency="true">mvn:org.apache.aries.component-dsl/org.apache.aries.component-dsl.component-dsl/${dsl.version}</bundle>
<bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.whiteboard/${project.version}</bundle>
</feature>
- <feature version="1.0.0" name="aries-jax-rs-whiteboard-jackson">
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/2.9.6</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.6</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/2.9.6</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.9.6</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.9.6</bundle>
- <bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.6</bundle>
- <bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.jackson/1.0.0</bundle>
+ <feature version="${project.version}" name="aries-jax-rs-whiteboard-jackson">
+ <feature dependency="true">aries-jax-rs-whiteboard</feature>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle>
+ <bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.jackson/${project.version}</bundle>
+ </feature>
+
+ <feature version="${project.version}" name="aries-jax-rs-whiteboard-jettison">
+ <feature dependency="true">aries-jax-rs-whiteboard</feature>
+ <bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.jaxb.json.cxf-jettison/${project.version}</bundle>
+ </feature>
+
+ <feature version="${project.version}" name="aries-jax-rs-whiteboard-openapi">
+ <feature dependency="true">aries-jax-rs-whiteboard</feature>
+ <bundle dependency="true">mvn:jakarta.validation/jakarta.validation-api/2.0.2</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${jackson.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
+ <bundle dependency="true">mvn:io.github.classgraph/classgraph/4.8.25</bundle>
+ <bundle dependency="true">mvn:io.swagger.core.v3/swagger-core/${openapi.version}</bundle>
+ <bundle dependency="true">mvn:io.swagger.core.v3/swagger-annotations/${openapi.version}</bundle>
+ <bundle dependency="true">mvn:io.swagger.core.v3/swagger-models/${openapi.version}</bundle>
+ <bundle dependency="true">mvn:io.swagger.core.v3/swagger-integration/${openapi.version}</bundle>
+ <bundle dependency="true">mvn:io.swagger.core.v3/swagger-jaxrs2/${openapi.version}</bundle>
+ <bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.openapi.resource/${project.version}</bundle>
+ </feature>
+
+ <feature version="${project.version}" name="aries-jax-rs-whiteboard-rest-management">
+ <feature dependency="true">aries-jax-rs-whiteboard-openapi</feature>
+ <bundle dependency="true">mvn:org.osgi/org.osgi.service.rest/1.0.0</bundle>
+ <bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.rest.management/${project.version}</bundle>
+ </feature>
+
+ <feature version="${project.version}" name="aries-jax-rs-whiteboard-shiro">
+ <feature dependency="true">aries-jax-rs-whiteboard</feature>
+ <bundle dependency="true">mvn:org.apache.shiro/shiro-core/${shiro.version}</bundle>
+ <bundle dependency="true">mvn:org.apache.shiro/shiro-jaxrs/${shiro.version}</bundle>
+ <bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.shiro.authc/${project.version}</bundle>
+ <bundle>mvn:org.apache.aries.jax.rs/org.apache.aries.jax.rs.shiro.authz/${project.version}</bundle>
</feature>
</features>
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 3e890bf..439bf1f 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -56,26 +56,32 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- assertj-core;version='[3.22.0,3.22.1)',\
- com.fasterxml.woodstox.woodstox-core;version='[6.2.7,6.2.8)',\
+ assertj-core;version='[3.23.1,3.23.2)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.4.0,6.4.1)',\
+ com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
+ jakarta.activation-api;version='[1.2.2,1.2.3)',\
+ jakarta.annotation-api;version='[1.3.5,1.3.6)',\
+ jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
+ jakarta.xml.soap-api;version='[1.4.2,1.4.3)',\
+ jakarta.xml.ws-api;version='[2.3.3,2.3.4)',\
+ net.bytebuddy.byte-buddy;version='[1.12.10,1.12.11)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
org.apache.aries.jax.rs.itests-tests;version='[2.0.2,2.0.3)',\
org.apache.aries.jax.rs.whiteboard;version='[2.0.2,2.0.3)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.5,1.3.6)',\
- org.apache.cxf.cxf-core;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-client;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-security-cors;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-rs-sse;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-security;version='[3.5.2,3.5.3)',\
- org.apache.cxf.cxf-rt-transports-http;version='[3.5.2,3.5.3)',\
- org.apache.felix.configadmin;version='[1.9.24,1.9.25)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.6,1.3.7)',\
+ org.apache.cxf.cxf-core;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-security-cors;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-security;version='[3.5.5,3.5.6)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.5.5,3.5.6)',\
+ org.apache.felix.configadmin;version='[1.9.26,1.9.27)',\
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.2.0,4.2.1)',\
org.apache.felix.http.servlet-api;version='[1.2.0,1.2.1)',\
- 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.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.apache.ws.xmlschema.core;version='[2.3.0,2.3.1)',\
diff --git a/pom.xml b/pom.xml
index 34f2bca..cf23ebb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,9 +98,9 @@
<modules>
<module>jax-rs.whiteboard</module>
<module>jax-rs.itests</module>
- <module>jax-rs.features</module>
<module>jax-rs.example</module>
<module>integrations</module>
+ <module>jax-rs.features</module>
</modules>
<dependencyManagement>
