Return-Path: 
 <commits-return-25799-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 2A35DFD7E
	for <apmail-cxf-commits-archive@www.apache.org>;
 Tue, 26 Mar 2013 15:25:52 +0000 (UTC)
Received: (qmail 36531 invoked by uid 500); 26 Mar 2013 15:25:52 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 36453 invoked by uid 500); 26 Mar 2013 15:25:52 -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 36444 invoked by uid 99); 26 Mar 2013 15:25:52 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Mar 2013 15:25:52 +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; Tue, 26 Mar 2013 15:25:49 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id D1C632388978;
	Tue, 26 Mar 2013 15:25:28 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1461186 - /cxf/branches/2.6.x-fixes/parent/pom.xml
Date: Tue, 26 Mar 2013 15:25:28 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130326152528.D1C632388978@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: coheigea
Date: Tue Mar 26 15:25:28 2013
New Revision: 1461186

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

........
  r1461173 | coheigea | 2013-03-26 15:11:19 +0000 (Tue, 26 Mar 2013) | 10 lines

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

  ........
    r1461168 | coheigea | 2013-03-26 15:08:17 +0000 (Tue, 26 Mar 2013) | 2 lines

    Updating to use SLF4J 1.7.5

  ........

........

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=1461186&r1=1461185&r2=1461186&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Tue Mar 26 15:25:28 2013
@@ -142,6 +142,7 @@
         <cxf.servlet-api.version>1.0</cxf.servlet-api.version>
         <cxf.servlet-api-2.5.artifact>geronimo-servlet_2.5_spec</cxf.servlet-api-2.5.artifact>
         <cxf.servlet-api-2.5.version>1.1.2</cxf.servlet-api-2.5.version>
+        <cxf.slf4j.version>1.7.5</cxf.slf4j.version>
         <cxf.specs.jaxws.api.version>1.1</cxf.specs.jaxws.api.version>
         <cxf.spring.version>3.0.7.RELEASE</cxf.spring.version>
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
@@ -721,12 +722,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-jdk14</artifactId>
-                <version>1.6.2</version>
+                <version>${cxf.slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.6.2</version>
+                <version>${cxf.slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>