[cxf] branch main updated: Include back jaxrs systests module (#1012)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 383c9273a0 Include back jaxrs systests module (#1012)
383c9273a0 is described below
commit 383c9273a0b88931fef8117c6f0e481fa31734e4
Author: Andriy Redko
AuthorDate: Tue Oct 25 18:49:54 2022 -0400
Include back jaxrs systests module (#1012)
* Include back jaxrs systests module
* Fixing JAXRS20ClientServerBookTest test cases
* Fixing JAXRSClientServerBookTest test cases
* Fixing Netty version conflicts (tests only)
* Added missing jetty-client dependency (tests only)
* Fixed com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider usage
* Fixed jakarta.ws.rs.Application usage
* Fixing JAXRSJmsTest test cases
* Fixing JsrJsonbProviderTest test cases
* Fixing OpenApiCustomPropertiesTest test cases
* Fixing JAXRSRequestDispatcherTest test cases
* Fixing JAXRSSpringSecurityClassTest test cases
* Fixing JAXRSSpringSecurityInterfaceTest and
JAXRSSpringSecurityNoAnnotationsTest test cases
* Fixing JAXRSClientMetricsTest test cases
* Fixing AsyncTest test cases
---
.../apache/cxf/bus/spring/SpringBeanLocator.java | 2 +-
parent/pom.xml | 1 +
.../cxf/jaxrs/provider/JAXBElementProvider.java| 4 +-
.../apache/cxf/microprofile/client/AsyncTest.java | 82 ++
.../cxf/transport/jms/JMSMessageHeadersType.java | 4 +-
systests/jaxrs/pom.xml | 46 ++--
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 4 +-
.../systest/jaxrs/JAXRSRequestDispatcherTest.java | 3 -
.../org/apache/cxf/systest/jaxrs/JMSBookStore.java | 2 +-
.../apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 25 ---
.../jaxrs/metrics/JAXRSClientMetricsTest.java | 65 +
.../security/BookServerSecuritySpringClass.java| 15
.../src/test/resources/files/swagger.properties| 5 ++
.../src/test/resources/jaxrs/WEB-INF/beans.xml | 4 +-
.../test/resources/jaxrs_cors/WEB-INF/beans.xml| 2 +-
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 4 +-
.../jaxrs_jackson_provider/WEB-INF/beans.xml | 4 +-
.../resources/jaxrs_non_spring/WEB-INF/web.xml | 6 +-
.../resources/jaxrs_security/WEB-INF/beans.xml | 1 +
.../jaxrs_security_cglib/WEB-INF/beans.xml | 1 +
.../WEB-INF/beans.xml | 1 +
systests/pom.xml | 12 +---
22 files changed, 172 insertions(+), 121 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
index 1c5433473b..e1a15e85c7 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
@@ -158,7 +158,7 @@ public class SpringBeanLocator implements
ConfiguredBeanLocator {
return lst;
}
private void tryOSGI(Collection lst, Class type) {
-if (!osgi) {
+if (!osgi || bundleContext == null) {
return;
}
try {
diff --git a/parent/pom.xml b/parent/pom.xml
index 1331258b02..d3d0f95390 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -87,6 +87,7 @@
3.10.0
3.0.3
3.0.2
+0.14.0
1.1.1
1.0.15
4.0.0
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
index 0918600aed..87cf39c62d 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/JAXBElementProvider.java
@@ -83,8 +83,8 @@ import org.apache.cxf.staxutils.transform.TransformUtils;
@Provider
public class JAXBElementProvider extends AbstractJAXBProvider {
private static final String XML_PI_START = " queue = new ArrayBlockingQueue<>(2);
-
-public SimpleTransformer() {
-queue.add("Hello");
-queue.add("World");
-}
-
-@Override
-public Response transform(Request request, Response response,
FileSource fileSource, Parameters parameters) {
-return Response.Builder
-.like(response)
-.but().body(queue.poll())
-.build();
-}
+private HttpServer server;
+private final Queue queue = new ArrayBlockingQueue<>(2);
+public class SimpleHandler implements HttpHandler {
@Override
-public boolean applyGlobally() {
-return false;
+public void
[cxf-fediz] branch main updated: Updating Tomcat to 9.0.68
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git The following commit(s) were added to refs/heads/main by this push: new 5cb9c37d Updating Tomcat to 9.0.68 5cb9c37d is described below commit 5cb9c37d9d5e5a089ee18ae4c119dd0b71d2ed96 Author: Alexey Markevich AuthorDate: Tue Oct 25 11:04:19 2022 +0200 Updating Tomcat to 9.0.68 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc857204..13c09410 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ 2.4.1 5.6.7 2.5.1.RELEASE -9.0.65 +9.0.68 2.0.2 2.4.1
[cxf] branch 3.4.x-fixes updated (3013e01dab -> a2e28f059e)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 3013e01dab Recording .gitmergeinfo Changes new 67c7c65711 Updating woodstox to 6.4.0 new a2e28f059e Recording .gitmergeinfo Changes 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: .gitmergeinfo | 2 ++ parent/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a2e28f059e9d27c8a4a67e23e6cb50ed9f97f621 Author: Colm O hEigeartaigh AuthorDate: Tue Oct 25 08:55:52 2022 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 25b6931e31..afdbd0287f 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -109,6 +109,7 @@ B 70f8e53b47a7e06f6f4481db2c301ee91e9b3cb0 B 75fb6bb56d82f72771a9ee6ecab5d36168303f51 B 799660ad89472302f8ac9fcdcf818f469601aa42 B 7cfda87f43d41fddb0e2d0e2501cb3918807e88f +B 7d0819a95653702e3bc317c862207793ae757213 B 7db51c0f207a3b6a83130272fde6c75f5864b31a B 7dcda069b57ee9732a2fb089df35c91c040527f0 B 7e76b6c39b20cd59cf740e063100d3ce15d2becc @@ -434,6 +435,7 @@ M a3a49c7ee82f83bc683b898594d5c4948578f25a M a40e65f3fa075e080aff78123ab76eb2dbe46048 M a5699a05bd53de364ac3282fc6a4927ee93e0afc M a59dff0ba50418ced57ae8ef425f96df78af9f5c +M a615cc34ee974469e94c8a0086ec2ed0c84991fa M a6ed23b66394b260145b08ecdd8145b647fa43e5 M a711cfee53fb246201be03b763dbdc54b8eec1ce M a7b4f1698c9f05ad0af949f8a3ab9a45976d9a2d
[cxf] 01/02: Updating woodstox to 6.4.0
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 67c7c65711a674c2b90252757a1199e5cc83d251 Author: Colm O hEigeartaigh AuthorDate: Tue Oct 25 07:56:41 2022 +0100 Updating woodstox to 6.4.0 (cherry picked from commit 76401b025252e650f7c3000e52dd3d97f87b7447) (cherry picked from commit a615cc34ee974469e94c8a0086ec2ed0c84991fa) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 112bc71a9f..1deb82fbdc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -229,7 +229,7 @@ 2.3 1.5.4.Final 2.27.2 -6.2.8 +6.4.0 4.2.1 1.6.3 2.3.3
[cxf] branch 3.5.x-fixes updated (7e76b6c39b -> 7d0819a956)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from 7e76b6c39b Recording .gitmergeinfo Changes new a615cc34ee Updating woodstox to 6.4.0 new 7d0819a956 Recording .gitmergeinfo Changes 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: .gitmergeinfo | 1 + parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
[cxf] 01/02: Updating woodstox to 6.4.0
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit a615cc34ee974469e94c8a0086ec2ed0c84991fa Author: Colm O hEigeartaigh AuthorDate: Tue Oct 25 07:56:41 2022 +0100 Updating woodstox to 6.4.0 (cherry picked from commit 76401b025252e650f7c3000e52dd3d97f87b7447) --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 2c596ba335..e8cc512048 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -226,7 +226,7 @@ 2.3 1.5.4.Final 2.27.2 -6.2.8 +6.4.0 4.2.1 1.6.3 2.4.1
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 7d0819a95653702e3bc317c862207793ae757213 Author: Colm O hEigeartaigh AuthorDate: Tue Oct 25 07:58:49 2022 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 34b503e28e..2a48429edf 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -42,6 +42,7 @@ B 8c3e3a003702fb9547519c0768806a7ce478dfa0 B 8f7c9dae610cd708b5e17828b58b642a5485b9cc B 9313c2a54131b44e8f9c4332671e881bfc35a01e B 9723e32190d3a820e0eecf19177561155399c867 +B 9fb0bff003c4c3beecdbfbf0869804604f87f79d B a05b8d10d1fbeacbf3d33cfcccd302958b28ad0a B a6501f782cd2b392f09edb4ccb99a83acd2e75a2 B ad496ed008ae0b0d2636bc307559749fc28287c1
[cxf] branch 3.6.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.6.x-fixes by this push: new 9fb0bff003 Recording .gitmergeinfo Changes 9fb0bff003 is described below commit 9fb0bff003c4c3beecdbfbf0869804604f87f79d Author: Colm O hEigeartaigh AuthorDate: Tue Oct 25 07:58:32 2022 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 692cdf270b..6311d40528 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -135,5 +135,6 @@ M f3ff0735a7e0d8816bf0b43f5d97b54d5f034ff5 M f48dc57d5bb4a8848f3b4f9ef5cedcfd9d8ab1b7 M f4c7785fd89a6709608c3fcd8ab31f3f05065eb4 M f72118971428a059b94f3ee4c0730c95d5f1c192 +M f8d3ff37be721f773723ee820761fe266af071b6 M fababbddfb4f1556bc629e27e9e5cf46cce054ea M fd261453cf08ac22d2c5be3c2fe4100438c740a5
[cxf] branch 3.6.x-fixes updated: Updating woodstox to 6.4.0
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.6.x-fixes by this push: new 76401b0252 Updating woodstox to 6.4.0 76401b0252 is described below commit 76401b025252e650f7c3000e52dd3d97f87b7447 Author: Colm O hEigeartaigh AuthorDate: Tue Oct 25 07:56:41 2022 +0100 Updating woodstox to 6.4.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 9b20da0306..7502d3d9c4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -225,7 +225,7 @@ 2.3 1.5.4.Final 2.27.2 -6.2.8 +6.4.0 4.2.1 1.6.3 2.4.1
[cxf] branch main updated: Updating woodstox to 6.4.0
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new f8d3ff37be Updating woodstox to 6.4.0 f8d3ff37be is described below commit f8d3ff37be721f773723ee820761fe266af071b6 Author: Colm O hEigeartaigh AuthorDate: Tue Oct 25 07:56:41 2022 +0100 Updating woodstox to 6.4.0 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 995d7a7eae..1331258b02 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -200,7 +200,7 @@ 2.3 1.5.4.Final 2.27.2 -6.2.8 +6.4.0 4.2.1 1.6.3 3.0.0
