You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/03/17 14:45:38 UTC
[cxf] branch CXF-7949_jakarta-servlet updated (6cf8723 -> 95b89ec)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch CXF-7949_jakarta-servlet
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 6cf8723 Update to Tomcat 9.0.31
add 7934eff Log error in the AllowAllHostnameVerifier
add 2a6b732 Cxf 8208 - Handle exceptions when looking up swagger ui resources (#637)
add aa403a0 Removing spring3.0 profile
add 543de65 Prevent RMI registry rebind (#641)
add 0bd7ffe Update to lastest asm
add 63bf9f4 [CXF-8219] upgrade to netty 4.1.45.Final
add 224fa74 CXF-8149 Reduce synchronization in AbstractJXBProvider (#597)
add fca1472 use DefaultBasicAuthSupplier.getBasicAuthHeader
add 88c383e Update to maven-enforcer-plugin 3.0.0-M3
add 68d2120 CXF-7910 switch to jakarta.json; update to geronimo.json 1.3
add 73f1f1c codegen-plugin: skip maven-invoker-plugin when maven.test.skip.exec set
add 8dc92f1 codegen-plugin: revert back toolchain activation
add c7dff86 fix compilation on Java 13+ (#641)
add f2208f2 fix compilation on Java 8 after Java 13+ fix (#641)
add 1ce8d47 skip maven-invoker-plugin when maven.test.skip.exec set
add 6c36865 cxf-systests-rs-security: configure client HTTPS from code
add cbc0fde cxf-rt-rs-security-sso-oidc: allow to override userInfoEndpointAddress
add 07a8053 cxf-rt-rs-security-oauth2: clone List
add 024fcd0 [CXF-8223]Be able to read empty entity from a Response with 202
add 0b1c413 cxf-core: ensure that StringUtils.toHexString result is multiple of two
add 67643a4 CXF-8220: The tag http.status_code is always 200 in server side tracing span, no matter what situation
add c598ecf cxf-rt-rs-security-oauth: use MessageDigestUtils
add 49a3be1 cxf-rt-transports-jms: update JMSUtil.createCorrelationId
add 540e471 avoid null assignment
add 972a275 Update to tomcat 8.5.51
add c4aefe5 CXF-8215: SSE breaks Pipeline Processing (#643)
add 7ed31b3 CXF-8215: SSE breaks Pipeline Processing. Adding proper headers propagation.
add 513f29f Fixed JDK8 tooling, mark build as unstable (instead of failed) when tests are run but some failed
add a7169e5 Updating Jetty
add 88871e7 OAuth 2.0 Dynamic Client Registration: include grant_types to response
add f2da164 Updating Spring + Spring Boot
add ce329cb [CXF-8225] Structure send method of Slf4jEventSender (#644)
add 3ba61d2 cxf-systests-rs-security: add test with JwsVerifier from jwks
add b70a391 Updating Jackson
add 80b32bb Update to Hibernate 5.4.12.Final
add 44a9307 cxf-rt-rs-json-basic: update JsonMapObject
add 3332e74 [CXF-8202] Update to OSGi Core 6.0.0 (#633)
add 92ff50f CXF-8231 - JAX-RS JOSE can't decrypt ECDHAESKeywrap
add de81796 Bumps to latest brave (#647)
add a8ae6bc cxf-rt-rs-json-basic: minor improvements
add b62c25d cxf-rt-rs-security-jose: minor improvements
add 1bd3463 back itests-felix
add cdf7685 cxf-systests-rs-security: include key id
add 169be66 CXF-8229 OAuth 2.0 Dynamic Client Registration: Client Update Request (#646)
add 6e828d6 CXF-8222 OIDC Refresh Response: ID Token iat Claim MUST represent the time that the new ID Token is issued (#645)
add 2c661c9 Updating Apache DS to 2.0.0.AM26
add f87a83b Updating HTTP Client to 4.5.12
add b9380e9 Configure sendServerVersion for OSGi/Blueprint
add 71ed1be CXF-8234 - Only disable output stream optimization in TransformOutInterceptor if it isn't configured already
add b6ad0ff CXF-8234 - Checkstyle fix
add 85b048e cxf-systests-rs-security: explicit 'issuer' initialization
add 2f9c529 CXF-8235 Handle null continuation in AsyncResponseImpl instead of throwing a NullPointerException (#649)
add 7971b50 Update to microprofile.rest.client 1.4.1
add 5b59268 CXF-8215: SSE breaks Pipeline Processing. Fixed the regression (the request filters are called twice for non-SSE endpoints), fixed CDI support
add 3611175 CXF-8234 - Add the encoding to the TransformOutInterceptor XMLStreamWriter
add d34a270 CXF-8234 - Removing unused method
add df4a4d6 CXF-8237 OAuth 2.0 Authorization Server Metadata / OpenID Provider Metadata (#650)
add b7a8df7 CXF-8240 - STSClient produces wrong element order for TokenType
add 0de9dca cxf-rt-rs-json-basic: cleanup pom
add 9c37b6c Update to maven-checkstyle-plugin 3.1.1
add 29f9d03 [CXF-8241]cxf-codegen-plugin not using the proxy port configured in settings.xml
add 5e511db Fixing some Jakarta JAX-RS TCKs tests due to missing dependencies
add 95b89ec Merge remote-tracking branch 'origin/master' into CXF-7949_jakarta-servlet
No new revisions were added by this update.
Summary of changes:
core/pom.xml | 2 +-
.../org/apache/cxf/common/util/StringUtils.java | 15 +-
.../org/apache/cxf/common/util/URIParserUtil.java | 16 +-
.../transform/TransformOutInterceptor.java | 30 ++-
.../main/java/org/apache/cxf/message/Message.java | 7 +
.../cxf/staxutils/transform/TransformUtils.java | 16 +-
.../apache/cxf/common/util/StringUtilsTest.java | 6 +
distribution/javadoc/pom.xml | 2 +-
.../src/main/release/samples/jax_rs/search/pom.xml | 6 +-
.../release/samples/jax_rs/tracing_brave/pom.xml | 6 +-
.../samples/jax_rs/tracing_brave_osgi/pom.xml | 4 +-
.../samples/jax_rs/tracing_opentracing/pom.xml | 4 +-
.../jax_rs/tracing_opentracing_osgi/pom.xml | 4 +-
.../cxf/tracing/brave/AbstractBraveProvider.java | 16 --
.../cxf/tracing/brave/BraveStopInterceptor.java | 2 +-
.../opentracing/OpenTracingStopInterceptor.java | 2 +-
maven-plugins/codegen-plugin/pom.xml | 1 +
.../src/it/jdk-cxf-with-toolchain/pom.xml | 40 +--
.../cxf/maven_plugin/AbstractCodegenMojo.java | 2 +-
maven-plugins/java2wadl-plugin/pom.xml | 5 -
maven-plugins/wadl2java-plugin/pom.xml | 5 +-
osgi/itests-felix/pom.xml | 19 +-
.../cxf/osgi/itests/NoAriesBlueprintTest.java | 53 ++--
.../apache/cxf/osgi/itests/OSGiTestSupport.java | 11 +-
osgi/karaf/commands/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 2 +-
osgi/pom.xml | 2 +-
parent/pom.xml | 60 ++---
pom.xml | 2 +-
rt/features/logging/pom.xml | 2 +-
.../cxf/ext/logging/slf4j/Slf4jEventSender.java | 44 ++--
.../apache/cxf/jaxrs/impl/AsyncResponseImpl.java | 5 +
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 115 ++++----
.../cxf/jaxrs/impl/AsyncResponseImplTest.java | 28 ++
rt/management/pom.xml | 27 +-
.../management/jmx/MBServerConnectorFactory.java | 102 ++++++-
.../jmx/MBServerConnectorFactoryTest.java | 55 ++++
rt/rs/description-swagger-ui/pom.xml | 5 +
.../jaxrs/swagger/ui/SwaggerUiResourceLocator.java | 8 +-
.../swagger/ui/SwaggerUIResourceLocatorTest.java | 35 +--
rt/rs/extensions/json-basic/pom.xml | 9 -
.../apache/cxf/jaxrs/json/basic/JsonMapObject.java | 44 ++--
.../json/basic/JsonMapObjectReaderWriter.java | 10 +-
.../cxf/jaxrs/json/basic/JsonMapObjectTest.java | 54 ++++
rt/rs/extensions/providers/pom.xml | 6 +-
rt/rs/extensions/search/pom.xml | 4 -
rt/rs/microprofile-client/pom.xml | 4 +-
.../cxf/rs/security/jose/common/JoseUtils.java | 6 +-
.../security/jose/common/KeyManagementUtils.java | 22 +-
.../jwe/EcdhAesWrapKeyDecryptionAlgorithm.java | 4 +-
.../security/jose/jwe/JweJwtCompactConsumer.java | 9 +-
.../cxf/rs/security/jose/jwk/JsonWebKeys.java | 6 +-
.../apache/cxf/rs/security/jose/jwk/JwkUtils.java | 2 +-
.../rs/security/jose/jws/JwsCompactProducer.java | 12 +-
.../apache/cxf/rs/security/jose/jwt/JwtToken.java | 6 +-
.../jose/jwa/JwaDecryptRfcConformanceTest.java | 10 +
.../oauth/provider/MD5SequenceGenerator.java | 20 +-
rt/rs/security/oauth-parent/oauth2/pom.xml | 4 -
.../security/oauth2/client/OAuthClientUtils.java | 25 +-
.../oauth2/grants/code/JPACMTCodeDataProvider.java | 2 +-
.../grants/refresh/RefreshTokenGrantHandler.java | 5 +-
.../oauth2/provider/AbstractOAuthDataProvider.java | 20 +-
.../services/AbstractAccessTokenValidator.java | 2 +-
.../oauth2/services/AccessTokenService.java | 2 +-
.../services/AuthorizationCodeGrantService.java | 2 +-
.../oauth2/services/AuthorizationMetadata.java | 266 +++++++++++++++++++
.../services/AuthorizationMetadataService.java | 5 +-
.../services/ClientRegistrationResponse.java | 7 +
.../services/DynamicRegistrationService.java | 52 ++--
.../services/RedirectionBasedGrantService.java | 5 +-
.../oauth2/services/WellKnownService.java} | 20 +-
.../hawk/AbstractHawkAccessTokenValidator.java | 2 +-
.../security/oauth2/utils/AuthorizationUtils.java | 2 +-
.../cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +-
rt/rs/security/sso/oidc/pom.xml | 4 -
.../security/oidc/idp/IdTokenResponseFilter.java | 9 +-
.../oidc/idp/OidcConfigurationService.java | 22 +-
.../oidc/idp/OidcDynamicRegistrationService.java | 8 +-
.../rs/security/oidc/idp/OidcProviderMetadata.java | 245 +++++++++++++++++
.../cxf/rs/security/oidc/idp/UserInfoService.java | 2 +-
.../oidc/rp/OidcRpAuthenticationFilter.java | 2 +-
.../cxf/rs/security/oidc/utils/OidcUtils.java | 17 ++
.../cxf/jaxrs/sse/SseEventSinkContextProvider.java | 9 +
.../java/org/apache/cxf/jaxrs/sse/SseFeature.java | 7 +
.../ext/SseTransportCustomizationExtension.java | 2 +
.../cxf/jaxrs/sse/interceptor/SseInterceptor.java | 139 ++++++++++
.../cxf/transport/sse/SseProvidersExtension.java | 4 +-
rt/transports/http-hc/pom.xml | 2 +-
rt/transports/http-jetty/pom.xml | 2 +-
.../JettyHTTPServerEngineFactoryHolder.java | 4 +-
.../osgi/HTTPJettyTransportActivator.java | 2 +
.../http_jetty/JettyHTTPDestinationTest.java | 5 +-
.../http/netty/client/NettyHttpConduit.java | 15 +-
rt/transports/http-netty/netty-server/pom.xml | 2 +-
.../netty/server/NettyHttpDestinationTest.java | 5 +-
rt/transports/http-undertow/pom.xml | 2 +-
.../http_undertow/UndertowHTTPDestinationTest.java | 5 +-
rt/transports/http/pom.xml | 2 +-
.../org/apache/cxf/transport/http/HTTPConduit.java | 7 +-
.../http/auth/DefaultBasicAuthSupplier.java | 2 +-
.../transport/https/AllowAllHostnameVerifier.java | 9 +
.../apache/cxf/transport/http/HTTPConduitTest.java | 9 +-
.../http/auth/DefaultBasicAuthSupplierTest.java} | 18 +-
.../org/apache/cxf/transport/jms/util/JMSUtil.java | 12 +-
rt/transports/websocket/pom.xml | 2 +-
.../cxf/ws/security/trust/AbstractSTSClient.java | 35 +--
services/xkms/xkms-service/pom.xml | 2 +-
services/xkms/xkms-x509-handlers/pom.xml | 2 +-
systests/jaxrs/pom.xml | 4 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 12 +-
.../systest/jaxrs/JAXRSClientServerBookTest.java | 16 +-
.../jaxrs/security/AbstractSpringSecurityTest.java | 13 +-
.../JAXRSJaasConfigurationSecurityTest.java | 3 +-
.../jaxrs/security/JAXRSJaasSecurityTest.java | 3 +-
systests/microprofile/client/async/pom.xml | 4 +-
systests/microprofile/client/weld/pom.xml | 37 ++-
systests/microprofile/pom.xml | 4 +-
systests/rs-security/pom.xml | 9 +-
.../security/oauth/MemoryOAuthDataProvider.java | 4 +-
.../oauth2/common/JCacheOAuthDataProviderImpl.java | 68 ++---
.../oauth2/common/JPAOAuthDataProviderImpl.java | 68 ++---
.../security/oauth2/common/OAuth2TestUtils.java | 48 +++-
.../oauth2/common/WSS4JBasicAuthFilter.java | 5 +
.../oauth2/filters/BookServerOAuth2Filters.java | 48 ----
.../oauth2/filters/BookServerOAuth2FiltersJwt.java | 48 ----
.../oauth2/filters/BookServerOAuth2Service.java | 48 ----
.../oauth2/filters/BookServerOAuth2ServiceJwt.java | 48 ----
.../security/oauth2/filters/OAuth2FiltersTest.java | 203 ++++++--------
.../oauth2/filters/OAuth2JwtFiltersTest.java | 88 +++++--
.../security/oauth2/filters/PartnerServer.java | 49 ----
.../security/oauth2/filters/PartnerService.java | 34 +--
.../oauth2/grants/AuthorizationGrantTest.java | 293 ++++++---------------
.../oauth2/grants/DynamicRegistrationTest.java | 111 +++-----
.../jaxrs/security/oidc/IdTokenProviderImpl.java | 11 +-
.../security/oidc/OIDCDynamicRegistrationTest.java | 141 ++++++----
.../systest/jaxrs/security/oidc/OIDCFlowTest.java | 73 +++++
.../security/oidc/OIDCMetadataServiceTest.java | 73 -----
.../jaxrs/security/oidc/SubjectCreatorImpl.java | 58 ++++
.../oidc/filters/BookServerOIDCFilters.java | 48 ----
.../oidc/filters/BookServerOIDCService.java | 48 ----
.../filters/JwsSignatureVerifierProvider.java} | 32 ++-
.../security/oidc/filters/OIDCFiltersTest.java | 126 ++++++---
.../src/test/resources/META-INF/persistence.xml | 1 +
.../jaxrs/security/oauth2/filters/client.xml | 45 ----
.../security/oauth2/filters/oauth20-serverJwt.xml | 39 ++-
.../security/oauth2/filters/partner-service.xml | 9 +-
.../grants-server-jcache-jwt-non-persist.xml | 7 +-
.../oauth2/grants/grants-server-jcache-jwt.xml | 7 +-
.../oauth2/grants/grants-server-jcache.xml | 6 +-
.../security/oauth2/grants/grants-server-jpa.xml | 6 +-
.../systest/jaxrs/security/oidc/filters/client.xml | 45 ----
...{filters-server.xml => filters-jwks-server.xml} | 104 +++-----
.../jaxrs/security/oidc/filters/oidc-server.xml | 12 +-
.../jaxrs/security/oidc/metadata-server-jcache.xml | 84 ------
.../oidc/oidc-server-jcache-jwt-non-persist.xml | 12 +-
.../jaxrs/security/oidc/oidc-server-jcache-jwt.xml | 12 +-
.../jaxrs/security/oidc/oidc-server-jcache.xml | 12 +-
.../jaxrs/security/oidc/oidc-server-jpa.xml | 26 +-
.../cxf/systest/jaxrs/sse/AbstractSseTest.java | 44 ++++
.../apache/cxf/systest/jaxrs/sse/BookStore.java | 30 +++
.../apache/cxf/systest/jaxrs/sse/BookStore2.java | 30 +++
.../jaxrs/sse}/BookStoreResponseFilter.java | 35 ++-
.../cxf/systest/jaxrs/sse/SseApplication.java | 6 +-
.../jaxrs/sse/jetty/AbstractJettyServer.java | 7 +-
.../jaxrs/sse/tomcat/AbstractTomcatServer.java | 6 +-
.../jaxrs/sse/undertow/AbstractUndertowServer.java | 5 +-
.../cxf/systest/jaxrs/tracing/BookStore.java | 24 +-
.../jaxrs/tracing/NullPointerExceptionMapper.java} | 10 +-
.../jaxrs/tracing/brave/BraveTracingTest.java | 97 +++----
.../opentracing/OpenTracingTracingTest.java | 36 ++-
.../systest/jaxws/tracing/BookStoreService.java | 1 +
.../cxf/systest/jaxws/tracing/brave/BookStore.java | 12 +
.../jaxws/tracing/brave/BraveTracingTest.java | 160 +++++------
.../jaxws/tracing/opentracing/BookStore.java | 14 +-
.../opentracing/OpenTracingTracingTest.java | 13 +
.../systest/https/conduit/HTTPSConduitTest.java | 6 +-
systests/wsdl_maven/codegen/pom.xml | 1 +
tck/Jenkinsfile | 16 +-
tck/ts.jte.template | 2 +-
179 files changed, 2785 insertions(+), 2108 deletions(-)
create mode 100644 rt/management/src/test/java/org/apache/cxf/management/jmx/MBServerConnectorFactoryTest.java
copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookServerSpring.java => rt/rs/description-swagger-ui/src/test/java/org/apache/cxf/jaxrs/swagger/ui/SwaggerUIResourceLocatorTest.java (55%)
create mode 100644 rt/rs/extensions/json-basic/src/test/java/org/apache/cxf/jaxrs/json/basic/JsonMapObjectTest.java
create mode 100644 rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/AuthorizationMetadata.java
copy rt/{ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/notification/emitters/EmitterImpl.java => rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/WellKnownService.java} (68%)
create mode 100644 rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/OidcProviderMetadata.java
create mode 100644 rt/rs/sse/src/main/java/org/apache/cxf/jaxrs/sse/interceptor/SseInterceptor.java
copy rt/{databinding/aegis/src/test/java/org/apache/cxf/aegis/type/BigDecimalStringTest.java => transports/http/src/test/java/org/apache/cxf/transport/http/auth/DefaultBasicAuthSupplierTest.java} (61%)
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2Filters.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2FiltersJwt.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2Service.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/BookServerOAuth2ServiceJwt.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/filters/PartnerServer.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCMetadataServiceTest.java
create mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/SubjectCreatorImpl.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/BookServerOIDCFilters.java
delete mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/BookServerOIDCService.java
copy systests/{jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/validation/AbstractJAXRSValidationTest.java => rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/filters/JwsSignatureVerifierProvider.java} (52%)
delete mode 100644 systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oauth2/filters/client.xml
delete mode 100644 systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/client.xml
copy systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/filters/{filters-server.xml => filters-jwks-server.xml} (61%)
delete mode 100644 systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/metadata-server-jcache.xml
copy systests/{cdi/base/src/main/java/org/apache/cxf/systests/cdi/base => rs-sse/rs-sse-base/src/main/java/org/apache/cxf/systest/jaxrs/sse}/BookStoreResponseFilter.java (59%)
copy systests/{jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/IllegalArgumentExceptionMapper.java => tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/NullPointerExceptionMapper.java} (75%)