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/60e98931 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/60e98931 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/60e98931 Branch: refs/heads/3.1.x-fixes Commit: 60e98931d41d04eafa324deb7170d443e1205a12 Parents: 08246e1 b0ff0ff Author: Benson Margulies <ben...@basistech.com> Authored: Tue Dec 22 07:36:36 2015 -0500 Committer: Benson Margulies <ben...@basistech.com> Committed: Tue Dec 22 07:36:36 2015 -0500 ---------------------------------------------------------------------- .../java/demo/jaxrs/server/BigQueryService.java | 2 +- .../cxf/jaxrs/json/basic/JsonMapObject.java | 4 +- .../rs/security/jose/common/JoseHeaders.java | 2 + .../cxf/rs/security/jose/jwe/JweHeaders.java | 1 + .../cxf/rs/security/jose/jwk/JsonWebKey.java | 2 + .../cxf/rs/security/jose/jwk/JsonWebKeys.java | 2 + .../cxf/rs/security/jose/jws/JwsHeaders.java | 1 + .../cxf/rs/security/jose/jwt/JwtClaims.java | 2 + .../cxf/rs/security/jose/jwt/JwtToken.java | 6 +- .../security/oidc/common/AbstractUserInfo.java | 2 + .../cxf/rs/security/oidc/common/IdToken.java | 2 + .../rs/security/oidc/common/UserAddress.java | 1 + .../cxf/rs/security/oidc/common/UserInfo.java | 1 + .../saml/sso/SAMLProtocolResponseValidator.java | 132 ++++++++++--------- .../transport/http/auth/DigestAuthSupplier.java | 16 ++- 15 files changed, 105 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
