Return-Path: 
 <commits-return-25644-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 16849FB8B
	for <apmail-cxf-commits-archive@www.apache.org>;
 Fri, 22 Mar 2013 11:53:36 +0000 (UTC)
Received: (qmail 92465 invoked by uid 500); 22 Mar 2013 11:53:35 -0000
Delivered-To: apmail-cxf-commits-archive@cxf.apache.org
Received: (qmail 92334 invoked by uid 500); 22 Mar 2013 11:53:35 -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 92307 invoked by uid 99); 22 Mar 2013 11:53:34 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 11:53:34 +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, 22 Mar 2013 11:53:32 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 3866E2388906;
	Fri, 22 Mar 2013 11:53:11 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1459735 - in /cxf/fediz/trunk: ./ pom.xml
Date: Fri, 22 Mar 2013 11:53:11 -0000
To: commits@cxf.apache.org
From: coheigea@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130322115311.3866E2388906@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: coheigea
Date: Fri Mar 22 11:53:10 2013
New Revision: 1459735

URL: http://svn.apache.org/r1459735
Log:
Merging from 1.0.x

Modified:
    cxf/fediz/trunk/   (props changed)
    cxf/fediz/trunk/pom.xml

Propchange: cxf/fediz/trunk/
------------------------------------------------------------------------------
  Merged /cxf/fediz/branches/1.0.x-fixes:r1459733

Modified: cxf/fediz/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cxf/fediz/trunk/pom.xml?rev=1459735&r1=1459734&r2=1459735&view=diff
==============================================================================
--- cxf/fediz/trunk/pom.xml (original)
+++ cxf/fediz/trunk/pom.xml Fri Mar 22 11:53:10 2013
@@ -44,7 +44,7 @@
         <junit.version>4.8.2</junit.version>
         <log4j.version>1.2.15</log4j.version>
         <servlet.version>2.5</servlet.version>
-        <slf4j.version>1.6.5</slf4j.version>
+        <slf4j.version>1.7.2</slf4j.version>
         <spring.version>3.0.7.RELEASE</spring.version>
         <tomcat.version>7.0.27</tomcat.version>
         <wss4j.version>1.6.9</wss4j.version>