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 2017/12/14 17:02:42 UTC

[cxf] branch spring-5-boot-2 updated (5d9db97 -> 3d83726)

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 5d9db97  Spring 5/ Spring Boot 2
     add d936b4a  [CXF-7558]set retryInterval default value to 5 sec if not specify it in JMSConfiguration
     add fd55efa  [CXF-7559]enhance the way to handle java version in CipherSuitesTest
     add da2970f  [CXF-7556] Introducing cxf-rt-rs-extension-reactivestreams which uses JAX-RS and reactivestreams API only
     add 1a29d4b  Add required dependencies
     add 0b41912  Adding a JWS test for NONE signature algorithm
     add 796eff3  Make sure the Algorithm sets are unmodifiable
     add 54b037e  Merge branch 'master' of github.com:apache/cxf
     add aa7cbcd  [CXF-7553] Consider the req headers' quality factors in selectVariant
     add 35e567b  [CXF-7565]Verification of feature cxf-ws-security failure
     add cc07d8f  Minor update to RxJava2 invoker
     add 3ebafed  [CXF-7556][CXF-7535] Updating RxJava2 invoker to optionally use the streaming subscriber, updating reactor pom.xml not to use optional deps
     add ffca1ae  Adding some encryption tests for tampering
     add eeae043  CXF-7568 - Support JWE PBES encryption
     add e6586d4  [CXF-7569] PrimitiveTextProvider: support enums
     add 27695e1  [CXF-7569] Support for enums in PrimitiveTextProvider, patch from Alexei Markevich applied
     add 0cfd4e0  [CXF-7561] Checking the Cors annotation on interfaces as well
     add fff17b4  [CXF-7561] Adding missing resources
     add 21645b1  Update TypeVariable check ResourceUtils.java and UnitTest
     add 00a73dd  Merge branch 'fix-resource-utils' of git://github.com/evaristowb/cxf into evaristowb-fix-resource-utils
     add 3d964a1  Merge branch 'evaristowb-fix-resource-utils'
     add b77aef2  Updating WADLGeneratorTest to avoid the element ordering issues
     add c64770f  [CXF-7518] Removing the interceptor which logs in message the 2nd time
     add f8af79f  [CXF-7570] Looking up the default executor service
     add 03a9e8c  Adding the OData demo
     add a55fe18  Removing redundant demo resources
     add fdef57c  update Swagger-UI version
     add 4617ee9  CXF-7544: Support @Context-based injection into proxied CDI beans (#346)
     add fec5672  Updating Kerby
     add c3f49bf  Distinct read faults from write faults
     add 786c420  Merge pull request #345 from joel-shemtov/master
     add 3a22d3e  Revert "When failing to close conduit, distinct read faults from write faults"
     add 6ef6e46  Merge pull request #347 from apache/revert-345-master
     add 115cfcf  When failing to close conduit distinct read faults from write faults, patch from Joel Shemtov applied, This closes #345
     add bbf85d9  update swagger-jaxrs version to 1.5.17
     add 72331b4  [CXF-7572] default port in OAuth discovery doc
     add 87e99cf  Fix some compiler warnings in eclipse
     add 9130f84  Wrap Integer.getInteger in a doPriv block
     add 5cadb1e  update Spring and Spring Boot minor versions
     add 5f35c09  [CXF-7525] Starting with Swagger to OpenApi JSON conversion
     add 7d207e0  [CXF-7525] Continuing with the conversion work
     add c6c66c4  [CXF-7573] Closing InputStream
     add caf52cf  [CXF-7525] More testing
     add 60975c7  CXF-7578 - Set the signature algorithm properly for the TransportBinding IssuedToken case (StAX)
     add b0b503d  [CXF-7527] Completing the initial test of all of petShop v2 methods
     add 2b9c671  [CXF-7525] Changing the package for open api converters, starting with a system test to be completed shortly
     add 2705f4d  [CXF-7525] Completing the system test
     add 1503b42  [CXF-7525] Introducing OpenApiConfiguration to be able to customize the conversion process
     add 8ffecb4  [CXF-7525] Prototyping the code to support components/requestBodies instead of inlining into httpVerb/requestBody, tests to follow
     add 1f9601c  [CXF-7525] Renaming the test to avoid the future confusions
     add 58ead76  [CXF-7525] More renaming
     add 27e3a63  [CXF-7525] Adding the requestBodies conversion test
     add e48f902  [CXF-7585] Close InputStream in AttachmentSerializer when base64 encoding is used
     add 3984faa  Merge pull request #355 from gebhardt/CXF-7585
     add 262b93c  [CXF-7470] Cannot set target for recovered source sequence
     add 9cda849  [CXF-7584] Restricting the proxies (by default) from accidentally supplying empty path template values, an updated patch from Alexey Markevich applied, This closes #354
     add 8089b06  Update dropwizard metrics
     add 57d7010  Upgrade rxjava
     add 6827740  Upgrade undertow version
     add 9a8215c  Update versions of httpcomponents that we use
     add 0877134  Upgrade spring-ldap version
     add 12e767a  Upgrade easymock version
     add 53f738a  Upgrade jetty version
     add df4214a  CXF-7525: Add support for Swagger 2.0 (OpenApi Spec 3.0). Initial integration implementation
     add 564d36e  CXF-7525: Add support for Swagger 2.0 (OpenApi Spec 3.0). Initial integration implementation. Fixing minor issues.
     add eae819e  Fixing all Checkstyle errors for samples
     add 56d7f84  CXF-7588 - SAML audience restriction validation is enabled by default for REST services
     add 97d813c  CXF-7586: Remove @PersistenceContext
     add ef562f6  CXF-7581: SwaggerUIResourceFilter doesn't allow call to service endpoint
     add 7c2fef5  [CXF-7587] use Jetty context path when setting HTTP handler name
     add 804addf  Merge pull request #356 from johnpoth/CXF-7587
     add 5b90271  CXF-7581: SwaggerUIResourceFilter doesn't allow call to service endpoint. Reverting the initial solution (not generic enough)
     add 27057bc  Revert "CXF-7581: SwaggerUIResourceFilter doesn't allow call to service endpoint. Reverting the initial solution (not generic enough)"
     add 2831313  update Swagger-UI version
     add df41960  CXF-7581: SwaggerUIResourceFilter doesn't allow call to service endpoint. Adding more robust test cases
     add d53a7a3  CXF-7581: SwaggerUIResourceFilter doesn't allow call to service, fixing test cases
     add 80783b9  CXF-7581: SwaggerUIResourceFilter doesn't allow call to service, fixing test cases
     new 3d83726  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   (5d9db97)
            \
             N -- N -- N   refs/heads/spring-5-boot-2 (3d83726)

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:
 .../cxf/attachment/AttachmentSerializer.java       |   6 +-
 .../org/apache/cxf/common/util/ReflectionUtil.java |  23 +-
 .../cxf/common/util/SystemPropertyAction.java      |  19 +
 .../cxf/interceptor/MessageSenderInterceptor.java  |   5 +-
 .../org/apache/cxf/interceptor/Messages.properties |   1 +
 .../jax_rs/description_openapi_v3/README.txt       |  43 ++
 .../pom.xml                                        |  12 +-
 .../demo/jaxrs/openapi/server/ApiOriginFilter.java |  45 ++
 .../main/java/demo/jaxrs/openapi/server/Item.java  |  33 +-
 .../java/demo/jaxrs/openapi/server/Metadata.java   |  31 +-
 .../java/demo/jaxrs/openapi/server/Sample.java     | 161 +++++
 .../java/demo/jaxrs/openapi/server/Server.java     |  64 ++
 .../resources/META-INF/cxf/org.apache.cxf.Logger   |   0
 .../src/main/resources/logback.xml                 |   0
 .../samples/jax_rs/description_swagger2/pom.xml    |   2 +-
 .../main/release/samples/jax_rs/odata/README.txt   |  25 +
 .../jax_rs/{description_swagger2 => odata}/pom.xml |  45 +-
 .../main/java/odata/server/DemoEdmProvider.java    | 159 +++++
 .../server/DemoEntityCollectionProcessor.java      | 156 +++++
 .../main/java/odata/server/JaxrsODataService.java  |  56 ++
 .../odata/src/main/java/odata/server/Server.java   |  50 ++
 .../release/samples/jax_rs/spring_boot/pom.xml     |   2 +-
 .../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 |   2 +-
 distribution/src/main/release/samples/pom.xml      |   6 +-
 integration/cdi/pom.xml                            |  11 +
 .../java/org/apache/cxf/cdi/CdiClassUnwrapper.java |  12 +-
 .../autoconfigure/CxfAutoConfigurationTests.java   |   2 +
 .../karaf/features/src/main/resources/features.xml |   1 +
 parent/pom.xml                                     |  37 +-
 .../cxf/ext/logging/LoggingInInterceptor.java      |  15 -
 .../cxf/jaxrs/impl/MediaTypeHeaderProvider.java    |   3 +-
 .../org/apache/cxf/jaxrs/impl/RequestImpl.java     |  99 +--
 .../apache/cxf/jaxrs/model/FilterProviderInfo.java |  13 +-
 .../org/apache/cxf/jaxrs/model/ProviderInfo.java   |  27 +-
 .../org/apache/cxf/jaxrs/model/URITemplate.java    |   3 +-
 .../cxf/jaxrs/provider/PrimitiveTextProvider.java  |   2 +-
 .../apache/cxf/jaxrs/provider/ProviderCache.java   |   3 +-
 .../cxf/jaxrs/provider/ServerProviderFactory.java  |  12 +-
 .../org/apache/cxf/jaxrs/utils/ResourceUtils.java  |   4 +-
 .../org/apache/cxf/jaxrs/impl/RequestImplTest.java |  28 +
 .../jaxrs/provider/PrimitiveTextProviderTest.java  |  21 +
 .../apache/cxf/jaxrs/client/AbstractClient.java    |  18 +-
 .../org/apache/cxf/jaxrs/client/WebClient.java     |  15 +-
 .../apache/cxf/jaxrs/client/spec/ClientImpl.java   |   6 +-
 .../jaxrs/client/JAXRSClientFactoryBeanTest.java   |  34 +
 .../pom.xml                                        |  29 +-
 .../apache/cxf/jaxrs/openapi/OpenApiFeature.java   | 379 ++++++++++
 .../org/apache/cxf/jaxrs/openapi/SwaggerUi.java    |  56 ++
 .../reactor => description-swagger-ui}/pom.xml     |  25 +-
 .../cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java   |  13 +-
 .../cxf/jaxrs/swagger/SwaggerUiResolver.java       |  32 +-
 .../cxf/jaxrs/swagger/SwaggerUiResourceFilter.java |  58 ++
 .../jaxrs/swagger/SwaggerUiResourceLocator.java    |  72 ++
 .../apache/cxf/jaxrs/swagger/SwaggerUiService.java |  95 +++
 .../cxf/jaxrs/swagger/SwaggerUiServiceFilter.java  |  54 ++
 .../apache/cxf/jaxrs/swagger/SwaggerUiSupport.java | 119 ++++
 rt/rs/description-swagger/pom.xml                  |   9 +-
 .../apache/cxf/jaxrs/swagger/JaxRs2Extension.java  |   1 +
 .../apache/cxf/jaxrs/swagger/Swagger2Feature.java  | 175 +----
 .../org/apache/cxf/jaxrs/swagger/SwaggerUi.java    |  53 ++
 .../swagger/openapi/OpenApiConfiguration.java      |  23 +-
 .../openapi/SwaggerToOpenApiConversionFilter.java  |  66 ++
 .../openapi/SwaggerToOpenApiConversionUtils.java   | 391 +++++++++++
 .../SwaggerToOpenApiConversionUtilsTest.java       | 775 +++++++++++++++++++++
 .../cxf/jaxrs/model/wadl/WadlGeneratorTest.java    | 140 ++++
 .../apache/cxf/jaxrs/json/basic/JsonMapObject.java |  24 +
 .../{reactor => reactivestreams}/pom.xml           |  20 +-
 .../server/AbstractSubscriber.java                 |  11 +-
 .../server/JsonStreamingAsyncSubscriber.java       |   9 +-
 .../server/StreamingAsyncSubscriber.java           |   2 +-
 rt/rs/extensions/reactor/pom.xml                   |   1 -
 .../jaxrs/reactor/server/AbstractSubscriber.java   |  86 ---
 .../reactor/server/StreamingAsyncSubscriber.java   | 126 ----
 rt/rs/extensions/rx/pom.xml                        |   7 +
 .../cxf/jaxrs/rx2/server/ReactiveIOInvoker.java    |  22 +-
 rt/rs/pom.xml                                      |   3 +
 .../cxf/rs/security/jose/common/JoseConstants.java |   9 +-
 .../security/jose/common/KeyManagementUtils.java   |   4 +-
 .../cxf/rs/security/jose/jwa/AlgorithmUtils.java   |  88 ++-
 .../apache/cxf/rs/security/jose/jwe/JweUtils.java  |  99 ++-
 .../apache/cxf/rs/security/jose/jwk/JwkUtils.java  |   4 +-
 .../cxf/rs/security/jose/jws/JwsUtilsTest.java     |  16 +
 .../oauth2/grants/code/JPACMTCodeDataProvider.java |  61 +-
 .../services/AuthorizationMetadataService.java     |  37 +-
 .../oauth2/grants/code/JPACMTCodeDataProvider.xml  |   6 +-
 .../oidc/idp/JPAOidcUserSubjectCMTTest.xml         |   5 +
 .../rs/security/saml/AbstractSamlInHandler.java    |   2 +-
 .../cxf/rt/security/saml/utils/SAMLUtils.java      |   5 +-
 .../apache/cxf/rt/security/SecurityConstants.java  |   2 +-
 .../http_jetty/JettyHTTPServerEngine.java          |  15 +-
 .../apache/cxf/transport/jms/JMSConfiguration.java |   2 +-
 .../java/org/apache/cxf/ws/rm/SourceSequence.java  |   4 +-
 rt/ws/security/pom.xml                             |   6 +
 .../cxf/ws/security/wss4j/WSS4JInInterceptor.java  |   2 +-
 .../ws/security/wss4j/WSS4JStaxInInterceptor.java  |   2 +-
 .../StaxTransportBindingHandler.java               |  10 +
 .../base/BookStorePreMatchingRequestFilter.java    |  48 ++
 systests/cdi/cdi-owb/cdi-producers-owb/pom.xml     |   6 +
 .../cxf/systest/jaxrs/cdi/SampleFeature.java       |   1 +
 ...SampleFeature.java => SampleNestedFeature.java} |  10 +-
 .../jaxrs/cdi/unwrapper/ClassUnwrapperTest.java    |  90 +++
 systests/cdi/cdi-weld/cdi-producers-weld/pom.xml   |   6 +
 .../cxf/systest/jaxrs/cdi/SampleFeature.java       |   1 +
 .../systest/jaxrs/cdi/SampleNestedFeature.java}    |  10 +-
 .../jaxrs/cdi/unwrapper/ClassUnwrapperTest.java    |  75 ++
 systests/jaxrs/pom.xml                             |   6 +-
 .../JAXRSClientServerUserResourceAsteriskTest.java | 186 +++++
 .../systest/jaxrs/cors/AnnotatedCorsServer.java    |   3 -
 ...edCorsServer.java => AnnotatedCorsServer2.java} |  13 +-
 .../apache/cxf/systest/jaxrs/cors/CorsSecured.java |  21 +-
 .../cxf/systest/jaxrs/cors/CorsSecuredBase.java    |  29 +-
 .../systest/jaxrs/cors/CrossOriginSimpleTest.java  |  18 +
 .../AbstractSwagger2ServiceDescriptionTest.java    |  27 +
 .../description/BookStoreStylesheetsSwagger2.java  |  29 +-
 ...Swagger2NonAnnotatedServiceDescriptionTest.java |   1 +
 .../SwaggerToOpenApiConversionTest.java            | 262 +++++++
 .../jaxrs/reactive/JAXRSRxJava2FlowableTest.java   |   5 +
 .../jaxrs/reactive/RxJava2FlowableServer.java      |  15 +-
 .../jaxrs/reactive/RxJava2FlowableService.java     |  13 +-
 .../cxf/systest/jaxrs/reactor/FluxService.java     |   4 +-
 .../cxf/systest/jaxrs/reactor/MonoService.java     |   4 +-
 .../test/resources/jaxrs_cors/WEB-INF/beans.xml    |   9 +
 .../resources/jaxrs_swagger2/WEB-INF/beans.xml     |   1 +
 .../security/jose/jwejws/JweJwsAlgorithmTest.java  | 142 ++++
 .../security/jose/jwejws/algorithms-server.xml     |  19 +
 .../https/ciphersuites/CipherSuitesTest.java       |  20 +-
 129 files changed, 4808 insertions(+), 841 deletions(-)
 create mode 100644 distribution/src/main/release/samples/jax_rs/description_openapi_v3/README.txt
 copy distribution/src/main/release/samples/jax_rs/{description_swagger2 => description_openapi_v3}/pom.xml (89%)
 create mode 100644 distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/ApiOriginFilter.java
 rename rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/server/JsonStreamingAsyncSubscriber.java => distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Item.java (61%)
 copy integration/cdi/src/main/java/org/apache/cxf/cdi/CdiClassUnwrapper.java => distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Metadata.java (60%)
 create mode 100644 distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Sample.java
 create mode 100644 distribution/src/main/release/samples/jax_rs/description_openapi_v3/src/main/java/demo/jaxrs/openapi/server/Server.java
 copy {systests/rs-sse/rs-sse-base => distribution/src/main/release/samples/jax_rs/description_openapi_v3}/src/main/resources/META-INF/cxf/org.apache.cxf.Logger (100%)
 copy distribution/src/main/release/samples/jax_rs/{description_swagger2_spring => description_openapi_v3}/src/main/resources/logback.xml (100%)
 create mode 100644 distribution/src/main/release/samples/jax_rs/odata/README.txt
 copy distribution/src/main/release/samples/jax_rs/{description_swagger2 => odata}/pom.xml (73%)
 create mode 100644 distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/DemoEdmProvider.java
 create mode 100644 distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/DemoEntityCollectionProcessor.java
 create mode 100644 distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/JaxrsODataService.java
 create mode 100644 distribution/src/main/release/samples/jax_rs/odata/src/main/java/odata/server/Server.java
 copy rt/rs/{description-swagger => description-openapi-v3}/pom.xml (78%)
 create mode 100644 rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
 create mode 100644 rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/SwaggerUi.java
 copy rt/rs/{extensions/reactor => description-swagger-ui}/pom.xml (66%)
 rename rt/rs/{description-swagger => description-swagger-ui}/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java (87%)
 rename rt/rs/{description-swagger => description-swagger-ui}/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResolver.java (69%)
 create mode 100644 rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResourceFilter.java
 create mode 100644 rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiResourceLocator.java
 create mode 100644 rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiService.java
 create mode 100644 rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiServiceFilter.java
 create mode 100644 rt/rs/description-swagger-ui/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUiSupport.java
 create mode 100644 rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerUi.java
 copy integration/cdi/src/main/java/org/apache/cxf/cdi/CdiClassUnwrapper.java => rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/OpenApiConfiguration.java (61%)
 create mode 100644 rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionFilter.java
 create mode 100644 rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtils.java
 create mode 100644 rt/rs/description-swagger/src/test/java/org/apache/cxf/jaxrs/swagger/openapi/SwaggerToOpenApiConversionUtilsTest.java
 copy rt/rs/extensions/{reactor => reactivestreams}/pom.xml (68%)
 rename rt/rs/extensions/{rx/src/main/java/org/apache/cxf/jaxrs/rx2 => reactivestreams/src/main/java/org/apache/cxf/jaxrs/reactivestreams}/server/AbstractSubscriber.java (90%)
 rename rt/rs/extensions/{reactor/src/main/java/org/apache/cxf/jaxrs/reactor => reactivestreams/src/main/java/org/apache/cxf/jaxrs/reactivestreams}/server/JsonStreamingAsyncSubscriber.java (83%)
 rename rt/rs/extensions/{rx/src/main/java/org/apache/cxf/jaxrs/rx2 => reactivestreams/src/main/java/org/apache/cxf/jaxrs/reactivestreams}/server/StreamingAsyncSubscriber.java (98%)
 delete mode 100644 rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/AbstractSubscriber.java
 delete mode 100644 rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/StreamingAsyncSubscriber.java
 create mode 100644 systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStorePreMatchingRequestFilter.java
 copy systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/{SampleFeature.java => SampleNestedFeature.java} (71%)
 create mode 100644 systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/unwrapper/ClassUnwrapperTest.java
 copy systests/cdi/{cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/SampleFeature.java => cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/SampleNestedFeature.java} (71%)
 create mode 100644 systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/unwrapper/ClassUnwrapperTest.java
 create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java
 copy systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/{AnnotatedCorsServer.java => AnnotatedCorsServer2.java} (89%)
 copy integration/cdi/src/main/java/org/apache/cxf/cdi/CdiClassUnwrapper.java => systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CorsSecured.java (60%)
 copy integration/cdi/src/main/java/org/apache/cxf/cdi/CdiClassUnwrapper.java => systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CorsSecuredBase.java (61%)
 copy integration/cdi/src/main/java/org/apache/cxf/cdi/CdiClassUnwrapper.java => systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/BookStoreStylesheetsSwagger2.java (60%)
 create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/description/SwaggerToOpenApiConversionTest.java

