[1/2] cxf git commit: [CXF-7401]CXF http-jetty fails to get private key if the jks keystore file contains multiple private keys with different password

2017-06-13 Thread ffang
Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 8341f4e08 -> 23408fdbb [CXF-7401]CXF http-jetty fails to get private key if the jks keystore file contains multiple private keys with different password (cherry picked from commit e877d30982ae970738495160090a8e948f33c199) (cherry

[2/2] cxf git commit: resolve cherry-pick conflicts

2017-06-13 Thread ffang
resolve cherry-pick conflicts Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/23408fdb Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/23408fdb Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/23408fdb Branch:

[1/2] cxf git commit: [CXF-7401]CXF http-jetty fails to get private key if the jks keystore file contains multiple private keys with different password

2017-06-13 Thread ffang
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 6ed365ef2 -> 07ee787c4 [CXF-7401]CXF http-jetty fails to get private key if the jks keystore file contains multiple private keys with different password (cherry picked from commit e877d30982ae970738495160090a8e948f33c199) Project:

[2/2] cxf git commit: Merge branch '3.1.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.1.x-fixes

2017-06-13 Thread ffang
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/07ee787c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/07ee787c Diff:

cxf git commit: [CXF-7400] Add dots to SwaggerUIResourceFilter regex, patch from Cody Raethke applied, This closes #280

2017-06-13 Thread sergeyb
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 02da972c8 -> 6ed365ef2 [CXF-7400] Add dots to SwaggerUIResourceFilter regex, patch from Cody Raethke applied, This closes #280 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit:

cxf git commit: [CXF-7400] Add dots to SwaggerUIResourceFilter regex, patch from Cody Raethke applied, This closes #280

2017-06-13 Thread sergeyb
Repository: cxf Updated Branches: refs/heads/master d9a4a0bac -> e16d3a57a [CXF-7400] Add dots to SwaggerUIResourceFilter regex, patch from Cody Raethke applied, This closes #280 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit:

cxf git commit: [CXF-7393] Add message to jws/jwe exceptions, patch from Amir Behnam applied, This closes #277

2017-06-13 Thread sergeyb
Repository: cxf Updated Branches: refs/heads/3.1.x-fixes 4fd67ac58 -> 02da972c8 [CXF-7393] Add message to jws/jwe exceptions, patch from Amir Behnam applied, This closes #277 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit:

cxf git commit: [CXF-7393] Add message to jws/jwe exceptions, patch from Amir Behnam applied, This closes #277

2017-06-13 Thread sergeyb
Repository: cxf Updated Branches: refs/heads/master e877d3098 -> d9a4a0bac [CXF-7393] Add message to jws/jwe exceptions, patch from Amir Behnam applied, This closes #277 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit:

cxf git commit: [CXF-7401]CXF http-jetty fails to get private key if the jks keystore file contains multiple private keys with different password

2017-06-13 Thread ffang
Repository: cxf Updated Branches: refs/heads/master 20663ce50 -> e877d3098 [CXF-7401]CXF http-jetty fails to get private key if the jks keystore file contains multiple private keys with different password Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: