update jdks tested via github actions
Signed-off-by: Raymond Augé <rotty3000@apache.org>
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index af02257..a03155b 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,7 +21,7 @@
JDKxx_Matrix:
strategy:
matrix:
- java: [ 8, 11, 14, 15-ea ]
+ java: [ 8, 15, 16-ea ]
os: [ ubuntu-latest ]
include:
- os: windows-latest
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index dc5b778..20d5b5f 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -53,7 +53,7 @@
org.apache.aries.jax.rs.jaxb.json.cxf-jettison;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.jaxb.json.cxf-jettison-itest;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index 0cad5a5..d4913db 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -53,7 +53,7 @@
org.apache.aries.jax.rs.jackson;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.jackson.itest;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index e09405f..79f8aae 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -60,7 +60,7 @@
org.apache.aries.jax.rs.openapi.itest;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.openapi.resource;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.commons.lang3;version='[3.10.0,3.10.1)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index 9d6c4c7..a48360d 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -48,7 +48,7 @@
org.apache.aries.jax.rs.shiro.authz;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.shiro.itest;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.commons.configuration;version='[2.2.0,2.2.1)',\
org.apache.commons.lang3;version='[3.6.0,3.6.1)',\
org.apache.commons.logging;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 f2d0f31..36e4fd7 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -53,7 +53,7 @@
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.jax.rs.example;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.gogo.command;version='[1.1.2,1.1.3)',\
org.apache.felix.gogo.runtime;version='[1.1.4,1.1.5)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index 7bfb546..ec204c9 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -52,7 +52,7 @@
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='[1.0.11,1.0.12)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 798bca5..a567cf4 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -54,7 +54,7 @@
org.apache.aries.jax.rs.itests;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.itests-fragment;version='[1.0.11,1.0.12)',\
org.apache.aries.jax.rs.whiteboard;version='[1.0.11,1.0.12)',\
- org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.0,1.3.1)',\
+ org.apache.aries.spifly.dynamic.framework.extension;version='[1.3.2,1.3.3)',\
org.apache.felix.configadmin;version='[1.9.18,1.9.19)',\
org.apache.felix.http.jetty;version='[4.0.8,4.0.9)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
diff --git a/jax-rs.whiteboard/pom.xml b/jax-rs.whiteboard/pom.xml
index 9e57efa..96e188b 100644
--- a/jax-rs.whiteboard/pom.xml
+++ b/jax-rs.whiteboard/pom.xml
@@ -31,6 +31,12 @@
<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>
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/client/ClientBuilderImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/client/ClientBuilderImpl.java
index ab91f15..3d1e6b6 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/client/ClientBuilderImpl.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/client/ClientBuilderImpl.java
@@ -19,6 +19,9 @@
import org.apache.cxf.jaxrs.client.PromiseRxInvokerProviderImpl;
+import aQute.bnd.annotation.spi.ServiceProvider;
+
+@ServiceProvider(javax.ws.rs.client.ClientBuilder.class)
public class ClientBuilderImpl extends org.apache.cxf.jaxrs.client.spec.ClientBuilderImpl {
public ClientBuilderImpl() {
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/package-info.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/package-info.java
index 4a4164a..177f78f 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/package-info.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/package-info.java
@@ -53,16 +53,10 @@
}
)
@Capability(
- name = "javax.ws.rs.client.ClientBuilder",
- namespace = "osgi.serviceloader",
- attribute = {
- "service.scope=prototype"
- }
-)
-@Capability(
name = "javax.ws.rs.ext.RuntimeDelegate",
namespace = "osgi.serviceloader",
attribute = {
+ "register:=org.apache.cxf.jaxrs.impl.RuntimeDelegateImpl",
"service.scope=prototype"
}
)
@@ -70,6 +64,7 @@
name = "javax.ws.rs.sse.SseEventSource.Builder",
namespace = "osgi.serviceloader",
attribute = {
+ "register:=org.apache.cxf.jaxrs.sse.client.SseEventSourceBuilderImpl",
"service.scope=prototype"
}
)
diff --git a/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/client/PromiseRxInvokerProviderImpl.java b/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/client/PromiseRxInvokerProviderImpl.java
index de420e9..0de5c48 100644
--- a/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/client/PromiseRxInvokerProviderImpl.java
+++ b/jax-rs.whiteboard/src/main/java/org/apache/cxf/jaxrs/client/PromiseRxInvokerProviderImpl.java
@@ -22,7 +22,6 @@
import javax.ws.rs.client.RxInvokerProvider;
import javax.ws.rs.client.SyncInvoker;
-import org.apache.cxf.jaxrs.client.SyncInvokerImpl;
import org.osgi.service.jaxrs.client.PromiseRxInvoker;
import org.osgi.util.promise.PromiseFactory;
diff --git a/pom.xml b/pom.xml
index 0399f9a..62b6252 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,7 +171,7 @@
<dependency>
<groupId>org.apache.aries.spifly</groupId>
<artifactId>org.apache.aries.spifly.dynamic.framework.extension</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2</version>
<scope>runtime</scope>
</dependency>
<dependency>