-- 
To stop receiving notification emails like this one, please contact
['"commits@cxf.apache.org" <co...@cxf.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 3d83726b8f085c57b473ec7c68c5bb9d1ded4ac1
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Thu Dec 14 18:00:08 2017 +0100

    Spring 5/ Spring Boot 2
    
    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   |  4 +--
 parent/pom.xml                                     |  6 ++---
 pom.xml                                            | 11 ++++++++
 13 files changed, 52 insertions(+), 32 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 815638f..3e990b1 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 acfb9af..dbefc3a 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 0bb2977..b6dd78e 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 255cb3e..fadc376 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.0.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 07ad837..76233ba 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.9.RELEASE</spring.boot.version>
-        <spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
+        <spring.boot.version>2.0.0.M7</spring.boot.version>
+        <spring.cloud.eureka.version>2.0.0.M5</spring.cloud.eureka.version>
     </properties>
     <dependencies>
         <dependency>
@@ -234,4 +234,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 e5d85b4..1f4dfa6 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
@@ -74,7 +74,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
@@ -83,7 +83,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
diff --git a/parent/pom.xml b/parent/pom.xml
index e27c8a5..ad5524a 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.13.RELEASE</cxf.spring.version>
-        <cxf.spring.boot.version>1.5.9.RELEASE</cxf.spring.boot.version>
-        <cxf.spring.security.version>4.2.3.RELEASE</cxf.spring.security.version>
+        <cxf.spring.version>5.0.2.RELEASE</cxf.spring.version>
+        <cxf.spring.boot.version>2.0.0.M7</cxf.spring.boot.version>
+        <cxf.spring.security.version>5.0.0.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>
diff --git a/pom.xml b/pom.xml
index 291ba6f..4f71e56 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
"commits@cxf.apache.org" <co...@cxf.apache.org>.