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 2848B9241 for ; Sat, 25 Feb 2012 07:54:18 +0000 (UTC) Received: (qmail 85946 invoked by uid 500); 25 Feb 2012 07:54:17 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 85803 invoked by uid 500); 25 Feb 2012 07:54:16 -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 85769 invoked by uid 99); 25 Feb 2012 07:54:15 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Feb 2012 07:54:15 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 25 Feb 2012 07:54:12 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 222FA23888E4; Sat, 25 Feb 2012 07:53:51 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1293541 - in /cxf/branches/2.4.x-fixes: ./ osgi/karaf/features/src/main/resources/features.xml parent/pom.xml Date: Sat, 25 Feb 2012 07:53:50 -0000 To: commits@cxf.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120225075351.222FA23888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Sat Feb 25 07:53:50 2012 New Revision: 1293541 URL: http://svn.apache.org/viewvc?rev=1293541&view=rev Log: Merged revisions 1293337,1293540 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ................ r1293337 | ningjiang | 2012-02-25 00:48:58 +0800 (Sat, 25 Feb 2012) | 9 lines Merged revisions 1293326 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1293326 | ningjiang | 2012-02-25 00:30:40 +0800 (Sat, 25 Feb 2012) | 1 line Updated the xmlsec bundle version with 1.5.0 ........ ................ r1293540 | ningjiang | 2012-02-25 15:34:45 +0800 (Sat, 25 Feb 2012) | 1 line Using the latested release xmlsec bundle in the features.xml ................ Modified: cxf/branches/2.4.x-fixes/ (props changed) cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml cxf/branches/2.4.x-fixes/parent/pom.xml Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 25 07:53:50 2012 @@ -1,2 +1,2 @@ -/cxf/branches/2.5.x-fixes:1292050,1292373,1292766,1292793,1293258 -/cxf/trunk:1221366,1291943,1292763,1292792,1293255 +/cxf/branches/2.5.x-fixes:1292050,1292373,1292766,1292793,1293258,1293337,1293540 +/cxf/trunk:1221366,1291943,1292763,1292792,1293255,1293326 Propchange: cxf/branches/2.4.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1293541&r1=1293540&r2=1293541&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml (original) +++ cxf/branches/2.4.x-fixes/osgi/karaf/features/src/main/resources/features.xml Sat Feb 25 07:53:50 2012 @@ -59,7 +59,7 @@ opensaml - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlsec/${cxf.xmlsec.bundle.version} + mvn:org.apache.santuario/xmlsec/${cxf.xmlsec.bundle.version} mvn:org.apache.ws.security/wss4j/${cxf.wss4j.version} Modified: cxf/branches/2.4.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/parent/pom.xml?rev=1293541&r1=1293540&r2=1293541&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.4.x-fixes/parent/pom.xml Sat Feb 25 07:53:50 2012 @@ -136,7 +136,7 @@ 1.3.9_2 3.3_2 1.6.2_3 - 1.4.5_1 + 1.5.1 1.7R2_1 1.2_3 2.9.1_4