[cxf] branch 3.5.x-fixes updated (b8ed1dffe8 -> ad55a6886d)

2023-08-02 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


from b8ed1dffe8 Recording .gitmergeinfo Changes
 new bd37392705 Fix checkstyle violations
 new 85982911fa Bump org.webjars:swagger-ui from 5.1.3 to 5.2.0 (#1365)
 new ad55a6886d Recording .gitmergeinfo Changes

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:
 .gitmergeinfo  |  6 +++
 ...ontrolledValidationXmlBeanDefinitionReader.java |  2 +-
 .../java/org/apache/cxf/staxutils/StaxUtils.java   |  2 +-
 .../cxf/validation/BeanValidationProvider.java |  2 +-
 .../security/SecureAnnotationsInterceptorTest.java |  6 +--
 .../security/SimpleAuthorizingInterceptorTest.java |  6 +--
 .../transform/OutTransformWriterTest.java  |  2 +-
 distribution/src/main/release/samples/pom.xml  |  2 +-
 .../java/org/apache/cxf/cdi/AbstractCXFBean.java   |  4 +-
 .../apache/cxf/cdi/JAXRSCdiResourceExtension.java  |  2 +-
 .../cxf/maven_plugin/AbstractCodegenMojo.java  |  2 +-
 parent/pom.xml |  2 +-
 .../cxf/binding/corba/CorbaServerConduit.java  |  2 +-
 .../DefaultExceptionClassProviderTest.java |  2 +-
 .../org/apache/cxf/jaxrs/impl/MetadataMap.java |  2 +-
 .../org/apache/cxf/jaxrs/impl/RequestImpl.java |  2 +-
 .../cxf/jaxrs/provider/JAXRSDataBinding.java   |  4 +-
 .../apache/cxf/jaxrs/provider/ProviderFactory.java |  9 +++--
 .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java |  2 +-
 .../cxf/jaxrs/JAXRSServerFactoryBeanTest.java  |  4 +-
 .../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java|  6 +--
 .../impl/tl/ThreadLocalInvocationHandlerTest.java  |  2 +-
 .../cxf/jaxrs/provider/BinaryDataProviderTest.java |  2 +-
 .../jaxrs/provider/FormEncodingProviderTest.java   |  2 +-
 .../ProviderFactoryExceptionMapperTest.java|  8 ++--
 .../cxf/jaxrs/provider/ProviderFactoryTest.java| 46 +++---
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java |  4 +-
 .../apache/cxf/jaxrs/utils/ResourceUtilsTest.java  |  4 +-
 .../java/org/apache/cxf/jaxws/ServiceImplTest.java |  2 +-
 .../handler/soap/SOAPHandlerInterceptorTest.java   |  2 +-
 .../WebFaultOutInterceptorTestCase.java|  2 +-
 .../java/org/apache/cxf/js/rhino/ServerApp.java|  4 +-
 .../frontend/AbstractWSDLBasedEndpointFactory.java |  2 +-
 .../apache/cxf/jaxrs/client/AbstractClient.java|  2 +-
 .../org/apache/cxf/jaxrs/client/WebClient.java |  2 +-
 .../jaxrs/client/JAXRSClientFactoryBeanTest.java   |  2 +-
 .../org/apache/cxf/jaxrs/client/WebClientTest.java |  6 +--
 .../cxf/jaxrs/client/spec/ClientImplTest.java  |  2 +-
 .../apache/cxf/jaxrs/swagger/Swagger2Feature.java  |  2 +-
 .../apache/cxf/jaxrs/model/wadl/WadlGenerator.java |  6 +--
 .../model/wadl/ServerProviderFactoryTest.java  |  2 +-
 .../json/basic/JsonMapObjectReaderWriter.java  |  2 +-
 .../jaxrs/provider/jsrjsonb/JsrJsonbProvider.java  |  2 +-
 .../server/StreamingAsyncSubscriber.java   |  2 +-
 .../ext/search/DefaultParamConverterProvider.java  | 10 ++---
 .../ext/search/tika/TikaContentExtractor.java  |  2 +-
 .../search/SearchContextImplCustomParserTest.java  |  2 +-
 .../client/MicroProfileClientProviderFactory.java  |  2 +-
 .../org/apache/cxf/microprofile/client/Utils.java  |  2 +-
 .../jose/jws/NoneJwsSignatureProvider.java |  2 +-
 .../jose/jws/NoneJwsSignatureVerifier.java |  2 +-
 .../http_jetty/JettyHTTPServerEngineFactory.java   |  2 +-
 .../netty/client/integration/NettyClientTest.java  |  2 +-
 .../client/integration/SSLNettyClientTest.java |  2 +-
 .../server/NettyHttpServletPipelineFactory.java|  2 +-
 .../UndertowHTTPServerEngineFactory.java   |  2 +-
 .../jms/util/PollingMessageListenerContainer.java  |  4 +-
 .../AtmosphereWebSocketJettyDestination.java   |  2 +-
 .../AtmosphereWebSocketServletDestination.java |  2 +-
 .../AtmosphereWebSocketUndertowDestination.java|  2 +-
 .../jetty/WebSocketVirtualServletResponse.java |  2 +-
 .../jetty9/Jetty9WebSocketDestination.java |  2 +-
 .../undertow/WebSocketUndertowServletResponse.java |  2 +-
 .../AtmosphereWebSocketJettyDestinationTest.java   |  4 +-
 .../AtmosphereWebSocketServletDestinationTest.java |  4 +-
 .../cxf/ws/addressing/impl/MAPAggregatorTest.java  |  8 ++--
 .../org/apache/cxf/ws/rm/ManagedRMManagerTest.java |  2 +-
 ...ractUsernameTokenAuthenticatingInterceptor.java |  2 +-
 .../wss4j/PluggablePolicyValidatorTest.java|  2 +-
 .../cxf/ws/security/wss4j/StaxRoundTripTest.java   |  2 +-
 .../ws/security/wss4j/WSS4JOutInterceptorTest.java |  2 +-
 .../cxf/sts/token/renewer/SAMLTokenRenewer.java

[cxf] 03/03: Recording .gitmergeinfo Changes

2023-08-02 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit ad55a6886d187c67533434dd5f634ad531491770
Author: Andriy Redko 
AuthorDate: Wed Aug 2 09:13:58 2023 -0400

Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index f9b78efa90..58cca1efc4 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -66,6 +66,7 @@ B 335b7880918b3ba148d9e239421aedb5de4db814
 B 33e606c55927f34f3a2414bd1386931745357f38
 B 3428dd1423198b22d7662dcc8d9553a58835c130
 B 3457c8555d1ecb49cf13e29a60f7ab01ec5f2ff4
+B 35f84e49c8a39dbbe14e972c9ecb24c2066d07c8
 B 3678d853f696a7c23de57b2c68dcf0e738c24cd2
 B 3795fbc8740c882d8f276b6e9cbaf0cab107edef
 B 38582a2b8d91502cd598029104b0f87c0255d86c
@@ -127,6 +128,7 @@ B 67f463c9b674e4dd533d6635759307ae8fadc488
 B 682079d86b0a967ab6db6954cd1678cf97558cef
 B 684f998febd740fb9002b96b95d79b889fac6d2f
 B 687100fad7c18746da6130c2b04b734b97f7cf52
+B 69c132f2d9eb4f390c27f4c2cd877594398c8f3f
 B 6c4eae9ec9f00826b88dbcdb475b9ac67e082f4c
 B 6d64fdb0d9219ca829f29a2f38480033b60a4c98
 B 703fdc183a1f204a7fce982f468a7c8f0de65d80
@@ -309,6 +311,7 @@ B fb4db130537c71d22dc912db98b9b31f7945db47
 B fd14d859a29852a013c31030f2aeb452e3891fba
 B fd45f72fd6dcb305a8f4e4ddcf2bc79347128df1
 B fe651165c83e893336d162e95fe9fedcc0ed0a74
+M 00b6fe804da2cdff8a1641e9aa20c6cab713fef6
 M 01cf70330332480c5c29c8c3d715503f83253bac
 M 04826f6520173b51bbb95b7a208e6a6662894ba3
 M 058bacfe750631f987469b0e1141db158dbd97b4
@@ -374,6 +377,7 @@ M 396f0406fd857ac0c947cf5f57d483e362380b79
 M 3b1c2cc3e8b139cb805f8073b2cf49fc1a6faca9
 M 3ba3ce8f7bd1a86d2063761bd7a8df323f98c448
 M 3c95abf3be5c52a4b800f8139f8633088f0c9be7
+M 3d40d621a8212c92e4a38355f8bfe19fec2b8e85
 M 3d71fe88f5d9649f3b770598b5b170cb6bc8871f
 M 3dabee6e40229669b98654c72723392e9e06f6be
 M 3e83c742e89621b37b4668768918e90b966d17b6
@@ -397,6 +401,7 @@ M 515b84136ea0550eb193f80e54731052c57d7bff
 M 518cde6d3edf59738908ef967dd67caa38ecbca4
 M 519add3aedb7b9a058c70a9535446be745448d7b
 M 51a65beda38602ff008c032aa406208df8648422
+M 53176f98f8259befa7864a0f7afe2875c86ecb70
 M 539186659b20b60db89b9cb0d4786480ed57aa12
 M 54b55ac35a101af792f3aa8e1598a200ef704c9e
 M 5566cc4600827e08fda454c5644b9ec81251fbba
@@ -533,6 +538,7 @@ M ca648669c438c08da251b1bdc176a53dda555738
 M ca7b6d8daff836949e95f41ef825155d66e512e2
 M cbb59bbd3e9e4ae0259b43465fbff8b5c45991c0
 M cdb3f7dbde40fc9670473b6c38d057594e11bfb6
+M ce5ad64a6ed64ec991aba8a1cfc9ee8edf8aafd9
 M ce8826bbe5c06569e9f522e7c11f922ea6231e9c
 M ced6dfdca432f61a8dde6ead6b2c6d50f4cec023
 M cf85ed2aa618971bb4858608b189d7888453521f



[cxf] 01/03: Fix checkstyle violations

2023-08-02 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit bd37392705c0d616cec6588d52299729d92b3eda
Author: Andriy Redko 
AuthorDate: Tue Aug 1 21:27:41 2023 -0400

Fix checkstyle violations
---
 ...ontrolledValidationXmlBeanDefinitionReader.java |  2 +-
 .../java/org/apache/cxf/staxutils/StaxUtils.java   |  2 +-
 .../cxf/validation/BeanValidationProvider.java |  2 +-
 .../security/SecureAnnotationsInterceptorTest.java |  6 +--
 .../security/SimpleAuthorizingInterceptorTest.java |  6 +--
 .../transform/OutTransformWriterTest.java  |  2 +-
 .../java/org/apache/cxf/cdi/AbstractCXFBean.java   |  4 +-
 .../apache/cxf/cdi/JAXRSCdiResourceExtension.java  |  2 +-
 .../cxf/maven_plugin/AbstractCodegenMojo.java  |  2 +-
 .../cxf/binding/corba/CorbaServerConduit.java  |  2 +-
 .../DefaultExceptionClassProviderTest.java |  2 +-
 .../org/apache/cxf/jaxrs/impl/MetadataMap.java |  2 +-
 .../org/apache/cxf/jaxrs/impl/RequestImpl.java |  2 +-
 .../cxf/jaxrs/provider/JAXRSDataBinding.java   |  4 +-
 .../apache/cxf/jaxrs/provider/ProviderFactory.java |  9 +++--
 .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java |  2 +-
 .../cxf/jaxrs/JAXRSServerFactoryBeanTest.java  |  4 +-
 .../apache/cxf/jaxrs/ext/xml/XMLSourceTest.java|  6 +--
 .../impl/tl/ThreadLocalInvocationHandlerTest.java  |  2 +-
 .../cxf/jaxrs/provider/BinaryDataProviderTest.java |  2 +-
 .../jaxrs/provider/FormEncodingProviderTest.java   |  2 +-
 .../ProviderFactoryExceptionMapperTest.java|  8 ++--
 .../cxf/jaxrs/provider/ProviderFactoryTest.java| 46 +++---
 .../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java |  4 +-
 .../apache/cxf/jaxrs/utils/ResourceUtilsTest.java  |  4 +-
 .../java/org/apache/cxf/jaxws/ServiceImplTest.java |  2 +-
 .../handler/soap/SOAPHandlerInterceptorTest.java   |  2 +-
 .../WebFaultOutInterceptorTestCase.java|  2 +-
 .../java/org/apache/cxf/js/rhino/ServerApp.java|  4 +-
 .../frontend/AbstractWSDLBasedEndpointFactory.java |  2 +-
 .../apache/cxf/jaxrs/client/AbstractClient.java|  2 +-
 .../org/apache/cxf/jaxrs/client/WebClient.java |  2 +-
 .../jaxrs/client/JAXRSClientFactoryBeanTest.java   |  2 +-
 .../org/apache/cxf/jaxrs/client/WebClientTest.java |  6 +--
 .../cxf/jaxrs/client/spec/ClientImplTest.java  |  2 +-
 .../apache/cxf/jaxrs/swagger/Swagger2Feature.java  |  2 +-
 .../apache/cxf/jaxrs/model/wadl/WadlGenerator.java |  6 +--
 .../model/wadl/ServerProviderFactoryTest.java  |  2 +-
 .../json/basic/JsonMapObjectReaderWriter.java  |  2 +-
 .../jaxrs/provider/jsrjsonb/JsrJsonbProvider.java  |  2 +-
 .../server/StreamingAsyncSubscriber.java   |  2 +-
 .../ext/search/DefaultParamConverterProvider.java  | 10 ++---
 .../ext/search/tika/TikaContentExtractor.java  |  2 +-
 .../search/SearchContextImplCustomParserTest.java  |  2 +-
 .../client/MicroProfileClientProviderFactory.java  |  2 +-
 .../org/apache/cxf/microprofile/client/Utils.java  |  2 +-
 .../jose/jws/NoneJwsSignatureProvider.java |  2 +-
 .../jose/jws/NoneJwsSignatureVerifier.java |  2 +-
 .../http_jetty/JettyHTTPServerEngineFactory.java   |  2 +-
 .../netty/client/integration/NettyClientTest.java  |  2 +-
 .../client/integration/SSLNettyClientTest.java |  2 +-
 .../server/NettyHttpServletPipelineFactory.java|  2 +-
 .../UndertowHTTPServerEngineFactory.java   |  2 +-
 .../jms/util/PollingMessageListenerContainer.java  |  4 +-
 .../AtmosphereWebSocketJettyDestination.java   |  2 +-
 .../AtmosphereWebSocketServletDestination.java |  2 +-
 .../AtmosphereWebSocketUndertowDestination.java|  2 +-
 .../jetty/WebSocketVirtualServletResponse.java |  2 +-
 .../jetty9/Jetty9WebSocketDestination.java |  2 +-
 .../undertow/WebSocketUndertowServletResponse.java |  2 +-
 .../AtmosphereWebSocketJettyDestinationTest.java   |  4 +-
 .../AtmosphereWebSocketServletDestinationTest.java |  4 +-
 .../cxf/ws/addressing/impl/MAPAggregatorTest.java  |  8 ++--
 .../org/apache/cxf/ws/rm/ManagedRMManagerTest.java |  2 +-
 ...ractUsernameTokenAuthenticatingInterceptor.java |  2 +-
 .../wss4j/PluggablePolicyValidatorTest.java|  2 +-
 .../cxf/ws/security/wss4j/StaxRoundTripTest.java   |  2 +-
 .../ws/security/wss4j/WSS4JOutInterceptorTest.java |  2 +-
 .../cxf/sts/token/renewer/SAMLTokenRenewer.java|  2 +-
 .../operation/ValidateJWTTransformationTest.java   |  2 +-
 .../validator/JWTTokenValidatorRealmTest.java  |  2 +-
 .../apache/cxf/systest/sts/jwt/JaxrsJWTTest.java   |  2 +-
 .../apache/cxf/systest/jaxrs/AsyncResource.java|  2 +-
 .../cxf/systest/jaxrs/BookContinuationStore.java   |  4 +-
 .../org/apache/cxf/systest/jaxrs/BookServer.java   | 10 ++---
 .../org/apache/cxf/systest/jaxrs/BookServer20.java | 18 -
 .../cxf/systest/jaxrs/BookServerThrottled.java |  2 +-
 .../org/apache/

[cxf] 02/03: Bump org.webjars:swagger-ui from 5.1.3 to 5.2.0 (#1365)

2023-08-02 Thread reta
This is an automated email from the ASF dual-hosted git repository.

reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 85982911fa0a21b409e07b9bac186a9cd09103c7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Aug 1 07:46:55 2023 -0400

Bump org.webjars:swagger-ui from 5.1.3 to 5.2.0 (#1365)

Bumps [org.webjars:swagger-ui](https://github.com/webjars/swagger-ui) from 
5.1.3 to 5.2.0.
- 
[Commits](https://github.com/webjars/swagger-ui/compare/swagger-ui-5.1.3...swagger-ui-5.2.0)

---
updated-dependencies:
- dependency-name: org.webjars:swagger-ui
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] 
Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit dfc204777b4c397971b2293baf0b4150284a21f6)
(cherry picked from commit 53176f98f8259befa7864a0f7afe2875c86ecb70)

# Conflicts:
#   parent/pom.xml
---
 distribution/src/main/release/samples/pom.xml | 2 +-
 parent/pom.xml| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/distribution/src/main/release/samples/pom.xml 
b/distribution/src/main/release/samples/pom.xml
index 2ffa4bd2b1..4190d5ead7 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -35,7 +35,7 @@
 9.4.51.v20230217
 4.1.96.Final
 
4.5.14
-5.1.3
+5.2.0
 2.7.0
 9.0.78
 21.1.0
diff --git a/parent/pom.xml b/parent/pom.xml
index 7bf73ce14e..9b5a15ad83 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -209,7 +209,7 @@
 5.6.12
 5.3.29
 1.8.3
-5.1.3
+5.2.0
 2.1.13
 1.6.11
 31.1-jre