Return-Path: 
 <common-commits-return-15455-apmail-hadoop-common-commits-archive=hadoop.apache.org@hadoop.apache.org>
X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org
Delivered-To: apmail-hadoop-common-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 AAFA790CB
	for <apmail-hadoop-common-commits-archive@www.apache.org>;
 Thu, 29 Sep 2011 06:43:49 +0000 (UTC)
Received: (qmail 32508 invoked by uid 500); 29 Sep 2011 06:43:49 -0000
Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org
Received: (qmail 32056 invoked by uid 500); 29 Sep 2011 06:43:43 -0000
Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:common-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:common-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:common-commits@hadoop.apache.org>
List-Id: <common-commits.hadoop.apache.org>
Reply-To: common-dev@hadoop.apache.org
Delivered-To: mailing list common-commits@hadoop.apache.org
Received: (qmail 32004 invoked by uid 99); 29 Sep 2011 06:43:40 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 29 Sep 2011 06:43:40 +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; Thu, 29 Sep 2011 06:43:39 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id AEA76238897D;
	Thu, 29 Sep 2011 06:43:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1177177 - in /hadoop/common/branches/branch-0.22/common:
 CHANGES.txt ivy.xml
Date: Thu, 29 Sep 2011 06:43:19 -0000
To: common-commits@hadoop.apache.org
From: shv@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20110929064319.AEA76238897D@eris.apache.org>

Author: shv
Date: Thu Sep 29 06:43:19 2011
New Revision: 1177177

URL: http://svn.apache.org/viewvc?rev=1177177&view=rev
Log:
HADOOP-7697. Remove ivy dependency on different version of slf4j in avro. Contributed by Konstantin Shvachko.

Modified:
    hadoop/common/branches/branch-0.22/common/CHANGES.txt
    hadoop/common/branches/branch-0.22/common/ivy.xml

Modified: hadoop/common/branches/branch-0.22/common/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/CHANGES.txt?rev=1177177&r1=1177176&r2=1177177&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.22/common/CHANGES.txt Thu Sep 29 06:43:19 2011
@@ -546,6 +546,9 @@ Release 0.22.0 - Unreleased
 
     HADOOP-7646. Upgrade to Avro 1.5.3. (Joep Rottinghuis via shv)
 
+    HADOOP-7697. Remove ivy dependency on different version of slf4j in avro.
+    (shv)
+
 Release 0.21.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/common/branches/branch-0.22/common/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.22/common/ivy.xml?rev=1177177&r1=1177176&r2=1177177&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.22/common/ivy.xml (original)
+++ hadoop/common/branches/branch-0.22/common/ivy.xml Thu Sep 29 06:43:19 2011
@@ -265,11 +265,13 @@
       name="avro"
       rev="${avro.version}"
       conf="common->default">
+      <exclude module="slf4j-api"/>
     </dependency>
     <dependency org="org.apache.avro"
       name="avro-compiler"
       rev="${avro.version}"
       conf="common->default">
+      <exclude module="slf4j-api"/>
     </dependency>
      <dependency org="org.apache.avro"
       name="avro-ipc"
@@ -277,7 +279,7 @@
       conf="common->default">
       <exclude module="ant"/>
       <exclude module="jetty"/>
-      <exclude module="slf4j-simple"/>
+      <exclude module="slf4j-api"/>
     </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"