Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a07135b1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a07135b1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a07135b1 Branch: refs/heads/master Commit: a07135b12c37a406d29a8398330214ef8cc4b7d9 Parents: a6e8702 5e17bc0 Author: Freeman Fang <[email protected]> Authored: Wed Apr 19 12:58:23 2017 +0800 Committer: Freeman Fang <[email protected]> Committed: Wed Apr 19 12:58:23 2017 +0800 ---------------------------------------------------------------------- integration/spring-boot/autoconfigure/pom.xml | 37 +++++++++ .../boot/autoconfigure/CxfProperties.java | 6 +- .../boot/autoconfigure/CxfPropertiesTest.java | 86 ++++++++++++++++++++ parent/pom.xml | 2 +- pom.xml | 4 +- .../apache/cxf/jaxrs/impl/ResourceInfoImpl.java | 2 +- .../apache/cxf/jaxrs/utils/InjectionUtils.java | 4 +- 7 files changed, 133 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
