Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E816818D0F for ; Tue, 15 Dec 2015 18:56:03 +0000 (UTC) Received: (qmail 73486 invoked by uid 500); 15 Dec 2015 18:56:03 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 73303 invoked by uid 500); 15 Dec 2015 18:56:03 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 73287 invoked by uid 99); 15 Dec 2015 18:56:03 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2015 18:56:03 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A3392E052E; Tue, 15 Dec 2015 18:56:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bimargulies@apache.org To: commits@cxf.apache.org Date: Tue, 15 Dec 2015 18:56:04 -0000 Message-Id: <9d2a5e613b8d4c7bbd29adb4ea9765c1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [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 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/601c0060 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/601c0060 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/601c0060 Branch: refs/heads/3.1.x-fixes Commit: 601c0060eef8c5792133c0c5a6561eb399fb28d0 Parents: e3edee6 015d7a6 Author: Benson Margulies Authored: Tue Dec 15 20:55:50 2015 +0200 Committer: Benson Margulies Committed: Tue Dec 15 20:55:50 2015 +0200 ---------------------------------------------------------------------- .../oidc/rp/AbstractTokenValidator.java | 34 ++++++++++++++------ .../cxf/rs/security/oidc/rp/UserInfoClient.java | 3 +- .../cxf/rs/security/oidc/utils/OidcUtils.java | 5 +-- 3 files changed, 30 insertions(+), 12 deletions(-) ----------------------------------------------------------------------