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/a6e8702a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a6e8702a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a6e8702a Branch: refs/heads/master Commit: a6e8702a05fc642231abaaa6ac131360bb030fda Parents: 6755b06 ba0573f Author: Freeman Fang <[email protected]> Authored: Mon Apr 17 12:16:29 2017 +0800 Committer: Freeman Fang <[email protected]> Committed: Mon Apr 17 12:16:29 2017 +0800 ---------------------------------------------------------------------- .../samples/jax_rs/sse_cdi/src/main/resources/META-INF/beans.xml | 2 +- .../jax_rs/sse_spring/src/main/resources/META-INF/beans.xml | 2 +- integration/cdi/src/main/resources/META-INF/beans.xml | 2 +- rt/rs/sse/src/main/resources/META-INF/beans.xml | 2 +- systests/cdi/base/src/main/resources/META-INF/beans.xml | 2 +- .../cdi-multiple-apps-owb/src/test/resources/META-INF/beans.xml | 2 +- .../cdi-owb/cdi-no-apps-owb/src/test/resources/META-INF/beans.xml | 2 +- .../cdi-multiple-apps-weld/src/test/resources/META-INF/beans.xml | 2 +- .../cdi-no-apps-weld/src/test/resources/META-INF/beans.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) ----------------------------------------------------------------------
