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/11/12 19:29:52 UTC
[cxf] branch spring-5-boot-2 updated (b1b670a -> 5d9db97)
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 b1b670a Spring 5/ Spring Boot 2
add de14153 [CXF-7530]AttachmentSerializer miss a CRLF before the multipart-body per spec rfc2046
add 1cee603 [CXF-7531]add async-supported init parameter configuration for the cxf-osgi-transport-servlet
add f6f5979 CXF-7510: Minor fixes related to SSE/CDI integration extension
add 71fd0ac Fixing some issues thrown up by ErrorProne
add 6c746e0 Updating surefire
add 8c79c23 Add a getEmptyDocument method that returns a Document that can be uses as an Element factory. Avoids the synchronized System.getProperty calls in the Document constructor if that is not needed.
add ced2110 Fix randomly failing test
add 51dd24f More work on using getEmptyDocument instead of createDocument
add 1d66475 [CXF-7532]REST on JMS transport can't handle the request message with text messageType
add 4ad86eb Renaming wadltojava 'authorization' option to 'authentication' as agreed on the users list
add 52dcd0c [CXF-7533] Fix non-functional 'setBus' method, patch from Manuel Siggen applied, This closes #322
add bad68af Updating Java2WADLMojo to try to load the custom WADLgenerator if requested
add cc34899 Removing unused code in JAXBUtils, spotted by Colm
add fc1c4e3 Update karaf version
add 156be37 More use of getEmptyDocument
add fd53ffe Check @Priority annotations on providers when sorting
add b9df4f5 Ensure ContextResolvers are sorted properly by @Priority
add 4fa41c2 Merge pull request #321 from andymc12/providerPriority
add bdeae68 Forgot to re-comment out my debug code
add 49ba406 update Spring and Spring Boot minor versions
add 2201d34 [CXF-7532]some clean up
add f5fdf09 Adding spring properties example for WS-Security
add 3b4ed05 Avoid overriding a custom host value in Swagger2Feature
add a44f821 BouncyCastle upgrade
add 76905b0 CXF-7536 - Add a STRTransform when signing a SAML Token via a SignedElements policy
add c757b6d [CXF-7517]add jaxws/jaxb api dependency into codegen-plugin so that we don't need specify add-moudles into MAVEN_OPTS with java9
add d529ecd [CXF-7517]detect jvm version and specify necessary jvm args for java9 so that users needn't specify it in plugin configuration
add 1fd95a5 Handle @Priority on ExceptionMappers
add f7cec54 Merge pull request #323 from andymc12/exceptionMapperPriority
add 1260b93 [CXF-7537] Use doPriv when calling methods needing Java 2 permissions
add 529a403 Merge pull request #325 from andymc12/doPrivs
add 2c50132 Reporting a Jwe exception cause as well
add 0f1e4de [CXF-7539] Provide Boolean wrapper object for == comparation
add 031502b Merge pull request #327 from amarkevich/master
add ba1fa12 Preventing a possible NPE in JweOutputStream
add 0dc1c54 [CXF-7541] Blocking ISE
add b412aa5 Adding a Spring View-aware MessageBodyWriter, patch from Adrian Gonzalez applied, This closes #328
add 294e7aa Add doPrivs
add bd644f3 Use ReflectionUtil rather than a new doPriv inner class
add 4a617b4 [CXF-6454] Handle InvalidClientIdException and allow to set retryInterval
add a42a9f5 [CXF-7534, CXF-7542] Fix problems doing field injection on fields in superclasses
add 336657c CXF-7501: Cannot inject field in ContainerRequestFilter (and generally, into any providers registered using FeatureContext) (#329)
add 9850612 CXF-7501: Cannot inject field in ContainerRequestFilter (and generally, into any providers registered using FeatureContext) (#330)
add 7662c37 Fixing sse_spring sample project dependencies
add c5816d4 CXF-7501: Cannot inject field in ContainerRequestFilter (and generally, into any providers registered using FeatureContext). Adding a note about possible changes of the ServerConfigurableFactory
add 366106d Removing the unused test code
add fd21997 Add -x to cherrypick
add 9c16d1d [CXF-7545] Checking for TypeVariable, patch from Evaristo Wychoski Benfatti applied, This closes #332
add b2ef3a6 Update 3.2.1 release notes
add a61e821 Rerun 3.2.1 release notes
add 861a4ee Use non-snapshot for release
add dc2d22e [maven-release-plugin] prepare release cxf-3.2.1
add 10110bc [maven-release-plugin] prepare for next development iteration
add 6ceb2e9 Trying to share most of the code between RequestDispatcher and SpringViewResolver providers
add 2b5c45e [CXF-7517] set xjc-utils version back to 3.2.1-SNAPSHOT (JDK9 fixes)
add 9235cc5 [CXF-7549] Feature from feature registration support, initial tests provided by Carlos Sierra
add 0161dd8 CXF-7551 - Policy Based WSS4J Stax Interceptors may not be correctly initialized
add 5d7a27d CXF-7550 - StaxActionInInterceptor can't function completely with WSS4JStaxInInterceptor
add 68ed35f [CXF-7389] Logging 404 as FINE in other places
add 0744884 Flip one of the JMS demos over to use ActiveMQ Artemis to start testing with it
add 89a588e Fix checkstyle
add 56e26f6 [CXF-7554]remove org.sonatype.sisu:sisu-guava dependency from java2swagger-plugin
add f634fb8 [CXF-7535] Adding client & server support for Project Reactor (#331)
add f09bff9 Merge branch 'master' of github.com:apache/cxf
add f489ba9 [CXF-7545] Making sure a custom method id always gets the priority, modified patch is applied on behalf of Evaristo Wychoski Benfatti
add adc783c [CXF-7556] Removing RxJava2 specific import in Rx2Java abstract subscriber code
add dacfa884 Fix probable bug
add dfabb48 Merge pull request #336 from art-bjss/auth-header-negotiate-bug
add d3b0ece This closes #333
add 779b131 [CXF-7555] Moving SpringViewResolverProvider to .springmvc. subpackage
add 5504cad Adding SAML "action" system test
add 03c608d Merge branch 'master' of https://gitbox.apache.org/repos/asf/cxf
add f7f2698 Fix operation style
add 86ed6cd Add soap12 binding schema so soap12 wsdl validation can occur
add 1a11cec Fix checkstyle
add 14d6259 Fix compile failure
add 9e0f7ea [CXF-7527] getMatchedURIs to avoid duplicate URIs
add 963e900 [CXF-7527] Update systests to avoid checking leading slashes
add c18bcfa PMD fix
new 5d9db97 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 (b1b670a)
\
N -- N -- N refs/heads/spring-5-boot-2 (5d9db97)
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:
.gitignore | 1 +
bin/DoMerges.java | 2 +-
core/pom.xml | 2 +-
.../cxf/attachment/AttachmentSerializer.java | 1 +
.../cxf/common/injection/ResourceInjector.java | 6 +-
.../apache/cxf/configuration/jsse/SSLUtils.java | 2 +-
.../main/java/org/apache/cxf/helpers/DOMUtils.java | 38 +++
.../java/org/apache/cxf/interceptor/Fault.java | 2 +-
.../cxf/interceptor/OutgoingChainInterceptor.java | 2 +-
.../java/org/apache/cxf/io/CachedOutputStream.java | 2 +-
.../java/org/apache/cxf/io/ReaderInputStream.java | 296 +++++++++++++++++++
.../java/org/apache/cxf/staxutils/StaxUtils.java | 6 +-
.../cxf/workqueue/AutomaticWorkQueueImpl.java | 21 +-
.../main/resources/schemas/wsdl/soap12-binding.xsd | 143 +++++++++
.../apache/cxf/bus/extension/ExtensionTest.java | 4 +
.../cxf/common/security/SimplePrincipalTest.java | 2 +
.../org/apache/cxf/common/util/UrlUtilsTest.java | 15 +-
.../configuration/spring/ConfigurerImplTest.java | 6 +-
.../cxf/workqueue/AutomaticWorkQueueTest.java | 33 ++-
distribution/javadoc/pom.xml | 2 +-
distribution/manifest/pom.xml | 2 +-
distribution/pom.xml | 2 +-
distribution/src/main/release/release_notes.txt | 75 ++++-
.../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 +-
.../main/release/samples/java_first_jaxws/pom.xml | 6 +-
.../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_swagger2/pom.xml | 8 +-
.../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/search/pom.xml | 14 +-
.../release/samples/jax_rs/spring_boot/pom.xml | 2 +-
.../jax_rs/spring_boot_scan/application/pom.xml | 2 +-
.../sample/rs/service/SampleRestApplication.java | 17 --
.../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 | 10 +-
.../src/main/webapp/WEB-INF/beans.xml | 2 +-
.../main/release/samples/jax_rs/sse_cdi/pom.xml | 8 +-
.../main/release/samples/jax_rs/sse_client/pom.xml | 8 +-
.../main/release/samples/jax_rs/sse_spring/pom.xml | 24 +-
.../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 | 21 +-
.../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/README.txt | 2 +-
.../src/main/release/samples/jms_pubsub/pom.xml | 14 +-
.../jms_pubsub/src/main/config/jms_greeter.wsdl | 2 +-
.../demo/jms_greeter/broker/EmbeddedBroker.java | 42 ++-
.../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 | 6 +-
.../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 +-
.../cxf/cdi/CdiServerConfigurableFactory.java | 95 ++++++
.../apache/cxf/cdi/JAXRSCdiResourceExtension.java | 32 +-
.../cxf/cdi/event/DisposableCreationalContext.java | 21 +-
integration/jca/pom.xml | 2 +-
.../ResourceAdapterInternalExceptionTest.java | 6 +-
.../cxf/jca/cxf/ManagedConnectionImplTest.java | 1 +
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 | 35 ++-
.../cxf/maven_plugin/AbstractCodegenMoho.java | 15 +
maven-plugins/corba/pom.xml | 32 +-
maven-plugins/java2swagger-plugin/pom.xml | 10 +-
maven-plugins/java2wadl-plugin/pom.xml | 4 +-
.../cxf/maven_plugin/javatowadl/Java2WADLMojo.java | 19 +-
maven-plugins/java2ws-plugin/pom.xml | 2 +-
.../org/apache/cxf/maven_plugin/Java2WSMojo.java | 15 +
maven-plugins/pom.xml | 2 +-
maven-plugins/wadl2java-plugin/pom.xml | 2 +-
.../wadlto/AbstractCodeGeneratorMojo.java | 13 +-
.../cxf/maven_plugin/wadlto/WADL2JavaMojo.java | 15 +
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 | 56 +++-
osgi/karaf/pom.xml | 2 +-
osgi/pom.xml | 2 +-
osgi/repository/pom.xml | 2 +-
parent/pom.xml | 59 +++-
pom.xml | 9 +-
rt/bindings/coloc/pom.xml | 2 +-
rt/bindings/corba/pom.xml | 2 +-
.../CorbaStreamFaultInInterceptor.java | 3 +-
.../apache/cxf/binding/corba/CorbaBindingTest.java | 2 +
.../cxf/binding/corba/CorbaServerConduitTest.java | 1 +
rt/bindings/pom.xml | 2 +-
rt/bindings/soap/pom.xml | 2 +-
.../soap/interceptor/AbstractSoapInterceptor.java | 2 +-
rt/bindings/xml/pom.xml | 2 +-
rt/databinding/aegis/pom.xml | 2 +-
.../cxf/aegis/type/mtom/AbstractXOPType.java | 2 +-
.../org/apache/cxf/aegis/AbstractAegisTest.java | 3 +-
rt/databinding/jaxb/pom.xml | 2 +-
.../org/apache/cxf/jaxb/JAXBEncoderDecoder.java | 18 +-
.../apache/cxf/jaxb/JAXBEncoderDecoderTest.java | 8 +-
rt/databinding/pom.xml | 2 +-
rt/features/clustering/pom.xml | 2 +-
rt/features/logging/pom.xml | 2 +-
rt/features/metrics/pom.xml | 2 +-
rt/features/pom.xml | 2 +-
rt/features/throttling/pom.xml | 2 +-
rt/frontend/jaxrs/pom.xml | 8 +-
.../apache/cxf/jaxrs/impl/ConfigurableImpl.java | 44 ++-
.../apache/cxf/jaxrs/impl/ConfigurationImpl.java | 6 +-
.../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 7 +
.../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 18 +-
.../jaxrs/impl/WebApplicationExceptionMapper.java | 11 +-
.../cxf/jaxrs/interceptor/JAXRSInInterceptor.java | 4 +-
.../apache/cxf/jaxrs/model/BeanResourceInfo.java | 24 +-
.../provider/AbstractConfigurableProvider.java | 2 +-
.../provider/AbstractResponseViewProvider.java | 322 +++++++++++++++++++++
.../apache/cxf/jaxrs/provider/ProviderFactory.java | 40 ++-
.../jaxrs/provider/RequestDispatcherProvider.java | 262 ++---------------
.../jaxrs/provider/ServerConfigurableFactory.java | 45 +++
.../cxf/jaxrs/provider/ServerProviderFactory.java | 24 +-
.../apache/cxf/jaxrs/springmvc/Messages.properties | 21 ++
.../springmvc/SpringViewResolverProvider.java | 136 +++++++++
.../org/apache/cxf/jaxrs/utils/InjectionUtils.java | 4 +
.../java/org/apache/cxf/jaxrs/utils/JAXBUtils.java | 3 -
.../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 10 +-
.../org/apache/cxf/jaxrs/utils/ResourceUtils.java | 14 +-
.../test/java/org/apache/cxf/jaxrs/Customer.java | 3 +-
.../org/apache/cxf/jaxrs/impl/UriInfoImplTest.java | 242 +++++++++++++---
.../provider/AbstractConfigurableProviderTest.java | 27 +-
.../cxf/jaxrs/provider/ProviderFactoryTest.java | 194 +++++++++++++
.../springmvc/SpringViewResolverProviderTest.java | 297 +++++++++++++++++++
.../org/apache/cxf/jaxrs/utils/JAXRSUtilsTest.java | 8 +-
rt/frontend/jaxws/pom.xml | 2 +-
.../jaxws/handler/logical/LogicalMessageImpl.java | 9 +-
.../org/apache/cxf/jaxws/spi/ProviderImpl.java | 8 +-
.../cxf/jaxws/support/JaxWsServiceFactoryBean.java | 3 +-
.../handler/LogicalHandlerInterceptorTest.java | 2 +
rt/frontend/js/pom.xml | 2 +-
rt/frontend/pom.xml | 2 +-
rt/frontend/simple/pom.xml | 2 +-
rt/javascript/javascript-rt/pom.xml | 2 +-
rt/javascript/javascript-tests/pom.xml | 2 +-
.../apache/cxf/javascript/fortest/TestBean1.java | 2 +-
.../apache/cxf/javascript/fortest/TestBean3.java | 2 +-
rt/javascript/pom.xml | 2 +-
rt/management/pom.xml | 2 +-
.../ResponseTimeMessageInInterceptorTest.java | 1 +
.../jmx/export/ModelMBeanAssemblerTest.java | 4 +-
rt/pom.xml | 2 +-
rt/rs/client/pom.xml | 2 +-
rt/rs/description-swagger/pom.xml | 2 +-
.../apache/cxf/jaxrs/swagger/Swagger2Feature.java | 4 +-
rt/rs/description/pom.xml | 2 +-
.../apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 4 +-
.../cxf/jaxrs/model/wadl/WadlGeneratorTest.java | 2 +-
rt/rs/extensions/json-basic/pom.xml | 2 +-
rt/rs/extensions/providers/pom.xml | 2 +-
.../jaxrs/provider/atom/AtomFeedProviderTest.java | 1 +
.../cxf/jaxrs/provider/json/JSONProviderTest.java | 2 +
.../{security/cors => extensions/reactor}/pom.xml | 25 +-
.../cxf/jaxrs/reactor/client/ReactorInvoker.java | 120 ++++++++
.../jaxrs/reactor/client/ReactorInvokerImpl.java | 251 ++++++++++++++++
.../reactor/client/ReactorInvokerProvider.java | 23 +-
.../cxf/jaxrs/reactor/client/ReactorUtils.java | 47 +++
.../jaxrs/reactor/server/AbstractSubscriber.java} | 47 ++-
.../server/JsonStreamingAsyncSubscriber.java | 28 +-
.../cxf/jaxrs/reactor/server/ReactorInvoker.java | 56 ++++
.../reactor}/server/StreamingAsyncSubscriber.java | 22 +-
rt/rs/extensions/rx/pom.xml | 3 +-
...syncSubscriber.java => AbstractSubscriber.java} | 43 ++-
.../jaxrs/rx2/server/StreamingAsyncSubscriber.java | 9 +-
rt/rs/extensions/search/pom.xml | 2 +-
.../ext/search/jpa/JPACriteriaQueryVisitor.java | 2 +-
.../search/tika/TikaLuceneContentExtractor.java | 2 +-
.../search/jpa/JPATypedQueryVisitorFiqlTest.java | 3 +-
.../search/jpa/JPATypedQueryVisitorODataTest.java | 3 +-
rt/rs/http-sci/pom.xml | 2 +-
rt/rs/pom.xml | 3 +-
rt/rs/security/cors/pom.xml | 2 +-
rt/rs/security/jose-parent/jose-jaxrs/pom.xml | 2 +-
rt/rs/security/jose-parent/jose/pom.xml | 2 +-
.../security/jose/jwe/AbstractJweEncryption.java | 2 +-
.../cxf/rs/security/jose/jwe/JweOutputStream.java | 8 +-
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 +-
.../oauth2/grants/saml/Saml2BearerGrant.java | 2 +-
rt/rs/security/oauth-parent/oauth2/pom.xml | 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 +-
rt/rs/sse/pom.xml | 2 +-
rt/security-saml/pom.xml | 2 +-
.../saml/interceptor/WSS4JBasicAuthValidator.java | 2 +-
rt/security/pom.xml | 2 +-
rt/transports/http-hc/pom.xml | 2 +-
rt/transports/http-jetty/pom.xml | 2 +-
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 +-
.../transport/http/AbstractHTTPDestination.java | 12 +-
.../cxf/transport/http/auth/HttpAuthHeader.java | 2 +-
.../cxf/transport/http/osgi/ServletExporter.java | 4 +-
.../transport/http/HTTPConduitURLEasyMockTest.java | 2 +
rt/transports/jms/pom.xml | 2 +-
.../apache/cxf/transport/jms/JMSConfigFactory.java | 2 +
.../apache/cxf/transport/jms/JMSConfiguration.java | 9 +
.../apache/cxf/transport/jms/JMSDestination.java | 12 +-
.../apache/cxf/transport/jms/uri/JMSEndpoint.java | 11 +
.../jms/util/PollingMessageListenerContainer.java | 5 +
.../cxf/transport/jms/AbstractJMSTester.java | 6 +-
.../cxf/transport/jms/JMSDestinationTest.java | 26 ++
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 +-
.../apache/cxf/ws/addressing/soap/MAPCodec.java | 2 +-
.../cxf/ws/addressing/soap/MAPCodecTest.java | 1 +
rt/ws/eventing/pom.xml | 2 +-
rt/ws/mex/pom.xml | 2 +-
.../java/org/apache/cxf/ws/mex/MEXEndpoint.java | 2 +-
rt/ws/policy/pom.xml | 2 +-
.../cxf/ws/policy/PolicyAnnotationListener.java | 2 +-
.../cxf/ws/policy/ServiceModelPolicyUpdater.java | 2 +-
rt/ws/pom.xml | 2 +-
rt/ws/rm/pom.xml | 2 +-
.../apache/cxf/ws/rm/EncoderDecoder10AImpl.java | 6 +-
.../org/apache/cxf/ws/rm/EncoderDecoder10Impl.java | 6 +-
.../org/apache/cxf/ws/rm/EncoderDecoder11Impl.java | 6 +-
.../ws/rm/persistence/PersistenceUtilsTest.java | 2 +-
rt/ws/security/pom.xml | 2 +-
.../cxf/ws/security/kerberos/KerberosClient.java | 2 +-
.../cxf/ws/security/trust/STSLoginModule.java | 2 +-
.../ws/security/trust/STSStaxTokenValidator.java | 4 +-
.../trust/claims/RoleClaimsCallbackHandler.java | 2 +-
.../delegation/WSSUsernameCallbackHandler.java | 2 +-
.../security/wss4j/AbstractTokenInterceptor.java | 2 +-
.../ws/security/wss4j/WSS4JStaxInInterceptor.java | 10 +-
.../ws/security/wss4j/WSS4JStaxOutInterceptor.java | 3 +
.../policyhandlers/AbstractBindingBuilder.java | 54 +++-
rt/ws/transfer/pom.xml | 2 +-
.../transfer/dialect/fragment/FragmentDialect.java | 2 +-
.../dialect/fragment/faults/FragmentFault.java | 2 +-
.../ws/transfer/manager/MemoryResourceManager.java | 2 +-
.../ws/transfer/shared/faults/WSTransferFault.java | 2 +-
.../transfer/integration/FragmentPutAddTest.java | 10 +-
.../integration/FragmentPutInsertAfterTest.java | 10 +-
.../integration/FragmentPutInsertBeforeTest.java | 10 +-
.../integration/FragmentPutReplaceTest.java | 24 +-
.../transfer/integration/ResourceFactoryTest.java | 2 +-
.../transfer/unit/MemoryResourceManagerTest.java | 6 +-
rt/wsdl/pom.xml | 2 +-
.../org/apache/cxf/wsdl11/ServiceWSDLBuilder.java | 8 +-
services/pom.xml | 2 +-
services/sts/pom.xml | 2 +-
services/sts/sts-core/pom.xml | 2 +-
.../cxf/sts/operation/AbstractOperation.java | 2 +-
.../cxf/sts/operation/DefaultTokenWrapper.java | 2 +-
.../cxf/sts/rest/RESTSecurityTokenServiceImpl.java | 2 +-
.../apache/cxf/sts/token/provider/SCTProvider.java | 2 +-
.../cxf/sts/token/provider/TokenProviderUtils.java | 8 +-
.../token/validator/UsernameTokenValidator.java | 2 +-
.../sts/token/validator/X509TokenValidator.java | 4 +-
.../sts/claims/mapper/JexlIssueSamlClaimsTest.java | 2 +-
.../cxf/sts/operation/CancelSCTUnitTest.java | 3 -
.../cxf/sts/operation/DummyTokenProvider.java | 2 +-
.../cxf/sts/operation/IssueEncryptedUnitTest.java | 2 +-
.../cxf/sts/operation/IssueJWTClaimsUnitTest.java | 15 +-
.../cxf/sts/operation/IssueJWTRealmUnitTest.java | 2 +-
.../apache/cxf/sts/operation/IssueJWTUnitTest.java | 2 +-
.../cxf/sts/operation/IssueOnbehalfofUnitTest.java | 2 +-
.../apache/cxf/sts/operation/IssueSCTUnitTest.java | 4 +-
.../cxf/sts/operation/IssueSamlClaimsUnitTest.java | 6 +-
.../cxf/sts/operation/IssueSamlRealmUnitTest.java | 2 +-
.../cxf/sts/operation/IssueSamlUnitTest.java | 10 +-
.../apache/cxf/sts/operation/IssueUnitTest.java | 2 +-
.../operation/ValidateJWTTransformationTest.java | 4 +-
.../cxf/sts/operation/ValidateJWTUnitTest.java | 4 +-
.../cxf/sts/operation/ValidateSCTUnitTest.java | 3 -
.../ValidateTokenTransformationUnitTest.java | 4 +-
.../cxf/sts/token/canceller/SCTCancellerTest.java | 2 +-
.../sts/token/provider/SAMLProviderActAsTest.java | 7 +-
.../token/provider/SAMLProviderOnBehalfOfTest.java | 7 +-
.../validator/JWTTokenValidatorRealmTest.java | 2 +-
.../sts/token/validator/JWTTokenValidatorTest.java | 2 +-
services/sts/systests/advanced/pom.xml | 2 +-
.../cxf/systest/sts/caching/ServerCachingTest.java | 2 +-
.../systest/sts/claims/ClaimsCallbackHandler.java | 2 +-
.../sts/deployment/CustomBSTTokenProvider.java | 2 +-
.../CustomUsernameTokenProvider.java | 2 +-
services/sts/systests/basic/pom.xml | 2 +-
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 +-
services/ws-discovery/ws-discovery-service/pom.xml | 2 +-
services/wsn/pom.xml | 2 +-
services/wsn/wsn-api/pom.xml | 2 +-
.../java/org/apache/cxf/wsn/util/WSNHelper.java | 2 +-
services/wsn/wsn-core/pom.xml | 2 +-
.../org/apache/cxf/wsn/jms/JmsSubscription.java | 6 +-
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/utils/X509UtilsTest.java | 2 +
services/xkms/xkms-x509-repo-ldap/pom.xml | 2 +-
systests/cdi/base/pom.xml | 2 +-
.../systests/cdi/base/BookStoreAuthenticator.java} | 22 +-
.../systests/cdi/base/BookStoreRequestFilter.java | 47 +++
.../systests/cdi/base/BookStoreResponseFilter.java | 44 +++
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 +-
.../cxf/systest/jaxrs/cdi/SampleFeature.java | 4 +
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 | 45 +--
.../cxf/systest/jaxrs/cdi/SampleFeature.java | 4 +
systests/cdi/cdi-weld/pom.xml | 44 ++-
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 | 13 +-
.../systest/jaxrs/JAXRSClientServerBookTest.java | 16 +-
.../cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java | 6 +-
.../apache/cxf/systest/jaxrs/jms/JAXRSJmsTest.java | 90 ++++++
.../jaxrs/reactive/RxJava2FlowableService.java | 6 +-
.../cxf/systest/jaxrs/reactor/FluxReactorTest.java | 81 ++++++
.../cxf/systest/jaxrs/reactor/FluxService.java | 50 ++++
.../cxf/systest/jaxrs/reactor/HelloWorldBean.java | 33 ++-
.../cxf/systest/jaxrs/reactor/MonoReactorTest.java | 96 ++++++
.../cxf/systest/jaxrs/reactor/MonoService.java | 66 +++++
.../cxf/systest/jaxrs/reactor/ReactorServer.java | 72 +++++
systests/jaxws/pom.xml | 2 +-
systests/kerberos/pom.xml | 2 +-
systests/pom.xml | 2 +-
systests/rs-http-sci/pom.xml | 44 ++-
systests/rs-security/pom.xml | 2 +-
.../oauth2/grants/CallbackHandlerLoginHandler.java | 2 +-
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 +-
.../websocket/WebSocketTestClient.java | 3 +-
systests/transports-ssl3/pom.xml | 2 +-
systests/transports/pom.xml | 2 +-
systests/uncategorized/pom.xml | 2 +-
.../systest/type_test/AbstractTypeTestClient.java | 16 +-
systests/ws-rm/pom.xml | 2 +-
systests/ws-security-examples/pom.xml | 2 +-
systests/ws-security/pom.xml | 2 +-
.../apache/cxf/systest/ws/action/ActionTest.java | 22 ++
.../org/apache/cxf/systest/ws/fault/FaultTest.java | 74 +++++
.../cxf/systest/ws/action/DoubleItAction.wsdl | 3 +
.../org/apache/cxf/systest/ws/action/client.xml | 22 ++
.../org/apache/cxf/systest/ws/action/server.xml | 12 +
.../apache/cxf/systest/ws/fault/DoubleItFault.wsdl | 6 +
.../org/apache/cxf/systest/ws/fault/client.xml | 52 ++++
.../org/apache/cxf/systest/ws/fault/server.xml | 50 ++++
.../org/apache/cxf/systest/ws/x509/client.xml | 5 +-
systests/ws-specs/pom.xml | 2 +-
.../cxf/systest/ws/addressing/HeaderVerifier.java | 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 +-
testutils/src/main/resources/wsdl/swa-mime.wsdl | 8 +-
tools/common/pom.xml | 2 +-
.../java/org/apache/cxf/tools/util/JAXBUtils.java | 2 +-
tools/corba/pom.xml | 2 +-
.../tools/corba/common/WSDLCorbaWriterImpl.java | 2 +-
tools/javato/pom.xml | 2 +-
tools/javato/ws/pom.xml | 2 +-
.../apache/cxf/tools/fortest/addr/WSAImpl2.java | 2 +-
tools/pom.xml | 2 +-
tools/validator/pom.xml | 2 +-
tools/wadlto/jaxrs/pom.xml | 2 +-
.../apache/cxf/tools/wadlto/WadlToolConstants.java | 2 +-
.../cxf/tools/wadlto/jaxrs/JAXRSContainer.java | 12 +-
.../cxf/tools/wadlto/jaxrs/SourceGenerator.java | 24 +-
.../cxf/tools/wadlto/jaxrs/jaxrs-toolspec.xml | 8 +-
tools/wadlto/pom.xml | 2 +-
tools/wsdlto/core/pom.xml | 2 +-
tools/wsdlto/databinding/jaxb/pom.xml | 2 +-
tools/wsdlto/frontend/javascript/pom.xml | 2 +-
tools/wsdlto/frontend/jaxws/pom.xml | 2 +-
tools/wsdlto/misc/pom.xml | 2 +-
tools/wsdlto/pom.xml | 2 +-
tools/wsdlto/test/pom.xml | 2 +-
.../apache/cxf/tools/wsdlto/jaxws/CodeGenTest.java | 4 +
.../cxf/tools/wsdlto/jaxws/JAXWSContainerTest.java | 1 +
482 files changed, 4859 insertions(+), 1428 deletions(-)
create mode 100644 core/src/main/java/org/apache/cxf/io/ReaderInputStream.java
create mode 100644 core/src/main/resources/schemas/wsdl/soap12-binding.xsd
create mode 100644 integration/cdi/src/main/java/org/apache/cxf/cdi/CdiServerConfigurableFactory.java
copy systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/SampleFeature.java => integration/cdi/src/main/java/org/apache/cxf/cdi/event/DisposableCreationalContext.java (68%)
create mode 100644 rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractResponseViewProvider.java
create mode 100644 rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/ServerConfigurableFactory.java
create mode 100644 rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/springmvc/Messages.properties
create mode 100644 rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProvider.java
copy core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java => rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/provider/AbstractConfigurableProviderTest.java (63%)
create mode 100644 rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/springmvc/SpringViewResolverProviderTest.java
copy rt/rs/{security/cors => extensions/reactor}/pom.xml (73%)
create mode 100644 rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvoker.java
create mode 100644 rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerImpl.java
copy systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/SampleFeature.java => rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorInvokerProvider.java (54%)
create mode 100644 rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/client/ReactorUtils.java
copy rt/rs/extensions/{rx/src/main/java/org/apache/cxf/jaxrs/rx2/server/AbstractAsyncSubscriber.java => reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/AbstractSubscriber.java} (64%)
copy core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java => rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/JsonStreamingAsyncSubscriber.java (51%)
create mode 100644 rt/rs/extensions/reactor/src/main/java/org/apache/cxf/jaxrs/reactor/server/ReactorInvoker.java
copy rt/rs/extensions/{rx/src/main/java/org/apache/cxf/jaxrs/rx2 => reactor/src/main/java/org/apache/cxf/jaxrs/reactor}/server/StreamingAsyncSubscriber.java (91%)
rename rt/rs/extensions/rx/src/main/java/org/apache/cxf/jaxrs/rx2/server/{AbstractAsyncSubscriber.java => AbstractSubscriber.java} (65%)
copy systests/cdi/{cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/SampleFeature.java => base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreAuthenticator.java} (68%)
create mode 100644 systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreRequestFilter.java
create mode 100644 systests/cdi/base/src/main/java/org/apache/cxf/systests/cdi/base/BookStoreResponseFilter.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxReactorTest.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/FluxService.java
copy core/src/test/java/org/apache/cxf/common/security/SimplePrincipalTest.java => systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/HelloWorldBean.java (59%)
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoReactorTest.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/MonoService.java
create mode 100644 systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/reactor/ReactorServer.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 5d9db97be9c318b86be31da69138c874a9136d5e
Author: Dennis Kieselhorst <de...@apache.org>
AuthorDate: Sun Nov 12 20:29:04 2017 +0100
Spring 5/ Spring Boot 2
---
.../rs/service/SampleRestApplicationTest.java | 2 +-
.../sample/rs/service/SampleRestApplication.java | 17 ------------
.../rs/service/SampleRestApplicationTest.java | 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 ++++++++++++++++++++--
parent/pom.xml | 6 ++---
pom.xml | 11 ++++++++
9 files changed, 47 insertions(+), 27 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/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_security/pom.xml b/distribution/src/main/release/samples/jax_rs/spring_security/pom.xml
index 255cb3e..4e777c4 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.RC1</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 afd3180..a311657 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.8.RELEASE</spring.boot.version>
- <spring.cloud.eureka.version>1.3.4.RELEASE</spring.cloud.eureka.version>
+ <spring.boot.version>2.0.0.M6</spring.boot.version>
+ <spring.cloud.eureka.version>2.0.0.M2</spring.cloud.eureka.version>
</properties>
<dependencies>
<dependency>
@@ -232,4 +232,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/parent/pom.xml b/parent/pom.xml
index 7487b99..55ce97b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -152,9 +152,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.12.RELEASE</cxf.spring.version>
- <cxf.spring.boot.version>1.5.8.RELEASE</cxf.spring.boot.version>
- <cxf.spring.security.version>4.2.3.RELEASE</cxf.spring.security.version>
+ <cxf.spring.version>5.0.1.RELEASE</cxf.spring.version>
+ <cxf.spring.boot.version>2.0.0.M6</cxf.spring.boot.version>
+ <cxf.spring.security.version>5.0.0.RC1</cxf.spring.security.version>
<cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
<cxf.spring.ldap.version>2.3.1.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>.