Author: buildbot
Date: Fri Jun 16 16:47:38 2017
New Revision: 1014143
Log:
Production update by buildbot for cxf
Modified:
websites/production/cxf/content/cache/docs.pageCache
websites/production/cxf/content/docs/jax-rs-jose.html
Modified: websites/production/cxf/content/cache/docs.pageC
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 23408fdbb -> 5fd91a935
Fixing ports
# Conflicts:
#
services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
Project: http://git-wip-us.apache.org
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5fd91a93
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5fd91a93
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5fd91a93
Branch: refs/h
Fixing ports
# Conflicts:
#
services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/022c89
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 0e83d4aa1 -> 6f07ef7b6
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6f07ef7b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6f0
Repository: cxf
Updated Branches:
refs/heads/master 77e0ffed1 -> 3d02791f0
Fixing ports
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3d02791f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3d02791f
Diff: http://git-w
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 72c4194a6 -> f25f4a51b
Backporting fix for CVE-2017-5656
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f25f4a51
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/72c4194a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/72c4194a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/72c4194a
Branch: refs/heads/2.6.x-fixes
Co
Repository: cxf
Updated Branches:
refs/heads/2.6.x-fixes 7aa3f2da2 -> 72c4194a6
Adding SAML SSO tests.
Conflicts:
rt/rs/security/sso/saml/src/main/java/org/apache/cxf/rs/security/saml/sso/SAMLSSOResponseValidator.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: