Return-Path: 
 <commits-return-1685-apmail-avro-commits-archive=avro.apache.org@avro.apache.org>
X-Original-To: apmail-avro-commits-archive@www.apache.org
Delivered-To: apmail-avro-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 9142117D4B
	for <apmail-avro-commits-archive@www.apache.org>;
 Tue, 28 Oct 2014 17:07:27 +0000 (UTC)
Received: (qmail 69100 invoked by uid 500); 28 Oct 2014 17:07:27 -0000
Delivered-To: apmail-avro-commits-archive@avro.apache.org
Received: (qmail 69068 invoked by uid 500); 28 Oct 2014 17:07:27 -0000
Mailing-List: contact commits-help@avro.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@avro.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@avro.apache.org>
List-Post: <mailto:commits@avro.apache.org>
List-Id: <commits.avro.apache.org>
Reply-To: dev@avro.apache.org
Delivered-To: mailing list commits@avro.apache.org
Received: (qmail 69059 invoked by uid 99); 28 Oct 2014 17:07:27 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Oct 2014 17:07:27 +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, 28 Oct 2014 17:07:05 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 0DAB42388993;
	Tue, 28 Oct 2014 17:06:34 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1634919 - in /avro/trunk/lang/py: build.xml ivy.xml
 ivysettings.xml
Date: Tue, 28 Oct 2014 17:06:33 -0000
To: commits@avro.apache.org
From: cutting@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20141028170634.0DAB42388993@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: cutting
Date: Tue Oct 28 17:06:33 2014
New Revision: 1634919

URL: http://svn.apache.org/r1634919
Log:
AVRO-570. Fix build to get avro-tools jar from snapshot repo when not built locally.

Added:
    avro/trunk/lang/py/ivy.xml   (with props)
    avro/trunk/lang/py/ivysettings.xml   (with props)
Modified:
    avro/trunk/lang/py/build.xml

Modified: avro/trunk/lang/py/build.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/build.xml?rev=1634919&r1=1634918&r2=1634919&view=diff
==============================================================================
--- avro/trunk/lang/py/build.xml (original)
+++ avro/trunk/lang/py/build.xml Tue Oct 28 17:06:33 2014
@@ -16,7 +16,7 @@
    limitations under the License.
 -->
 
-<project name="Avro" default="dist">
+<project name="Avro" default="dist" xmlns:ivy="antlib:org.apache.ivy.ant">
  
   <!-- Load user's default properties. -->
   <property file="${user.home}/build.properties"/>
@@ -127,6 +127,10 @@
       </filterset>
     </copy>
 
+    <!-- Ensure we have a local copy of the tools jar -->
+    <ivy:retrieve
+        pattern="${basedir}/../java/tools/target/[artifact]-[revision].[ext]"/>
+
     <!-- Inline the location of the tools jar -->
     <copy file="${test.dir}/test_tether_word_count.py"
           toFile="${build.dir}/test/test_tether_word_count.py"

Added: avro/trunk/lang/py/ivy.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/ivy.xml?rev=1634919&view=auto
==============================================================================
--- avro/trunk/lang/py/ivy.xml (added)
+++ avro/trunk/lang/py/ivy.xml Tue Oct 28 17:06:33 2014
@@ -0,0 +1,8 @@
+<ivy-module version="2.0">
+    <info organisation="org.apache.avro" module="python"/>
+    <configurations defaultconfmapping="default"/>
+    <dependencies>
+        <dependency org="org.apache.avro" name="avro-tools"
+                    rev="${avro.version}" transitive="false"/>
+    </dependencies>
+</ivy-module>

Propchange: avro/trunk/lang/py/ivy.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: avro/trunk/lang/py/ivysettings.xml
URL: http://svn.apache.org/viewvc/avro/trunk/lang/py/ivysettings.xml?rev=1634919&view=auto
==============================================================================
--- avro/trunk/lang/py/ivysettings.xml (added)
+++ avro/trunk/lang/py/ivysettings.xml Tue Oct 28 17:06:33 2014
@@ -0,0 +1,9 @@
+<ivysettings>
+  <settings defaultResolver="repos" />
+  <resolvers>
+    <chain name="repos">
+      <ibiblio name="central" m2compatible="true"/>   
+      <ibiblio name="apache-snapshots" m2compatible="true" root="https://repository.apache.org/content/groups/snapshots"/>   
+    </chain>
+  </resolvers>
+</ivysettings>

Propchange: avro/trunk/lang/py/ivysettings.xml
------------------------------------------------------------------------------
    svn:eol-style = native