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/05 14:49:36 UTC
[aries-jax-rs-whiteboard] branch master updated (e9b4691 -> 1836718)
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 e9b4691 Bump jackson-jaxrs-json-provider from 2.12.3 to 2.13.0
new fd3892c fix rest-management run
new 1836718 update resolutions
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:
.../cxf-jettison/cxf-jettison-itest/itest.bndrun | 2 +-
integrations/jackson/jackson-itest/itest.bndrun | 14 ++++++-------
integrations/openapi/openapi-itest/itest.bndrun | 2 +-
.../rest-management-itest/itest.bndrun | 8 ++++----
.../rest-management/rest-management-itest/pom.xml | 24 ++++++++++++++++++++++
integrations/shiro/shiro-itest/itest.bndrun | 2 +-
.../aries-jaxrs-whiteboard-example.bndrun | 4 ++--
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 2 +-
jax-rs.itests/itest.bndrun | 2 +-
9 files changed, 42 insertions(+), 18 deletions(-)
[aries-jax-rs-whiteboard] 01/02: fix rest-management run
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 fd3892c7634f2bcc1747765ffb626dc07fc411dc
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Fri Nov 5 09:26:52 2021 -0400
fix rest-management run
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../rest-management-itest/itest.bndrun | 2 +-
.../rest-management/rest-management-itest/pom.xml | 24 ++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index 093d703..1d9f0d0 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -31,7 +31,7 @@ jaxb.export: javax.xml.bind;javax.xml.bind.annotation;javax.xml.bind.helpers;jav
org.slf4j.helpers;version=${slf4j.version},\
org.slf4j.spi;version=${slf4j.version},\
com.sun.net.httpserver,\
- ${if;${is;${-runee};JavaSE-1.8};${jaxb.export}}
+ ${if;${is;${def;-runee};JavaSE-1.8};${jaxb.export}}
-runfw: org.eclipse.osgi
diff --git a/integrations/rest-management/rest-management-itest/pom.xml b/integrations/rest-management/rest-management-itest/pom.xml
index 501e022..2732591 100644
--- a/integrations/rest-management/rest-management-itest/pom.xml
+++ b/integrations/rest-management/rest-management-itest/pom.xml
@@ -65,6 +65,24 @@
<scope>test</scope>
</scopes>
</configuration>
+ <executions>
+ <execution>
+ <id>rest-management</id>
+ <configuration>
+ <failOnChanges>false</failOnChanges>
+ <includeDependencyManagement>true</includeDependencyManagement>
+ <reportOptional>false</reportOptional>
+ <bndruns>
+ <bndrun>rest-management.bndrun</bndrun>
+ </bndruns>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>biz.aQute.bnd</groupId>
@@ -96,6 +114,12 @@
</executions>
<configuration>
<bndrun>rest-management.bndrun</bndrun>
+ <includeDependencyManagement>true</includeDependencyManagement>
+ <scopes>
+ <scope>compile</scope>
+ <scope>runtime</scope>
+ <scope>test</scope>
+ </scopes>
</configuration>
</plugin>
<plugin>
[aries-jax-rs-whiteboard] 02/02: update resolutions
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 1836718e033a0161b5d36f55e5c50199ef38c065
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Fri Nov 5 10:37:20 2021 -0400
update resolutions
Signed-off-by: Raymond Auge <ro...@apache.org>
---
integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun | 2 +-
integrations/jackson/jackson-itest/itest.bndrun | 14 +++++++-------
integrations/openapi/openapi-itest/itest.bndrun | 2 +-
.../rest-management/rest-management-itest/itest.bndrun | 6 +++---
integrations/shiro/shiro-itest/itest.bndrun | 2 +-
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 4 ++--
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 2 +-
jax-rs.itests/itest.bndrun | 2 +-
8 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index 6ba5a27..0ed9fd8 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -72,7 +72,7 @@ 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.codehaus.jettison.jettison;version='[1.4.1,1.4.2)',\
- org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ 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)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index df68e0a..e161297 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -50,12 +50,12 @@ java.9.plus.reqs: \
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.jackson.core.jackson-annotations;version='[2.12.3,2.12.4)',\
- com.fasterxml.jackson.core.jackson-core;version='[2.12.3,2.12.4)',\
- com.fasterxml.jackson.core.jackson-databind;version='[2.12.3,2.12.4)',\
- com.fasterxml.jackson.jaxrs.jackson-jaxrs-base;version='[2.12.3,2.12.4)',\
- com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;version='[2.12.3,2.12.4)',\
- com.fasterxml.jackson.module.jackson-module-jaxb-annotations;version='[2.12.3,2.12.4)',\
+ com.fasterxml.jackson.core.jackson-annotations;version='[2.13.0,2.13.1)',\
+ com.fasterxml.jackson.core.jackson-core;version='[2.13.0,2.13.1)',\
+ com.fasterxml.jackson.core.jackson-databind;version='[2.13.0,2.13.1)',\
+ com.fasterxml.jackson.jaxrs.jackson-jaxrs-base;version='[2.13.0,2.13.1)',\
+ com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider;version='[2.13.0,2.13.1)',\
+ com.fasterxml.jackson.module.jackson-module-jaxb-annotations;version='[2.13.0,2.13.1)',\
com.fasterxml.woodstox.woodstox-core;version='[6.2.6,6.2.7)',\
jakarta.xml.bind-api;version='[2.3.3,2.3.4)',\
org.apache.aries.component-dsl.component-dsl;version='[1.2.2,1.2.3)',\
@@ -76,7 +76,7 @@ java.9.plus.reqs: \
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.2.5,2.2.6)',\
- org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ 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)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index be0a062..9e7f0f6 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -87,7 +87,7 @@ java.9.plus.reqs: \
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.2.5,2.2.6)',\
- org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ 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.yaml.snakeyaml;version='[1.27.0,1.27.1)',\
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index 1d9f0d0..eb75056 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -115,13 +115,13 @@ java.9.plus.reqs: \
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.14,1.2.15)',\
- org.apache.johnzon.mapper;version='[1.2.14,1.2.15)',\
+ org.apache.johnzon.core;version='[1.2.15,1.2.16)',\
+ org.apache.johnzon.mapper;version='[1.2.15,1.2.16)',\
org.apache.ws.xmlschema.core;version='[2.2.5,2.2.6)',\
org.hamcrest;version='[2.2.0,2.2.1)',\
org.objectweb.asm;version='[5.0.4,5.0.5)',\
org.opentest4j;version='[1.2.0,1.2.1)',\
- org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ org.osgi.service.jaxrs;version='[1.0.1,1.0.2)',\
org.osgi.service.rest;version='[1.0.0,1.0.1)',\
org.osgi.test.assertj.framework;version='[1.0.1,1.0.2)',\
org.osgi.test.common;version='[1.0.1,1.0.2)',\
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index e14f9e8..1e00c65 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -76,7 +76,7 @@ java.9.plus.reqs: \
org.apache.shiro.core;version='[1.8.0,1.8.1)',\
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.0,1.0.1)',\
+ 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)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index 878e40f..533629b 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -65,11 +65,11 @@
org.apache.felix.gogo.shell;version='[1.1.4,1.1.5)',\
org.apache.felix.http.jetty;version='[4.1.12,4.1.13)',\
org.apache.felix.http.servlet-api;version='[1.1.4,1.1.5)',\
- org.apache.felix.scr;version='[2.1.26,2.1.27)',\
+ org.apache.felix.scr;version='[2.1.30,2.1.31)',\
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.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)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index 3d115dd..5312c12 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -63,7 +63,7 @@
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.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)',\
stax2-api;version='[4.2.1,4.2.2)'
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 31de46e..92a0c26 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -77,7 +77,7 @@ java.9.plus.reqs: \
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.2.5,2.2.6)',\
- org.osgi.service.jaxrs;version='[1.0.0,1.0.1)',\
+ 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)',\
stax2-api;version='[4.2.1,4.2.2)'