This is an automated email from the ASF dual-hosted git repository. sergeyb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git
commit fa404273d5272e069b92573a8d27f8f03da30f1e Merge: c63c210 84b4638 Author: Sergey Beryozkin <[email protected]> AuthorDate: Tue Sep 12 10:33:57 2017 +0100 Merge branch 'master' of https://gitbox.apache.org/repos/asf/cxf .../src/main/webapp/WEB-INF/applicationContext.xml | 2 +- .../big_query/src/main/webapp/WEB-INF/applicationContext.xml | 2 +- distribution/src/main/release/samples/jax_rs/spark/pom.xml | 8 ++++---- .../main/java/sample/rs/service/SampleRestApplication.java | 4 ++-- .../main/release/samples/jax_rs/tracing_opentracing/pom.xml | 12 ++++++------ .../src/main/release/samples/jaxws_spring_boot/README | 2 +- .../src/main/resources/client-applicationContext.xml | 2 +- .../src/main/resources/server-applicationContext.xml | 2 +- distribution/src/main/release/samples/pom.xml | 5 +++++ .../src/main/resources/server-applicationContext.xml | 2 +- etc/cxf.rdf | 4 ++-- maven-plugins/java2swagger-plugin/pom.xml | 6 ++++++ osgi/itests-felix/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 6 +++--- rt/rs/security/jcs-parent/jcs/pom.xml | 2 +- rt/rs/security/jcs-parent/pom.xml | 2 +- .../cxf/rs/security/saml/sso/AbstractSSOSpHandler.java | 4 +++- 18 files changed, 41 insertions(+), 28 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
