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 2021/11/17 18:46:36 UTC
[aries-jax-rs-whiteboard] branch master updated (b1a25b7 -> cc8c777)
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/aries-jax-rs-whiteboard.git.
from b1a25b7 Bump osgi.annotation from 8.0.0 to 8.0.1
new 2d25451 update resolution results
new cc8c777 try to add diagnostic output for service property failures
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun | 4 ++--
integrations/jackson/jackson-itest/itest.bndrun | 4 ++--
integrations/openapi/openapi-itest/itest.bndrun | 4 ++--
integrations/rest-management/rest-management-itest/itest.bndrun | 8 ++++----
.../org/apache/aries/jax/rs/rest/management/test/TestUtil.java | 8 +++++---
integrations/shiro/shiro-itest/itest.bndrun | 4 ++--
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 4 ++--
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 4 ++--
jax-rs.itests/itest.bndrun | 4 ++--
9 files changed, 23 insertions(+), 21 deletions(-)
[aries-jax-rs-whiteboard] 01/02: update resolution results
Posted by ro...@apache.org.
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-jax-rs-whiteboard.git
commit 2d254519dd80c1391432adc39ac9039aef247020
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Wed Nov 17 13:19:58 2021 -0500
update resolution results
Signed-off-by: Raymond Auge <ro...@apache.org>
---
integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun | 4 ++--
integrations/jackson/jackson-itest/itest.bndrun | 4 ++--
integrations/openapi/openapi-itest/itest.bndrun | 4 ++--
integrations/rest-management/rest-management-itest/itest.bndrun | 8 ++++----
integrations/shiro/shiro-itest/itest.bndrun | 4 ++--
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 4 ++--
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 4 ++--
jax-rs.itests/itest.bndrun | 4 ++--
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index 0ed9fd8..5cad81d 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -73,8 +73,8 @@ java.9.plus.reqs: \
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.1,1.0.2)',\
- 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.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
blacklist.java.8.jaxb: osgi.identity;filter:=(osgi.identity=jakarta.xml.bind-api)
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index e161297..70e5180 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -77,8 +77,8 @@ java.9.plus.reqs: \
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
- 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.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index 9e7f0f6..a821949 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -88,8 +88,8 @@ java.9.plus.reqs: \
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
- 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.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
org.yaml.snakeyaml;version='[1.27.0,1.27.1)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index eb75056..637ff8d 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -126,10 +126,10 @@ java.9.plus.reqs: \
org.osgi.test.assertj.framework;version='[1.0.1,1.0.2)',\
org.osgi.test.common;version='[1.0.1,1.0.2)',\
org.osgi.test.junit5;version='[1.0.1,1.0.2)',\
- org.osgi.util.function;version='[1.1.0,1.1.1)',\
- org.osgi.util.promise;version='[1.1.1,1.1.2)',\
- org.xmlunit.xmlunit-assertj3;version='[2.8.2,2.8.3)',\
- org.xmlunit.xmlunit-core;version='[2.8.2,2.8.3)',\
+ org.osgi.util.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
+ org.xmlunit.xmlunit-assertj3;version='[2.8.3,2.8.4)',\
+ org.xmlunit.xmlunit-core;version='[2.8.3,2.8.4)',\
org.yaml.snakeyaml;version='[1.27.0,1.27.1)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index 1e00c65..1f9c38c 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -77,8 +77,8 @@ java.9.plus.reqs: \
org.apache.shiro.web.jaxrs;version='[1.8.0,1.8.1)',\
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
- 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.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
blacklist.java.8.jaxb: osgi.identity;filter:=(osgi.identity=jakarta.xml.bind-api)
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index 533629b..67099d7 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -70,8 +70,8 @@
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.1,1.0.2)',\
- 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.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index 5312c12..4670f1f 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -64,8 +64,8 @@
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.1,1.0.2)',\
- 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.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
-runstartlevel: \
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 92a0c26..02cc64c 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -78,8 +78,8 @@ java.9.plus.reqs: \
org.apache.servicemix.bundles.junit;version='[4.13.2,4.13.3)',\
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
- 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.function;version='[1.2.0,1.2.1)',\
+ org.osgi.util.promise;version='[1.2.0,1.2.1)',\
stax2-api;version='[4.2.1,4.2.2)'
[aries-jax-rs-whiteboard] 02/02: try to add diagnostic output for service property failures
Posted by ro...@apache.org.
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-jax-rs-whiteboard.git
commit cc8c777bdc0bb2935ba89c238dceed11681092d5
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Wed Nov 17 13:26:48 2021 -0500
try to add diagnostic output for service property failures
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../org/apache/aries/jax/rs/rest/management/test/TestUtil.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
index 41a71c1..0d2259c 100644
--- a/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
+++ b/integrations/rest-management/rest-management-itest/src/test/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
@@ -95,14 +95,16 @@ public class TestUtil {
}
protected URI runtimeURI(String... parts) {
- String[] runtimes = canonicalize(
+ Object jaxRSServiceEndpointProperty =
jaxrsServiceRuntimeAware.getServiceReference().getProperty(
- JAX_RS_SERVICE_ENDPOINT));
+ JAX_RS_SERVICE_ENDPOINT);
+
+ String[] runtimes = canonicalize(jaxRSServiceEndpointProperty);
if (runtimes.length == 0) {
throw new IllegalStateException(
"No runtimes could be found on \"osgi.jaxrs.endpoint\" " +
- "runtime service property ");
+ "runtime service property " + jaxRSServiceEndpointProperty);
}
String uriString = runtimes[0];