Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AC9DF200D42 for ; Fri, 17 Nov 2017 18:50:24 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AB699160C0A; Fri, 17 Nov 2017 17:50:24 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 224B9160BE6 for ; Fri, 17 Nov 2017 18:50:23 +0100 (CET) Received: (qmail 8841 invoked by uid 500); 17 Nov 2017 17:50:23 -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 8831 invoked by uid 99); 17 Nov 2017 17:50:23 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Nov 2017 17:50:23 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 1395C84A03; Fri, 17 Nov 2017 17:50:21 +0000 (UTC) Date: Fri, 17 Nov 2017 17:50:21 +0000 To: , "' commits@cxf.apache.org" , '@gitbox.apache.org, Subject: [cxf] branch 3.1.x-fixes updated (5cd8d6d -> 62bb860) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151094102166.11688.2787356424722562948@gitbox.apache.org> From: coheigea@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/3.1.x-fixes X-Git-Reftype: branch X-Git-Oldrev: 5cd8d6d2302a75e75a25ea989000a3bdb3f82e40 X-Git-Newrev: 62bb8600e299d90abc72f39a96d3f186db0482de X-Git-NotificationType: ref_changed X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated archived-at: Fri, 17 Nov 2017 17:50:24 -0000 This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from 5cd8d6d Recording .gitmergeinfo Changes new 3f79dd8 CXF-7568 - Support JWE PBES encryption new 62bb860 Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 1 + .../cxf/rs/security/jose/common/JoseConstants.java | 9 +- .../security/jose/common/KeyManagementUtils.java | 4 +- .../apache/cxf/rs/security/jose/jwe/JweUtils.java | 105 ++++++++++++++------- .../security/jose/jwejws/JweJwsAlgorithmTest.java | 60 ++++++++++++ .../security/jose/jwejws/algorithms-server.xml | 19 ++++ 6 files changed, 159 insertions(+), 39 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@cxf.apache.org" '].