Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6dc8eed8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6dc8eed8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6dc8eed8 Branch: refs/heads/3.1.x-fixes Commit: 6dc8eed886a589efbec037bc38241ec3ab4262a8 Parents: 693bd73 7083702 Author: Sergey Beryozkin <[email protected]> Authored: Thu Mar 23 13:34:50 2017 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Mar 23 13:34:50 2017 +0000 ---------------------------------------------------------------------- .gitmergeinfo | 6 +++++ .../cxf/staxutils/W3CDOMStreamReader.java | 10 +++++--- .../cxf/transport/TransportURIResolver.java | 9 ++++++- .../cxf/maven_plugin/AbstractCodegenMoho.java | 13 ++++++---- .../cxf/transport/jms/JMSMessageUtils.java | 26 +++++++++++++++++++- .../cxf/transport/jms/JMSPropertyType.java | 19 +++++++------- 6 files changed, 63 insertions(+), 20 deletions(-) ----------------------------------------------------------------------
