You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by de...@apache.org on 2018/04/09 05:21:02 UTC
[cxf] branch spring-5-boot-2 updated (dc38a14 -> df5bfe2)
This is an automated email from the ASF dual-hosted git repository.
deki pushed a change to branch spring-5-boot-2
in repository https://gitbox.apache.org/repos/asf/cxf.git.
discard dc38a14 Spring 5/ Spring Boot 2
add 6412142 Adding a test to make sure the principal from a SAML Assertion includes comments if they are present in the assertion
add e791b0b [CXF-7661]add isTimeout flag for Continutation so that we can easily know when the timeout happen outside CXF
add d2814e3 [CXF-7653]add a testcase to expose a failure
add e98c13a CXF-7665 - Provide an easy way to set the TLSClientParameters on the STSClient client object
add 982e4de CXF-7659: Improve SSE automatic configuration. (#386)
add 4aaba35 Enforce strong GPG signatures, see https://issues.apache.org/jira/browse/MPOM-118
add d301485 CXF-7667 - Don't add an STS operation in the DefaultSecurityTokenServiceProvider if no STSProperties are available
add cb14ce7 Fix Javadoc
add 7a68aa1 Merge branch 'master' of github.com:apache/cxf
add 6ee608d [CXF-7653] Update test to show it works
add a0b83f3 [CXF-7668] Start pulling the servlet 3.1 specific code into stuff that is only used/accessed if Servlet 3.1 is detected
add 018e912 Replace size() == 0 with isEmpty
add d36c643 Update surefire plugin version
add 80e7e97 Adding test for XSLTFeature
add e5833e2 Also update surefire-report to match
add 6198386 [CXF-7671]should avoid reverse dns resolution in AsyncHTTPConduit for the proxy host address
add 6ea2fa6 Adding the secure processing feature in a few more places
add e81662e [CXF-7672] PrimitiveTextProvider: support java.net.URI and java.net.URL
add 5b73084 [CXF-7634] changed Spring Boot sample to use OpenApiFeature
add 04fcd90 [CXF-7657] Reader and Writer interceptors are not sorted by the provider comparator
add 6a27c0a [CXF-7657] Adding test
add 639b96b Merge pull request #385 from csierra/reader-writer-interceptors-provider-comparator
add 13e8d4e [CXF-7674]enable Java2Wadl maven plugin to specify classResourceNames or basePackages
add 5cdf919 [CXF-7675]Extra dot required when specifying base packages to scan in Java2Wadl Maven plugins
add 97e4a34 Generate a help mojo for the cxf-codegen-plugin, so the user can get help regarding goals and parameters from the command line. You can read more about how to use a help mojo here: https://maven.apache.org/plugin-tools/maven-plugin-plugin/help-mojo.html
add dfcabbd [CXF-7678] Fluent setters support in search extension (#391)
add 2b6a0ec [CXF-7669/CXF-7520] Fix problems of double escaping characters
add 0c16491 [CXF-7676] Create a proxy OutputStream to create an EntityStream that a user's ClientRequestFilter can interact with and holds a reference that we can set our URLConnectionWrappedOutputStream to later.
add 1fc1fa0 Update release notes for 3.2.3
add 3962727 create a single ClassResourceInfo per class + annotated method
add 7e9c463 [CXF-7671]should avoid reverse dns resolution in AsyncHTTPConduit for the proxy host address
add 9285b30 Adding the secure processing feature in a few more places
add c1e21b8 [CXF-7670] unit tests
add 1788c73 [CXF-7670] checkstyle fix
add 846d6c7 Merge pull request #388 from K0zka/CXF-7670_v1
add b82303b [maven-release-plugin] prepare release cxf-3.2.3
add 7860142 [maven-release-plugin] prepare for next development iteration
add 53b2be8 Update test to actually test the return values to make sure they are correct
add 4398d3a CXF-7643 ensure to not conflict with default CDI beans when possible + add a way for cdi container to integrate with cdi to configure it
add effefb0 tests for default injections
add a8a9877 [CXF-7669/CXF-7520] Fix JSONProvider that may be escaping strings via XML escape rules
add 60e02ba [CXF-7670] Consider the non-synthetic/bridge methods first, then re-consider the bridge/synthetics if needed
add f4a293c Fix some eclipse warnings
add b7b42c1 Fix CDI tests
add ca72cc5 [CXF-7684] Fix problem of attachement blocks not divisible by 3
add a7ce442 [CXF-7670] Consider the non-synthetic/bridge methods first, then re-consider the bridge/synthetics if needed. Adding test case to verify this behavior
add aed1772 Make WSS4JStaxOutInterceptor always run after LoggingOutInterceptor
add 31a9c28 Merge pull request #395 from imgx64/CXF-7686
add a27fb63 CXF-7686 - Adding a test
add 535dae3 CXF-7687 - Adding a test
add 203c8a2 CXF-7687 - AuthorizationPolicy: AuthorizationType="Bearer" has no effect
add ab5458d Update release notes for 3.2.4
add 60b94b9 [maven-release-plugin] prepare release cxf-3.2.4
add d28cea1 [maven-release-plugin] prepare for next development iteration
add 1bc0ad6 Surround getClassLoader() call with doPriv
add 013d394 add Tomcat 8 in Maven for this sample
add 5987da2 update swagger-ui to latest version
add 00a668a adapted test to newer Swagger UI version
add 36d63f9 CXF-7658: SSE destinations unreachable deployed in OSGi. Added cxf-sse Karaf feature and sse_osgi sample.
add 896bfd6 CXF-7658: SSE destinations unreachable deployed in OSGi. Removing CORS filter from the SSE OSGi sample (since it does not work with Atmosphere)
add 9d259f3 [CXF-7689]ensure don't have content-type|content-length as jms message headers when use REST on JMS Transport
add c024428 CXF-7691 - Make it possible to add two security headers using WSS4JOutInterceptor
add 89ad818 [CXF-7683]Codegen fails when using JDK10 with maven and cxf-plugin
add b703732 Upgrading swagger-jaxrs2 to 2.0.0 stable
add be88562 CXF-7692: Swagger UI is not shown in OSGi deployment
add 3b5d850 CXF-7691 - Improving error message for multiple WSS4JStaxOutInterceptor instances
add 82fc4f0 CXF-7634: Enrich support for Swagger Core 2.0 (OpenApi Spec 3.0). Adding OSGi support and samples
add ad579cd Removing BouncyCastle where it's not needed in a couple of testsd
add 9a90413 CXF-7693 - Allow JWT aud claim to be empty
add 8a15cad Separated Kerberos + LDAP system tests + added a test for JAX-RS Search using the LdapQueryVisitor
add f4e6c20 CXF-7701 - Encode JAX-RS Search query values for the LdapQueryVisitor
add af9ca4f CXF-7702 - Remove methods in QueryContext that don't use a custom bean class.
add 2965ebc [CXF-7700]: added check on empty encoding
add a94e978 [CXF-7694] added missing OpenApiCustomizer to fix sample
add e8d0548 update Spring, Spring Security and Spring Boot minor versions
new df5bfe2 Spring 5/ Spring Boot 2
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (dc38a14)
\
N -- N -- N refs/heads/spring-5-boot-2 (df5bfe2)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
core/pom.xml | 2 +-
.../cxf/attachment/AttachmentSerializer.java | 29 +++-
.../managers/DestinationFactoryManagerImpl.java | 10 +-
.../java/org/apache/cxf/common/jaxb/JAXBUtils.java | 24 +--
.../apache/cxf/common/util/ClasspathScanner.java | 2 +-
.../apache/cxf/common/util/CollectionUtils.java | 4 +-
.../java/org/apache/cxf/common/util/Compiler.java | 3 +-
.../org/apache/cxf/common/util/PackageUtils.java | 2 +-
.../org/apache/cxf/common/util/StringUtils.java | 2 +-
.../org/apache/cxf/common/util/URIParserUtil.java | 2 +-
.../org/apache/cxf/continuations/Continuation.java | 6 +
.../main/java/org/apache/cxf/helpers/DOMUtils.java | 4 +-
.../java/org/apache/cxf/helpers/JavaUtils.java | 20 ++-
.../AbstractInDatabindingInterceptor.java | 2 +-
.../interceptor/AbstractLoggingInterceptor.java | 4 +-
.../AbstractSecurityContextInInterceptor.java | 2 +-
.../apache/cxf/service/model/ServiceModelUtil.java | 2 +-
.../cxf/staxutils/AbstractDOMStreamReader.java | 2 +-
.../cxf/transport/AbstractTransportFactory.java | 2 +
.../cxf/transport/DestinationFactoryManager.java | 16 ++
.../transport/common/gzip/GZIPOutInterceptor.java | 2 +-
.../cxf/workqueue/AutomaticWorkQueueImpl.java | 2 +-
.../cxf/bus/spring/BusDefinitionParserTest.java | 8 +-
.../cxf/interceptor/LoggingOutInterceptorTest.java | 49 +++++++
distribution/javadoc/pom.xml | 2 +-
distribution/manifest/pom.xml | 2 +-
distribution/pom.xml | 2 +-
distribution/src/main/release/release_notes.txt | 119 +++++++--------
.../src/main/release/samples/aegis/pom.xml | 10 +-
.../main/release/samples/aegis_standalone/pom.xml | 4 +-
.../src/main/release/samples/callback/pom.xml | 8 +-
.../samples/clustering/failover_jaxws_osgi/pom.xml | 8 +-
.../samples/clustering/failover_server/pom.xml | 10 +-
.../samples/configuration_interceptor/pom.xml | 10 +-
.../src/main/release/samples/corba/bank/pom.xml | 8 +-
.../samples/corba/bank_ws_addressing/pom.xml | 8 +-
.../main/release/samples/corba/hello_world/pom.xml | 8 +-
.../release/samples/groovy_spring_support/pom.xml | 8 +-
.../main/release/samples/in_jvm_transport/pom.xml | 10 +-
.../release/samples/java_first_jaxws/README.txt | 5 +-
.../main/release/samples/java_first_jaxws/pom.xml | 44 +++++-
.../samples/java_first_jaxws_factory_bean/pom.xml | 8 +-
.../main/release/samples/java_first_jms/pom.xml | 6 +-
.../main/release/samples/java_first_pojo/pom.xml | 8 +-
.../samples/java_first_spring_support/pom.xml | 8 +-
.../src/main/release/samples/jax_rs/basic/pom.xml | 8 +-
.../release/samples/jax_rs/basic_https/pom.xml | 2 +-
.../main/release/samples/jax_rs/basic_oidc/pom.xml | 10 +-
.../main/release/samples/jax_rs/big_query/pom.xml | 12 +-
.../samples/jax_rs/content_negotiation/pom.xml | 10 +-
.../samples/jax_rs/description_openapi_v3/pom.xml | 10 +-
.../jax_rs/description_openapi_v3_osgi/README.txt | 81 +++++++++++
.../pom.xml | 25 ++--
.../demo/jaxrs/swagger/server/ApiOriginFilter.java | 0
.../main/java/demo/jaxrs/swagger/server/Item.java | 0
.../java/demo/jaxrs/swagger/server/Sample.java | 161 +++++++++++++++++++++
.../main/resources/OSGI-INF/blueprint/context.xml | 65 +++++++++
.../samples/jax_rs/description_swagger2/pom.xml | 10 +-
.../jax_rs/description_swagger2_osgi/pom.xml | 8 +-
.../jax_rs/description_swagger2_spring/pom.xml | 10 +-
.../jax_rs/description_swagger2_web/pom.xml | 8 +-
.../release/samples/jax_rs/minimal_osgi/pom.xml | 2 +-
.../src/main/release/samples/jax_rs/odata/pom.xml | 2 +-
.../src/main/release/samples/jax_rs/search/pom.xml | 14 +-
.../main/release/samples/jax_rs/spring_boot/README | 6 +-
.../release/samples/jax_rs/spring_boot/pom.xml | 6 +-
.../sample/rs/service/SampleRestApplication.java | 24 +--
.../rs/service/hello1/HelloServiceImpl1.java | 3 +-
.../rs/service/hello2/HelloServiceImpl2.java | 5 +-
.../jax_rs/spring_boot_scan/application/pom.xml | 4 +-
.../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +-
.../spring_boot_scan/eureka-registry/pom.xml | 2 +-
.../release/samples/jax_rs/spring_security/pom.xml | 8 +-
.../main/release/samples/jax_rs/sse_cdi/pom.xml | 8 +-
.../main/release/samples/jax_rs/sse_client/pom.xml | 8 +-
.../release/samples/jax_rs/sse_osgi/README.txt | 93 ++++++++++++
.../jax_rs/{websocket_osgi => sse_osgi}/pom.xml | 28 ++--
.../src/main/java/demo/jaxrs/server/Stats.java | 44 +++---
.../demo/jaxrs/server/StatsRestServiceImpl.java | 116 +++++++++++++++
.../main/resources/OSGI-INF/blueprint/context.xml | 52 +++++++
.../sse_osgi/src/main/resources/web-ui/index.html | 49 +++++++
.../resources/web-ui/javascripts/highcharts.js | 0
.../web-ui/javascripts/jquery-1.9.0.min.js | 0
.../main/release/samples/jax_rs/sse_spring/pom.xml | 6 +-
.../main/release/samples/jax_rs/sse_tomcat/pom.xml | 6 +-
.../release/samples/jax_rs/tracing_brave/pom.xml | 14 +-
.../samples/jax_rs/tracing_brave_osgi/pom.xml | 14 +-
.../release/samples/jax_rs/tracing_htrace/pom.xml | 14 +-
.../samples/jax_rs/tracing_opentracing/pom.xml | 14 +-
.../jax_rs/tracing_opentracing_camel/pom.xml | 18 +--
.../jax_rs/tracing_opentracing_osgi/pom.xml | 14 +-
.../main/release/samples/jax_rs/websocket/pom.xml | 10 +-
.../release/samples/jax_rs/websocket_osgi/pom.xml | 8 +-
.../release/samples/jax_rs/websocket_web/pom.xml | 8 +-
.../samples/jax_server_aegis_client/pom.xml | 10 +-
.../src/main/release/samples/jaxws_async/pom.xml | 10 +-
.../samples/jaxws_dispatch_provider/pom.xml | 8 +-
.../main/release/samples/jaxws_handlers/pom.xml | 8 +-
.../main/release/samples/jaxws_spring_boot/pom.xml | 2 +-
.../samples/jaxws_tracing_brave_osgi/pom.xml | 10 +-
.../src/main/release/samples/jms_pubsub/pom.xml | 8 +-
.../src/main/release/samples/jms_queue/pom.xml | 6 +-
.../src/main/release/samples/jms_spec_demo/pom.xml | 6 +-
.../main/release/samples/jms_spring_config/pom.xml | 6 +-
.../samples/js_browser_client_java_first/pom.xml | 10 +-
.../samples/js_browser_client_simple/pom.xml | 10 +-
.../src/main/release/samples/js_client/pom.xml | 10 +-
.../src/main/release/samples/js_provider/pom.xml | 8 +-
distribution/src/main/release/samples/mtom/pom.xml | 8 +-
.../src/main/release/samples/oauth/client/pom.xml | 2 +-
.../src/main/release/samples/oauth/server/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 8 +-
.../main/release/samples/restful_dispatch/pom.xml | 10 +-
.../release/samples/ruby_spring_support/pom.xml | 8 +-
.../src/main/release/samples/soap_header/pom.xml | 8 +-
distribution/src/main/release/samples/sts/pom.xml | 2 +-
.../src/main/release/samples/throttling/pom.xml | 2 +-
.../src/main/release/samples/ws_addressing/pom.xml | 8 +-
.../src/main/release/samples/ws_discovery/pom.xml | 10 +-
.../src/main/release/samples/ws_eventing/pom.xml | 2 +-
.../main/release/samples/ws_notification/pom.xml | 14 +-
.../src/main/release/samples/ws_policy/pom.xml | 8 +-
.../src/main/release/samples/ws_rm/pom.xml | 10 +-
.../release/samples/ws_security/sign_enc/pom.xml | 16 +-
.../samples/ws_security/sign_enc_policy/pom.xml | 2 +-
.../main/release/samples/ws_security/ut/pom.xml | 10 +-
.../release/samples/ws_security/ut_policy/pom.xml | 2 +-
.../src/main/release/samples/wsdl_first/pom.xml | 10 +-
.../samples/wsdl_first_dynamic_client/pom.xml | 8 +-
.../main/release/samples/wsdl_first_https/pom.xml | 2 +-
.../release/samples/wsdl_first_pure_xml/pom.xml | 8 +-
.../main/release/samples/wsdl_first_rpclit/pom.xml | 8 +-
.../main/release/samples/wsdl_first_soap12/pom.xml | 8 +-
.../release/samples/wsdl_first_xml_wrapped/pom.xml | 8 +-
integration/cdi/pom.xml | 2 +-
.../org/apache/cxf/cdi/ContextProducerBean.java | 11 +-
.../java/org/apache/cxf/cdi/ContextResolved.java | 2 +-
.../cxf/cdi/DelegateContextAnnotatedType.java | 1 +
.../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 64 +++++++-
integration/jca/pom.xml | 2 +-
integration/pom.xml | 2 +-
integration/spring-boot/autoconfigure/pom.xml | 2 +-
integration/spring-boot/pom.xml | 2 +-
integration/spring-boot/starter-jaxrs/pom.xml | 2 +-
integration/spring-boot/starter-jaxws/pom.xml | 2 +-
integration/tracing/tracing-brave/pom.xml | 2 +-
integration/tracing/tracing-htrace/pom.xml | 2 +-
integration/tracing/tracing-opentracing/pom.xml | 2 +-
maven-plugins/archetypes/cxf-jaxrs-service/pom.xml | 2 +-
.../archetypes/cxf-jaxws-javafirst/pom.xml | 4 +-
.../archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +-
maven-plugins/archetypes/pom.xml | 2 +-
maven-plugins/codegen-plugin/pom.xml | 12 +-
.../cxf/maven_plugin/AbstractCodegenMoho.java | 6 +-
maven-plugins/corba/pom.xml | 2 +-
maven-plugins/java2swagger-plugin/pom.xml | 4 +-
maven-plugins/java2wadl-plugin/pom.xml | 4 +-
.../cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 21 ++-
maven-plugins/java2ws-plugin/pom.xml | 2 +-
.../org/apache/cxf/maven_plugin/Java2WSMojo.java | 3 +-
maven-plugins/pom.xml | 2 +-
maven-plugins/wadl2java-plugin/pom.xml | 2 +-
.../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 5 +-
maven-plugins/wsdl-validator-plugin/pom.xml | 2 +-
osgi/bundle/compatible/pom.xml | 2 +-
osgi/bundle/pom.xml | 2 +-
osgi/itests/pom.xml | 2 +-
osgi/karaf/commands/pom.xml | 2 +-
osgi/karaf/features/pom.xml | 2 +-
.../karaf/features/src/main/resources/features.xml | 26 ++++
osgi/karaf/pom.xml | 2 +-
osgi/pom.xml | 2 +-
osgi/repository/pom.xml | 2 +-
parent/pom.xml | 66 ++-------
pom.xml | 11 +-
rt/bindings/coloc/pom.xml | 2 +-
rt/bindings/corba/pom.xml | 2 +-
.../cxf/binding/corba/types/CorbaUnionHandler.java | 2 +-
.../binding/corba/types/CorbaHandlerUtilsTest.java | 2 +-
rt/bindings/pom.xml | 2 +-
rt/bindings/soap/pom.xml | 2 +-
.../soap/interceptor/SoapHeaderInterceptor.java | 2 +-
.../soap/MustUnderstandInterceptorTest.java | 2 +-
rt/bindings/xml/pom.xml | 2 +-
rt/databinding/aegis/pom.xml | 2 +-
.../org/apache/cxf/aegis/type/XMLTypeCreator.java | 11 +-
rt/databinding/jaxb/pom.xml | 2 +-
.../java/org/apache/cxf/jaxb/JAXBDataBinding.java | 23 ++-
.../org/apache/cxf/jaxb/io/DataWriterImpl.java | 14 +-
rt/databinding/pom.xml | 2 +-
rt/features/clustering/pom.xml | 2 +-
rt/features/logging/pom.xml | 2 +-
.../java/org/apache/cxf/ext/logging/Logging.java | 4 +-
rt/features/metrics/pom.xml | 2 +-
rt/features/pom.xml | 2 +-
rt/features/throttling/pom.xml | 2 +-
rt/frontend/jaxrs/pom.xml | 2 +-
.../apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java | 2 +-
.../apache/cxf/jaxrs/ext/multipart/Attachment.java | 2 +-
.../org/apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 4 +-
.../org/apache/cxf/jaxrs/impl/RequestImpl.java | 8 +-
.../cxf/jaxrs/interceptor/JAXRSOutInterceptor.java | 2 +-
.../apache/cxf/jaxrs/nio/NioMessageBodyWriter.java | 14 +-
.../cxf/jaxrs/provider/AbstractJAXBProvider.java | 3 +-
.../cxf/jaxrs/provider/JAXBElementProvider.java | 4 +-
.../cxf/jaxrs/provider/PrimitiveTextProvider.java | 9 +-
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 60 +++++++-
.../cxf/jaxrs/provider/ServerProviderFactory.java | 2 +-
.../cxf/jaxrs/provider/XSLTJaxbProvider.java | 1 +
.../org/apache/cxf/jaxrs/utils/ResourceUtils.java | 77 ++++++----
.../jaxrs/impl/CacheControlHeaderProviderTest.java | 4 +-
.../jaxrs/provider/PrimitiveTextProviderTest.java | 30 +++-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 78 ++++++++++
.../apache/cxf/jaxrs/utils/ResourceUtilsTest.java | 90 ++++++++++++
rt/frontend/jaxws/pom.xml | 2 +-
.../cxf/jaxws/handler/HandlerChainBuilder.java | 4 +-
.../cxf/jaxws/interceptors/SwAInInterceptor.java | 2 +-
.../cxf/jaxws/interceptors/SwAOutInterceptor.java | 2 +-
.../WebFaultOutInterceptorTestCase.java | 4 +-
rt/frontend/js/pom.xml | 2 +-
rt/frontend/pom.xml | 2 +-
rt/frontend/simple/pom.xml | 2 +-
.../cxf/endpoint/dynamic/DynamicClientFactory.java | 2 +-
rt/javascript/javascript-rt/pom.xml | 2 +-
.../service/ServiceJavascriptBuilder.java | 2 +-
rt/javascript/javascript-tests/pom.xml | 2 +-
.../src/test/resources/deserializationTests.js | 2 +-
rt/javascript/pom.xml | 2 +-
rt/management/pom.xml | 2 +-
.../management/jmx/InstrumentationManagerImpl.java | 2 +-
rt/pom.xml | 2 +-
rt/rs/client/pom.xml | 2 +-
.../apache/cxf/jaxrs/client/AbstractClient.java | 2 +-
.../apache/cxf/jaxrs/client/ClientProxyImpl.java | 6 +-
.../cxf/jaxrs/client/JAXRSClientFactoryBean.java | 11 +-
.../client/spec/ClientRequestContextImpl.java | 2 +-
.../spec/ClientRequestFilterInterceptor.java | 8 +
rt/rs/description-openapi-v3/pom.xml | 2 +-
.../apache/cxf/jaxrs/openapi/JaxRs2Extension.java | 5 +-
rt/rs/description-swagger-ui/pom.xml | 2 +-
.../apache/cxf/jaxrs/swagger/SwaggerUiService.java | 7 +-
rt/rs/description-swagger/pom.xml | 2 +-
rt/rs/description/pom.xml | 2 +-
rt/rs/extensions/json-basic/pom.xml | 2 +-
rt/rs/extensions/providers/pom.xml | 2 +-
.../cxf/jaxrs/provider/atom/AtomPojoProvider.java | 2 +-
.../cxf/jaxrs/provider/json/JSONProvider.java | 1 +
rt/rs/extensions/reactivestreams/pom.xml | 2 +-
rt/rs/extensions/reactor/pom.xml | 2 +-
rt/rs/extensions/rx/pom.xml | 2 +-
rt/rs/extensions/rx2/pom.xml | 2 +-
rt/rs/extensions/search/pom.xml | 2 +-
.../apache/cxf/jaxrs/ext/search/Beanspector.java | 5 +-
.../apache/cxf/jaxrs/ext/search/QueryContext.java | 18 ---
.../cxf/jaxrs/ext/search/QueryContextProvider.java | 11 +-
.../jaxrs/ext/search/ldap/LdapQueryVisitor.java | 13 +-
.../org/apache/cxf/jaxrs/ext/search/ldap/Util.java | 55 +++++++
.../cxf/jaxrs/ext/search/BeanspectorTest.java | 9 +-
.../ext/search/ldap/LdapQueryVisitorTest.java | 2 +
rt/rs/http-sci/pom.xml | 2 +-
rt/rs/microprofile-client/pom.xml | 2 +-
rt/rs/pom.xml | 2 +-
rt/rs/security/cors/pom.xml | 2 +-
.../cors/CrossOriginResourceSharingFilter.java | 2 +-
rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 2 +-
rt/rs/security/jose-parent/jose/pom.xml | 2 +-
.../apache/cxf/rs/security/jose/jwt/JwtClaims.java | 2 +-
.../apache/cxf/rs/security/jose/jwt/JwtUtils.java | 16 +-
rt/rs/security/jose-parent/pom.xml | 2 +-
rt/rs/security/oauth-parent/oauth/pom.xml | 2 +-
rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 2 +-
rt/rs/security/oauth-parent/oauth2/pom.xml | 2 +-
.../services/RedirectionBasedGrantService.java | 2 +-
rt/rs/security/oauth-parent/pom.xml | 2 +-
rt/rs/security/pom.xml | 2 +-
rt/rs/security/sso/oidc/pom.xml | 2 +-
rt/rs/security/sso/saml/pom.xml | 2 +-
rt/rs/security/xml/pom.xml | 2 +-
.../security/xml/AbstractXmlSecOutInterceptor.java | 2 +-
rt/rs/sse/pom.xml | 2 +-
.../ext/SseTransportCustomizationExtension.java | 7 +
.../cxf/transport/sse/SseDestinationFactory.java | 66 +++++++++
.../cxf/transport/sse/SseHttpTransportFactory.java | 32 +++-
rt/security-saml/pom.xml | 2 +-
rt/security/pom.xml | 2 +-
rt/transports/http-hc/pom.xml | 2 +-
.../http/asyncclient/AsyncHTTPConduit.java | 2 +-
rt/transports/http-jetty/pom.xml | 2 +-
.../continuations/JettyContinuationWrapper.java | 9 ++
rt/transports/http-netty/netty-client/pom.xml | 2 +-
rt/transports/http-netty/netty-server/pom.xml | 2 +-
rt/transports/http-undertow/pom.xml | 2 +-
rt/transports/http/pom.xml | 2 +-
.../org/apache/cxf/transport/http/Cookies.java | 2 +-
.../org/apache/cxf/transport/http/HTTPConduit.java | 35 +++--
.../cxf/transport/http/ProxyOutputStream.java | 10 +-
.../http/Servlet3ContinuationProvider.java | 62 ++++++--
.../transport/http/auth/CustomAuthSupplier.java | 45 ++++++
.../cxf/transport/servlet/CXFNonSpringServlet.java | 33 ++++-
rt/transports/jms/pom.xml | 2 +-
.../org/apache/cxf/transport/jms/JMSConstants.java | 2 +
.../apache/cxf/transport/jms/JMSMessageUtils.java | 17 ++-
.../jms/continuations/JMSContinuation.java | 4 +
rt/transports/local/pom.xml | 2 +-
rt/transports/pom.xml | 2 +-
rt/transports/udp/pom.xml | 2 +-
rt/transports/websocket/pom.xml | 2 +-
rt/ws/addr/pom.xml | 2 +-
.../cxf/ws/addressing/impl/MAPAggregatorImpl.java | 2 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 3 +-
rt/ws/eventing/pom.xml | 2 +-
rt/ws/mex/pom.xml | 2 +-
rt/ws/policy/pom.xml | 2 +-
rt/ws/pom.xml | 2 +-
rt/ws/rm/pom.xml | 2 +-
.../java/org/apache/cxf/ws/rm/SequenceMonitor.java | 2 +-
.../java/org/apache/cxf/ws/rm/SourceSequence.java | 2 +-
rt/ws/security/pom.xml | 2 +-
.../HttpsTokenInterceptorProvider.java | 8 +-
.../SecureConversationOutInterceptor.java | 3 +-
.../cxf/ws/security/trust/AbstractSTSClient.java | 14 ++
...ractUsernameTokenAuthenticatingInterceptor.java | 2 +-
.../ws/security/wss4j/StaxActionInInterceptor.java | 2 +-
.../cxf/ws/security/wss4j/WSS4JOutInterceptor.java | 16 +-
.../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 15 +-
.../security/tokenstore/EHCacheTokenStoreTest.java | 2 +-
.../security/tokenstore/MemoryTokenStoreTest.java | 2 +-
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 2 +-
rt/ws/transfer/pom.xml | 2 +-
rt/wsdl/pom.xml | 2 +-
.../cxf/wsdl/interceptors/BareOutInterceptor.java | 2 +-
.../wsdl/interceptors/DocLiteralInInterceptor.java | 2 +-
.../factory/ReflectionServiceFactoryBean.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLServiceBuilder.java | 2 +-
.../org/apache/cxf/wsdl11/WSDLServiceFactory.java | 4 +-
.../apache/cxf/wsdl11/WSDLServiceBuilderTest.java | 2 +-
services/pom.xml | 2 +-
services/sts/pom.xml | 2 +-
services/sts/sts-core/pom.xml | 2 +-
.../org/apache/cxf/sts/claims/ClaimsManager.java | 2 +-
.../apache/cxf/sts/claims/LdapClaimsHandler.java | 4 +-
.../cxf/sts/claims/LdapGroupClaimsHandler.java | 4 +-
.../apache/cxf/sts/claims/mapper/ClaimUtils.java | 2 +-
.../DefaultSecurityTokenServiceProvider.java | 9 ++
.../cxf/sts/cache/HazelCastTokenStoreTest.java | 2 +-
.../apache/cxf/sts/common/CustomClaimsHandler.java | 2 +-
.../token/validator/SAMLTokenValidatorTest.java | 51 ++++++-
services/sts/systests/advanced/pom.xml | 2 +-
.../defaultstsprovider/DefaultSTSProviderTest.java | 143 ++++++++++++++++++
.../systest/sts/defaultstsprovider/STSServer.java | 37 +++--
.../sts/deployment/CustomClaimsHandler.java | 1 +
.../cxf-client-unit.xml | 0
.../sts/defaultstsprovider/cxf-sts-common.xml | 49 +++++++
.../cxf/systest/sts/defaultstsprovider/cxf-sts.xml | 39 +++++
services/sts/systests/basic/pom.xml | 2 +-
.../sts/transport/TransportBindingTest.java | 75 ++++++++++
services/sts/systests/pom.xml | 2 +-
services/sts/systests/sts-features/pom.xml | 2 +-
services/sts/systests/sts-itests/pom.xml | 2 +-
services/sts/systests/sts-osgi/pom.xml | 2 +-
services/ws-discovery/pom.xml | 2 +-
services/ws-discovery/ws-discovery-api/pom.xml | 2 +-
.../cxf/ws/discovery/WSDiscoveryClientTest.java | 2 +-
services/ws-discovery/ws-discovery-service/pom.xml | 2 +-
services/wsn/pom.xml | 2 +-
services/wsn/wsn-api/pom.xml | 2 +-
services/wsn/wsn-core/pom.xml | 2 +-
.../java/org/apache/cxf/wsn/AbstractPublisher.java | 2 +-
.../cxf/wsn/jms/JmsTopicExpressionConverter.java | 2 +-
services/wsn/wsn-osgi/pom.xml | 2 +-
services/xkms/pom.xml | 2 +-
services/xkms/xkms-client/pom.xml | 2 +-
services/xkms/xkms-common/pom.xml | 2 +-
services/xkms/xkms-features/pom.xml | 2 +-
services/xkms/xkms-itests/pom.xml | 2 +-
services/xkms/xkms-osgi/pom.xml | 2 +-
services/xkms/xkms-service/pom.xml | 2 +-
services/xkms/xkms-war/pom.xml | 2 +-
services/xkms/xkms-x509-handlers/pom.xml | 2 +-
.../apache/cxf/xkms/x509/handlers/X509Locator.java | 2 +-
services/xkms/xkms-x509-repo-ldap/pom.xml | 2 +-
systests/cdi/base/pom.xml | 2 +-
.../cdi/base/AbstractCdiSingleAppTest.java | 29 ++++
.../apache/cxf/systests/cdi/base/BookStore.java | 11 +-
.../apache/cxf/systests/cdi/base/Injections.java | 157 ++++++++++++++++++++
systests/cdi/cdi-owb/cdi-multiple-apps-owb/pom.xml | 2 +-
systests/cdi/cdi-owb/cdi-no-apps-owb/pom.xml | 2 +-
systests/cdi/cdi-owb/cdi-producers-owb/pom.xml | 2 +-
systests/cdi/cdi-owb/pom.xml | 2 +-
.../cdi/cdi-weld/cdi-multiple-apps-weld/pom.xml | 2 +-
systests/cdi/cdi-weld/cdi-no-apps-weld/pom.xml | 2 +-
systests/cdi/cdi-weld/cdi-producers-weld/pom.xml | 2 +-
systests/cdi/cdi-weld/pom.xml | 2 +-
systests/cdi/pom.xml | 2 +-
systests/container-integration/grizzly/pom.xml | 2 +-
systests/container-integration/pom.xml | 2 +-
systests/container-integration/webapp/pom.xml | 2 +-
systests/databinding/pom.xml | 2 +-
systests/jaxrs/pom.xml | 2 +-
.../org/apache/cxf/systest/jaxrs/BookStore.java | 12 +-
.../java/org/apache/cxf/systest/jaxrs/Books.java | 2 +-
.../systest/jaxrs/JAXRS20ClientServerBookTest.java | 21 +++
.../systest/jaxrs/JAXRSClientServerBookTest.java | 38 ++++-
.../{Books.java => ReplacingOutputStream.java} | 30 ++--
.../AbstractSwagger2ServiceDescriptionTest.java | 25 +++-
.../AbstractOpenApiServiceDescriptionTest.java | 24 ++-
systests/jaxws/pom.xml | 2 +-
systests/kerberos/pom.xml | 50 +------
.../cxf/systest/kerberos/jaxrs/kerberos/Book.java | 60 --------
.../systest/kerberos/jaxrs/kerberos/Chapter.java | 106 --------------
.../jaxrs/kerberos/JAXRSKerberosBookTest.java | 6 +-
.../kerberos/wssec/kerberos/KerberosTokenTest.java | 8 +-
.../kerberos/wssec/spnego/SpnegoTokenTest.java | 8 +-
systests/{kerberos => ldap}/pom.xml | 40 +----
.../cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java | 155 ++++++++++++++++++++
.../org/apache/cxf/systest/ldap/jaxrs/User.java} | 38 +++--
.../cxf/systest/ldap/jaxrs/UserLDAPServer.java | 69 +++++++++
.../cxf/systest/ldap/jaxrs/UserNotFoundFault.java | 16 +-
.../apache/cxf/systest/ldap/jaxrs/UserService.java | 27 ++--
.../cxf/systest/ldap/jaxrs/UserServiceImpl.java | 140 ++++++++++++++++++
.../cxf/systest/ldap/sts}/LDAPClaimsTest.java | 5 +-
systests/ldap/src/test/resources/ldap-jaxrs.xml | 31 ++++
.../src/test/resources/ldap.ldif | 0
.../src/test/resources/ldap.properties | 0
.../{kerberos => ldap}/src/test/resources/ldap.xml | 0
.../src/test/resources/logging.properties | 0
systests/microprofile/client/weld/pom.xml | 2 +-
systests/microprofile/pom.xml | 2 +-
systests/pom.xml | 3 +-
systests/rs-http-sci/pom.xml | 2 +-
systests/rs-security/pom.xml | 2 +-
.../jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java | 14 --
.../jaxrs/security/jose/jwt/JWTPropertiesTest.java | 16 +-
.../systest/jaxrs/security/saml/JAXRSSamlTest.java | 67 +++++++++
.../jaxrs/security/saml/SamlCallbackHandler.java | 15 +-
systests/rs-sse/pom.xml | 2 +-
systests/rs-sse/rs-sse-base/pom.xml | 2 +-
systests/rs-sse/rs-sse-jetty/pom.xml | 2 +-
systests/rs-sse/rs-sse-tomcat/pom.xml | 2 +-
systests/rs-sse/rs-sse-undertow/pom.xml | 2 +-
systests/tracing/pom.xml | 2 +-
systests/transport-jms/pom.xml | 2 +-
systests/transport-undertow/pom.xml | 2 +-
systests/transports-ssl3/pom.xml | 2 +-
systests/transports/pom.xml | 2 +-
systests/uncategorized/pom.xml | 2 +-
.../basicDOCBare/DOCBareClientServerTest.java | 25 ++++
.../apache/cxf/systest/basicDOCBare/Server.java | 25 ++++
.../org/apache/cxf/systest/soap/DoubleItImpl.java} | 35 ++---
.../apache/cxf/systest/soap/XSLTFeatureTest.java} | 60 ++------
.../org/apache/cxf/systest/soap/XSLTServer.java} | 36 ++---
.../systest/type_test/AbstractTypeTestClient4.java | 2 +-
.../cxf/systest/soap/responseTransformation.xsl | 11 ++
.../org/apache/cxf/systest/soap/xslt-server.xml | 57 ++++++++
systests/ws-rm/pom.xml | 2 +-
.../org/apache/cxf/systest/ws/rm/SequenceTest.java | 2 +-
systests/ws-security-examples/pom.xml | 2 +-
systests/ws-security/pom.xml | 2 +-
.../apache/cxf/systest/ws/action/ActionTest.java | 91 ++++++++++++
.../cxf/systest/ws/basicauth/BasicAuthTest.java | 35 +++++
.../apache/cxf/systest/ws/wssc/WSSCUnitTest.java | 54 +++++++
.../cxf/systest/ws/action/DoubleItAction.wsdl | 3 +
.../org/apache/cxf/systest/ws/action/server.xml | 14 ++
systests/ws-specs/pom.xml | 2 +-
systests/ws-transfer/pom.xml | 2 +-
systests/wsdl_maven/codegen/pom.xml | 2 +-
systests/wsdl_maven/java2ws/pom.xml | 2 +-
systests/wsdl_maven/pom.xml | 2 +-
testutils/pom.xml | 2 +-
tools/common/pom.xml | 2 +-
.../apache/cxf/tools/common/ProcessorTestBase.java | 3 +-
tools/corba/pom.xml | 2 +-
.../tools/corba/common/idltypes/IdlStructBase.java | 2 +-
.../corba/processors/wsdl/WSDLToCorbaHelper.java | 6 +-
.../corba/processors/wsdl/WSDLToIDLAction.java | 2 +-
.../cxf/tools/corba/processors/wsdl/WSDLTypes.java | 4 +-
tools/javato/pom.xml | 2 +-
tools/javato/ws/pom.xml | 2 +-
.../generator/wsdl11/DateTypeCustomGenerator.java | 4 +-
tools/pom.xml | 2 +-
tools/validator/pom.xml | 2 +-
.../tools/validator/internal/ValidationResult.java | 2 +-
.../tools/validator/internal/WSDLRefValidator.java | 4 +-
tools/wadlto/jaxrs/pom.xml | 2 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 6 +-
tools/wadlto/pom.xml | 2 +-
tools/wsdlto/core/pom.xml | 2 +-
tools/wsdlto/databinding/jaxb/pom.xml | 2 +-
.../wsdlto/databinding/jaxb/JAXBDataBinding.java | 2 +-
tools/wsdlto/frontend/javascript/pom.xml | 2 +-
tools/wsdlto/frontend/jaxws/pom.xml | 2 +-
.../jaxws/customization/CustomizationParser.java | 2 +-
.../frontend/jaxws/generators/AntGenerator.java | 2 +-
.../frontend/jaxws/generators/ClientGenerator.java | 2 +-
.../frontend/jaxws/generators/SEIGenerator.java | 2 +-
.../frontend/jaxws/generators/ServerGenerator.java | 2 +-
.../jaxws/generators/ServiceGenerator.java | 2 +-
.../processor/internal/ParameterProcessor.java | 4 +-
tools/wsdlto/misc/pom.xml | 2 +-
tools/wsdlto/pom.xml | 2 +-
tools/wsdlto/test/pom.xml | 2 +-
501 files changed, 4139 insertions(+), 1494 deletions(-)
create mode 100644 distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/README.txt
copy distribution/src/main/release/samples/jax_rs/{description_swagger2_osgi => description_openapi_v3_osgi}/pom.xml (81%)
copy distribution/src/main/release/samples/jax_rs/{description_swagger2_web => description_openapi_v3_osgi}/src/main/java/demo/jaxrs/swagger/server/ApiOriginFilter.java (100%)
copy distribution/src/main/release/samples/jax_rs/{description_swagger2_web => description_openapi_v3_osgi}/src/main/java/demo/jaxrs/swagger/server/Item.java (100%)
create mode 100644 distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/java/demo/jaxrs/swagger/server/Sample.java
create mode 100644 distribution/src/main/release/samples/jax_rs/description_openapi_v3_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
create mode 100644 distribution/src/main/release/samples/jax_rs/sse_osgi/README.txt
copy distribution/src/main/release/samples/jax_rs/{websocket_osgi => sse_osgi}/pom.xml (83%)
copy core/src/main/java/org/apache/cxf/transport/AbstractTransportFactory.java => distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/Stats.java (52%)
create mode 100644 distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/java/demo/jaxrs/server/StatsRestServiceImpl.java
create mode 100644 distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/resources/OSGI-INF/blueprint/context.xml
create mode 100644 distribution/src/main/release/samples/jax_rs/sse_osgi/src/main/resources/web-ui/index.html
copy distribution/src/main/release/samples/jax_rs/{sse_tomcat => sse_osgi}/src/main/resources/web-ui/javascripts/highcharts.js (100%)
copy distribution/src/main/release/samples/jax_rs/{sse_tomcat => sse_osgi}/src/main/resources/web-ui/javascripts/jquery-1.9.0.min.js (100%)
create mode 100644 rt/rs/extensions/search/src/main/java/org/apache/cxf/jaxrs/ext/search/ldap/Util.java
create mode 100644 rt/rs/sse/src/main/java/org/apache/cxf/transport/sse/SseDestinationFactory.java
rename systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/SuperBookInterface.java => rt/transports/http/src/main/java/org/apache/cxf/transport/http/ProxyOutputStream.java (73%)
create mode 100644 rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/CustomAuthSupplier.java
create mode 100644 services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/defaultstsprovider/DefaultSTSProviderTest.java
copy systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/SuperBook.java => services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/defaultstsprovider/STSServer.java (52%)
copy services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/{renew => defaultstsprovider}/cxf-client-unit.xml (100%)
create mode 100644 services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts-common.xml
create mode 100644 services/sts/systests/advanced/src/test/resources/org/apache/cxf/systest/sts/defaultstsprovider/cxf-sts.xml
create mode 100644 systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/Injections.java
copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/{Books.java => ReplacingOutputStream.java} (56%)
delete mode 100644 systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/Chapter.java
copy systests/{kerberos => ldap}/pom.xml (84%)
create mode 100644 systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/JAXRSLDAPUserTest.java
copy systests/{kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/SuperBook.java => ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/User.java} (54%)
create mode 100644 systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserLDAPServer.java
copy distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello1/HelloServiceImpl1.java => systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserNotFoundFault.java (73%)
copy distribution/src/main/release/samples/jax_rs/spring_boot/src/main/java/sample/rs/service/hello2/HelloServiceImpl2.java => systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserService.java (63%)
create mode 100644 systests/ldap/src/test/java/org/apache/cxf/systest/ldap/jaxrs/UserServiceImpl.java
rename systests/{kerberos/src/test/java/org/apache/cxf/systest/kerberos/ldap => ldap/src/test/java/org/apache/cxf/systest/ldap/sts}/LDAPClaimsTest.java (99%)
create mode 100644 systests/ldap/src/test/resources/ldap-jaxrs.xml
rename systests/{kerberos => ldap}/src/test/resources/ldap.ldif (100%)
rename systests/{kerberos => ldap}/src/test/resources/ldap.properties (100%)
rename systests/{kerberos => ldap}/src/test/resources/ldap.xml (100%)
copy systests/{ws-security => ldap}/src/test/resources/logging.properties (100%)
copy systests/{kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/SuperBook.java => uncategorized/src/test/java/org/apache/cxf/systest/soap/DoubleItImpl.java} (52%)
copy systests/{ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java => uncategorized/src/test/java/org/apache/cxf/systest/soap/XSLTFeatureTest.java} (50%)
rename systests/{kerberos/src/test/java/org/apache/cxf/systest/kerberos/jaxrs/kerberos/SuperBook.java => uncategorized/src/test/java/org/apache/cxf/systest/soap/XSLTServer.java} (55%)
create mode 100644 systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/responseTransformation.xsl
create mode 100644 systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/xslt-server.xml
--
To stop receiving notification emails like this one, please contact
deki@apache.org.
[cxf] 01/01: Spring 5/ Spring Boot 2
Posted by de...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
deki pushed a commit to branch spring-5-boot-2
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit df5bfe2115379b13015a7ee8f3ad92f3d1cbef8b
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Thu Mar 1 15:21:14 2018 +0100
Spring 5/ Spring Boot 2
---
.../rs/service/SampleRestApplicationTest.java | 2 +-
.../jax_rs/spring_boot_scan/application/pom.xml | 2 +-
.../sample/rs/service/SampleRestApplication.java | 17 -------
.../rs/service/SampleRestApplicationTest.java | 2 +-
.../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +-
.../spring_boot_scan/eureka-registry/pom.xml | 2 +-
.../release/samples/jax_rs/spring_security/pom.xml | 2 +-
.../src/main/webapp/WEB-INF/beans.xml | 2 +-
.../sample/ws/service/SampleWsApplicationTest.java | 2 +-
distribution/src/main/release/samples/pom.xml | 30 ++++++++++++-
.../autoconfigure/CxfAutoConfigurationTests.java | 8 ++--
parent/pom.xml | 52 ++--------------------
pom.xml | 11 +++++
13 files changed, 54 insertions(+), 80 deletions(-)
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index d85654a..a424e9d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -24,7 +24,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.test.context.junit4.SpringRunner;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
index be39ac9..eb15775 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/pom.xml
@@ -46,7 +46,7 @@
<!-- Eureka Service Discovery Client -->
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka</artifactId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring.cloud.eureka.version}</version>
</dependency>
<!-- Actuator Endpoints -->
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
index 1f3ff56..f085e03 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/main/java/sample/rs/service/SampleRestApplication.java
@@ -17,32 +17,15 @@
* under the License.
*/
package sample.rs.service;
-import java.util.Collections;
-
-import com.codahale.metrics.MetricRegistry;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.actuate.endpoint.MetricReaderPublicMetrics;
-import org.springframework.boot.actuate.endpoint.MetricsEndpoint;
-import org.springframework.boot.actuate.metrics.reader.MetricRegistryMetricReader;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
-import org.springframework.context.annotation.Bean;
@SpringBootApplication
@EnableEurekaClient
public class SampleRestApplication {
- @Bean
- public MetricRegistry metricRegistry() {
- return new MetricRegistry();
- }
-
- @Bean
- public MetricsEndpoint metricsEndpoint(final MetricRegistry registry) {
- return new MetricsEndpoint(Collections.singleton(new MetricReaderPublicMetrics(
- new MetricRegistryMetricReader(registry))));
- }
public static void main(String[] args) {
SpringApplication.run(SampleRestApplication.class, args);
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
index d85654a..a424e9d 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/application/src/test/java/sample/rs/service/SampleRestApplicationTest.java
@@ -24,7 +24,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.test.context.junit4.SpringRunner;
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
index 8b5005a..cbc0d89 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml
@@ -42,7 +42,7 @@
<!-- Eureka Service Discovery Client -->
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka</artifactId>
+ <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${spring.cloud.eureka.version}</version>
</dependency>
<!-- Zest Circuit Breaker used by CXF Failover Feature -->
diff --git a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
index d396e27..fdf2c6a 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-eureka-server</artifactId>
+ <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
index 2b9ff93..51aa19c 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
@@ -32,7 +32,7 @@
<properties>
<cxf.version>${project.version}</cxf.version>
<aspectj.version>1.5.4</aspectj.version>
- <spring.security.version>3.2.5.RELEASE</spring.security.version>
+ <spring.security.version>5.0.3.RELEASE</spring.security.version>
</properties>
<build>
<finalName>JAXRSSpringSecurity</finalName>
diff --git a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
index a46433f..67d60f8 100644
--- a/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
+++ b/distribution/src/main/release/samples/jax_rs/spring_security/src/main/webapp/WEB-INF/beans.xml
@@ -17,7 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spr [...]
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring- [...]
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
<jaxrs:server id="bookservice" address="/">
diff --git a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
index 53f7277..b645ddb 100644
--- a/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
+++ b/distribution/src/main/release/samples/jaxws_spring_boot/src/test/java/sample/ws/service/SampleWsApplicationTest.java
@@ -29,7 +29,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.springframework.boot.context.embedded.LocalServerPort;
+import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.rule.OutputCapture;
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 2351b65..170c28c 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -30,8 +30,8 @@
<!-- don't deploy the samples, kind of pointless -->
<maven.deploy.skip>true</maven.deploy.skip>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <spring.boot.version>1.5.11.RELEASE</spring.boot.version>
- <spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
+ <spring.boot.version>2.0.1.RELEASE</spring.boot.version>
+ <spring.cloud.eureka.version>2.0.0.M8</spring.cloud.eureka.version>
</properties>
<dependencies>
<dependency>
@@ -236,4 +236,30 @@
<uniqueVersion>false</uniqueVersion>
</snapshotRepository>
</distributionManagement>
+
+ <repositories>
+ <repository>
+ <id>spring-milestone</id>
+ <url>http://repo.spring.io/milestone/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>spring-milestone</id>
+ <url>http://repo.spring.io/milestone/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
</project>
diff --git a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
index 34d1283..e869a78 100644
--- a/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
+++ b/integration/spring-boot/autoconfigure/src/test/java/org/apache/cxf/spring/boot/autoconfigure/CxfAutoConfigurationTests.java
@@ -73,7 +73,7 @@ public class CxfAutoConfigurationTests {
public void customPathWithTrailingSlash() {
load(CxfAutoConfiguration.class, "cxf.path=/valid/");
assertThat(this.context.getBean(ServletRegistrationBean.class).getUrlMappings(),
- (Matcher<Iterable<? super String>>) hasItem("/valid/*"));
+ (Matcher) hasItem("/valid/*"));
}
@Test
@@ -82,7 +82,7 @@ public class CxfAutoConfigurationTests {
assertThat(this.context.getBeansOfType(ServletRegistrationBean.class).size(),
equalTo(1));
assertThat(this.context.getBean(ServletRegistrationBean.class).getUrlMappings(),
- (Matcher<Iterable<? super String>>) hasItem("/valid/*"));
+ (Matcher) hasItem("/valid/*"));
}
@Test
@@ -100,8 +100,8 @@ public class CxfAutoConfigurationTests {
"spring.cxf.servlet.init.key2=value2");
ServletRegistrationBean registrationBean = this.context
.getBean(ServletRegistrationBean.class);
- assertThat(registrationBean.getInitParameters(), hasEntry("key1", "value1"));
- assertThat(registrationBean.getInitParameters(), hasEntry("key2", "value2"));
+ assertThat(registrationBean.getInitParameters(), (Matcher) hasEntry("key1", "value1"));
+ assertThat(registrationBean.getInitParameters(), (Matcher) hasEntry("key2", "value2"));
}
private void load(Class<?> config, String... environment) {
diff --git a/parent/pom.xml b/parent/pom.xml
index 698c9aa..4f9f9e5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -153,9 +153,9 @@
<cxf.servlet-api-2.5.version>1.2</cxf.servlet-api-2.5.version>
<cxf.slf4j.version>1.7.25</cxf.slf4j.version>
<cxf.specs.jaxws.api.version>1.2</cxf.specs.jaxws.api.version>
- <cxf.spring.version>4.3.15.RELEASE</cxf.spring.version>
- <cxf.spring.boot.version>1.5.11.RELEASE</cxf.spring.boot.version>
- <cxf.spring.security.version>4.2.5.RELEASE</cxf.spring.security.version>
+ <cxf.spring.version>5.0.5.RELEASE</cxf.spring.version>
+ <cxf.spring.boot.version>2.0.1.RELEASE</cxf.spring.boot.version>
+ <cxf.spring.security.version>5.0.4.RELEASE</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>2.3.2.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
@@ -1412,33 +1412,6 @@
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core-tiger</artifactId>
- <version>2.0.8.RELEASE</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
<version>${cxf.spring.security.version}</version>
<exclusions>
@@ -1466,25 +1439,6 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring-dao</artifactId>
- <version>2.0.8</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jdbc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-remoting</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-support</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
<artifactId>${cxf.spring.mock}</artifactId>
<version>${cxf.spring.version}</version>
</dependency>
diff --git a/pom.xml b/pom.xml
index 58e9acf..1641086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,6 +75,17 @@
<enabled>false</enabled>
</releases>
</repository>
+
+ <repository>
+ <id>spring-milestone</id>
+ <url>http://repo.spring.io/milestone/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
--
To stop receiving notification emails like this one, please contact
deki@apache.org.