Return-Path: 
 <commits-return-27160-apmail-cxf-commits-archive=cxf.apache.org@cxf.apache.org>
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 9EE79CF50
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri, 14 Jun 2013 15:46:39 +0000 (UTC)
Received: (qmail 72661 invoked by uid 500); 14 Jun 2013 15:46:39 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 72535 invoked by uid 500); 14 Jun 2013 15:46:38 -0000
Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cxf.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cxf.apache.org>
List-Post: <mailto:commits@cxf.apache.org>
List-Id: <commits.cxf.apache.org>
Reply-To: dev@cxf.apache.org
Delivered-To: mailing list commits@cxf.apache.org
Received: (qmail 72524 invoked by uid 99); 14 Jun 2013 15:46:37 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Jun 2013 15:46:37 +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; Fri, 14 Jun 2013 15:46:36 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 1CD06238889B;
	Fri, 14 Jun 2013 15:46:17 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1493126 - /cxf/branches/2.6.x-fixes/parent/pom.xml
Date: Fri, 14 Jun 2013 15:46:17 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130614154617.1CD06238889B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: coheigea
Date: Fri Jun 14 15:46:16 2013
New Revision: 1493126

URL: http://svn.apache.org/r1493126
Log:
Merged revisions 1493112 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

........
  r1493112 | coheigea | 2013-06-14 16:23:17 +0100 (Fri, 14 Jun 2013) | 10 lines

  Merged revisions 1492679 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/trunk

  ........
    r1492679 | coheigea | 2013-06-13 15:00:23 +0100 (Thu, 13 Jun 2013) | 2 lines

    Upgrading BouncyCastle version

  ........

........

Modified:
    cxf/branches/2.6.x-fixes/parent/pom.xml

Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1493126&r1=1493125&r2=1493126&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Fri Jun 14 15:46:16 2013
@@ -87,6 +87,7 @@
              need the 5.5.0 features.xml. :-(  -->
         <cxf.activemq.version>5.4.2</cxf.activemq.version>
         <cxf.axiom.version>1.2.14</cxf.axiom.version>
+        <cxf.bcprov.version>1.49</cxf.bcprov.version>
         <cxf.cglib.bundle.version>2.2_2</cxf.cglib.bundle.version>
         <cxf.cglib.osgi.version>[2.1.3,3.0.0)</cxf.cglib.osgi.version>
         <cxf.commons-codec.version>1.6</cxf.commons-codec.version>
@@ -1280,7 +1281,7 @@
             <dependency>
                 <groupId>org.bouncycastle</groupId>
                 <artifactId>bcprov-jdk15on</artifactId>
-                <version>1.47</version>
+                <version>${cxf.bcprov.version}</version>
             </dependency>
 
             <dependency>