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/04/08 17:13:44 UTC
[aries-jax-rs-whiteboard] branch master updated (a1f56f1 -> 6acdca3)
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 a1f56f1 Bump jackson-jaxrs-json-provider from 2.12.1 to 2.12.2
new 1986c02 use latest changelog.sh script
new b939093 cleanup IDE warnings
new 6acdca3 update resolutions
The 3 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:
changelog.sh | 33 +++++++++++++++-------
.../cxf-jettison/cxf-jettison-itest/itest.bndrun | 18 ++++++------
integrations/jackson/jackson-itest/itest.bndrun | 16 +++++------
integrations/openapi/openapi-itest/itest.bndrun | 16 +++++------
.../src/main/java/test/OpenApiTest.java | 1 -
.../jax/rs/openapi/OpenAPIWithModelResolvers.java | 3 --
.../rest-management-itest/itest.bndrun | 16 +++++------
.../rs/rest/management/test/ExtensionsTest.java | 1 -
.../jax/rs/rest/management/test/TestUtil.java | 1 -
integrations/shiro/shiro-itest/itest.bndrun | 16 +++++------
.../aries-jaxrs-whiteboard-example.bndrun | 16 +++++------
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 16 +++++------
jax-rs.itests/itest.bndrun | 18 ++++++------
13 files changed, 89 insertions(+), 82 deletions(-)
[aries-jax-rs-whiteboard] 03/03: 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 6acdca3f3eb2bf2fedfcfaef45bf8ba1b859fd37
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Thu Apr 8 12:58:59 2021 -0400
update resolutions
Signed-off-by: Raymond Auge <ro...@apache.org>
---
.../cxf-jettison/cxf-jettison-itest/itest.bndrun | 18 +++++++++---------
integrations/jackson/jackson-itest/itest.bndrun | 16 ++++++++--------
integrations/openapi/openapi-itest/itest.bndrun | 16 ++++++++--------
.../rest-management/rest-management-itest/itest.bndrun | 16 ++++++++--------
integrations/shiro/shiro-itest/itest.bndrun | 16 ++++++++--------
jax-rs.example/aries-jaxrs-whiteboard-example.bndrun | 16 ++++++++--------
jax-rs.example/aries-jaxrs-whiteboard-only.bndrun | 16 ++++++++--------
jax-rs.itests/itest.bndrun | 18 +++++++++---------
8 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
index 81de7d8..cde325b 100644
--- a/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
+++ b/integrations/cxf-jettison/cxf-jettison-itest/itest.bndrun
@@ -45,22 +45,22 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
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.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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-extension-providers;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
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)',\
diff --git a/integrations/jackson/jackson-itest/itest.bndrun b/integrations/jackson/jackson-itest/itest.bndrun
index f7fa13c..e938a2b 100644
--- a/integrations/jackson/jackson-itest/itest.bndrun
+++ b/integrations/jackson/jackson-itest/itest.bndrun
@@ -50,21 +50,21 @@
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.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
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)',\
diff --git a/integrations/openapi/openapi-itest/itest.bndrun b/integrations/openapi/openapi-itest/itest.bndrun
index 0158f61..e8507d9 100644
--- a/integrations/openapi/openapi-itest/itest.bndrun
+++ b/integrations/openapi/openapi-itest/itest.bndrun
@@ -53,7 +53,7 @@
com.fasterxml.jackson.core.jackson-databind;version='[2.12.1,2.12.2)',\
com.fasterxml.jackson.dataformat.jackson-dataformat-yaml;version='[2.12.1,2.12.2)',\
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.12.1,2.12.2)',\
- com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
io.github.classgraph.classgraph;version='[4.8.95,4.8.96)',\
io.swagger.core.v3.swagger-annotations;version='[2.1.7,2.1.8)',\
@@ -68,14 +68,14 @@
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.12.0,3.12.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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
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)',\
diff --git a/integrations/rest-management/rest-management-itest/itest.bndrun b/integrations/rest-management/rest-management-itest/itest.bndrun
index 3e772e3..ec081ec 100644
--- a/integrations/rest-management/rest-management-itest/itest.bndrun
+++ b/integrations/rest-management/rest-management-itest/itest.bndrun
@@ -63,7 +63,7 @@
com.fasterxml.jackson.datatype.jackson-datatype-jsr310;version='[2.12.1,2.12.2)',\
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.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
com.jayway.jsonpath.json-path;version='[2.4.0,2.4.1)',\
com.sun.istack.commons-runtime;version='[3.0.11,3.0.12)',\
com.sun.xml.bind.jaxb-osgi;version='[2.3.3,2.3.4)',\
@@ -91,17 +91,17 @@
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.12.0,3.12.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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
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)',\
diff --git a/integrations/shiro/shiro-itest/itest.bndrun b/integrations/shiro/shiro-itest/itest.bndrun
index bf92557..b88335a 100644
--- a/integrations/shiro/shiro-itest/itest.bndrun
+++ b/integrations/shiro/shiro-itest/itest.bndrun
@@ -45,7 +45,7 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
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)',\
@@ -53,17 +53,17 @@
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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
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)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
index 86c5c61..5e3821c 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-example.bndrun
@@ -48,23 +48,23 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
org.apache.felix.http.servlet-api;version='[1.1.2,1.1.3)',\
org.apache.felix.scr;version='[2.1.26,2.1.27)',\
org.apache.geronimo.specs.geronimo-annotation_1.3_spec;version='[1.3.0,1.3.1)',\
diff --git a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
index c339444..0e5a0b9 100644
--- a/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
+++ b/jax-rs.example/aries-jaxrs-whiteboard-only.bndrun
@@ -47,19 +47,19 @@
org.apache.aries.spifly.auto.providers=com.sun.*
-runbundles: \
- com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
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)',\
diff --git a/jax-rs.itests/itest.bndrun b/jax-rs.itests/itest.bndrun
index 0050270..3938472 100644
--- a/jax-rs.itests/itest.bndrun
+++ b/jax-rs.itests/itest.bndrun
@@ -49,24 +49,24 @@
-runbundles: \
assertj-core;version='[3.19.0,3.19.1)',\
- com.fasterxml.woodstox.woodstox-core;version='[6.2.3,6.2.4)',\
+ com.fasterxml.woodstox.woodstox-core;version='[6.2.4,6.2.5)',\
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.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-security-cors;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.cxf.cxf-core;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-frontend-jaxrs;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-client;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-security-cors;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-rs-sse;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-security;version='[3.4.3,3.4.4)',\
+ org.apache.cxf.cxf-rt-transports-http;version='[3.4.3,3.4.4)',\
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.jetty;version='[4.1.6,4.1.7)',\
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)',\
[aries-jax-rs-whiteboard] 01/03: use latest changelog.sh script
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 1986c026af124877b640d7cfb7b00fc7d37c1d08
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Thu Apr 8 12:00:23 2021 -0400
use latest changelog.sh script
Signed-off-by: Raymond Auge <ro...@apache.org>
---
changelog.sh | 33 +++++++++++++++++++++++----------
1 file changed, 23 insertions(+), 10 deletions(-)
diff --git a/changelog.sh b/changelog.sh
index 4ab4889..12c5743 100755
--- a/changelog.sh
+++ b/changelog.sh
@@ -16,13 +16,29 @@
# specific language governing permissions and limitations
# under the License.
+###############################################################################
+# In most cases just execute ./changelog.sh should suffice.
+#
+# To tune commiter names/remove dups, adjust the .mailmap file
+# (see https://git-scm.com/docs/gitmailmap)
+###############################################################################
+
TAG_SEARCH=
WORK_DIR=.
CHANGELOG=${WORK_DIR}/changelog.md
-##########################################################################################
-############# Do not edit below ##########################################################
-##########################################################################################
+###############################################################################
+############# Do not edit below ###############################################
+###############################################################################
+
+# collect all the tags that match our pattern and reverse the order
+ALL_TAGS=( $(git tag -l $TAG_SEARCH | xargs -n 1 | tac) )
+PREVIOUS_TAG="${ALL_TAGS[0]}"
+TAGS=${ALL_TAGS[@]:1}
+
+if [ -f $CHANGELOG ]; then
+ UPDATE=$PREVIOUS_TAG
+fi
while (( "$#" )); do
case "$1" in
@@ -45,12 +61,7 @@ while (( "$#" )); do
esac
done
-# collect all the tags that match our pattern and reverse the order
-ALL_TAGS=( $(git tag -l $TAG_SEARCH | xargs -n 1 | tac) )
-PREVIOUS_TAG="${ALL_TAGS[0]}"
-TAGS=${ALL_TAGS[@]:1}
-
-if [ "$UPDATEx" != "x" ]; then
+if [ -v UPDATE ]; then
printf "Updating $CHANGELOG\n"
# update the file if asked (appends to head of file)
@@ -65,6 +76,8 @@ if [ "$UPDATEx" != "x" ]; then
# swap the changelog for a temp file
ORIGINAL_FILE=$CHANGELOG
CHANGELOG="$CHANGELOG.tmp"
+else
+ printf "Creating $CHANGELOG\n"
fi
# create the file if it doesn't exist
@@ -83,7 +96,7 @@ for tag in $TAGS; do
PREVIOUS_TAG=$tag
done
-if [ "$UPDATEx" != "x" ]; then
+if [ -v UPDATE ]; then
# append the changelog to the end of temp
cat $ORIGINAL_FILE >> $CHANGELOG
[aries-jax-rs-whiteboard] 02/03: cleanup IDE warnings
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 b939093e72090e17200de0fcff2734866e231c36
Author: Raymond Auge <ro...@apache.org>
AuthorDate: Thu Apr 8 12:00:47 2021 -0400
cleanup IDE warnings
Signed-off-by: Raymond Auge <ro...@apache.org>
---
integrations/openapi/openapi-itest/src/main/java/test/OpenApiTest.java | 1 -
.../org/apache/aries/jax/rs/openapi/OpenAPIWithModelResolvers.java | 3 ---
.../org/apache/aries/jax/rs/rest/management/test/ExtensionsTest.java | 1 -
.../java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java | 1 -
4 files changed, 6 deletions(-)
diff --git a/integrations/openapi/openapi-itest/src/main/java/test/OpenApiTest.java b/integrations/openapi/openapi-itest/src/main/java/test/OpenApiTest.java
index 77dab3e..b2e6205 100644
--- a/integrations/openapi/openapi-itest/src/main/java/test/OpenApiTest.java
+++ b/integrations/openapi/openapi-itest/src/main/java/test/OpenApiTest.java
@@ -27,7 +27,6 @@ import io.swagger.v3.core.util.Json;
import io.swagger.v3.oas.models.info.Contact;
import io.swagger.v3.oas.models.info.Info;
import io.swagger.v3.oas.models.OpenAPI;
-import org.junit.Ignore;
import org.junit.Test;
import org.osgi.framework.ServiceRegistration;
diff --git a/integrations/openapi/openapi-resource/src/main/java/org/apache/aries/jax/rs/openapi/OpenAPIWithModelResolvers.java b/integrations/openapi/openapi-resource/src/main/java/org/apache/aries/jax/rs/openapi/OpenAPIWithModelResolvers.java
index 63f5b89..0c753b4 100644
--- a/integrations/openapi/openapi-resource/src/main/java/org/apache/aries/jax/rs/openapi/OpenAPIWithModelResolvers.java
+++ b/integrations/openapi/openapi-resource/src/main/java/org/apache/aries/jax/rs/openapi/OpenAPIWithModelResolvers.java
@@ -12,12 +12,9 @@
package org.apache.aries.jax.rs.openapi;
import io.swagger.v3.core.converter.ModelConverter;
-import io.swagger.v3.core.jackson.ModelResolver;
import io.swagger.v3.oas.models.OpenAPI;
import org.apache.aries.component.dsl.CachingServiceReference;
-import java.util.HashSet;
-import java.util.List;
import java.util.Set;
/**
diff --git a/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/ExtensionsTest.java b/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/ExtensionsTest.java
index a475cdf..946ecf1 100644
--- a/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/ExtensionsTest.java
+++ b/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/ExtensionsTest.java
@@ -27,7 +27,6 @@ import org.apache.aries.jax.rs.rest.management.schema.ExtensionsSchema;
import org.junit.jupiter.api.Test;
import org.osgi.service.rest.RestApiExtension;
import org.osgi.test.common.dictionary.Dictionaries;
-import org.osgi.test.common.stream.MapStream;
import org.xmlunit.assertj3.XmlAssert;
import net.javacrumbs.jsonunit.assertj.JsonAssertions;
diff --git a/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java b/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
index 6b0864d..973b437 100644
--- a/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
+++ b/integrations/rest-management/rest-management-itest/src/main/java/org/apache/aries/jax/rs/rest/management/test/TestUtil.java
@@ -129,7 +129,6 @@ public class TestUtil {
return new String[]{propertyValue.toString()};
}
- @SuppressWarnings("restriction")
public static class HttpServer implements AutoCloseable {
private final com.sun.net.httpserver.HttpServer server;