Index: lucene/common-build.xml
===================================================================
--- lucene/common-build.xml	(revision 1306037)
+++ lucene/common-build.xml	(working copy)
@@ -17,7 +17,8 @@
     limitations under the License.
  -->
 
-<project name="common" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+<project name="common" xmlns:artifact="antlib:org.apache.maven.artifact.ant" 
+                       xmlns:ivy="antlib:org.apache.ivy.ant">
   <description>
     This file is designed for importing into a main build file, and not intended
     for standalone use.
@@ -52,22 +53,22 @@
   <property name="year" value="2000-${current.year}"/>
   <property name="final.name" value="lucene-${name}-${version}"/>
 
+  <property name="ivy.install.version" value="2.2.0" />
+  <property name="ivy.jar.dir" value="${common.dir}/lib" />
+  <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" />
+  <available file="${ivy.jar.file}" property="ivy.available" />
+
+
   <property name="junit.jar" value="junit-4.10.jar"/>
-  <property name="junit-location.jar" value="${common.dir}/lib/${junit.jar}"/>
+  <property name="junit-location.jar" value="${common.dir}/test-framework/lib/${junit.jar}"/>
   <path id="junit-path">
     <pathelement location="${junit-location.jar}"/>
   </path>
 
   <path id="ant-path">
-    <fileset dir="${common.dir}/lib" includes="ant-*.jar"/>
+    <fileset dir="${common.dir}/test-framework/lib" includes="ant-*.jar"/>
   </path>
 
-  <path id="maven-ant-tasks.classpath">
-    <fileset dir="${common.dir}/lib">
-      <include name="maven-ant-tasks-*.jar"/>
-    </fileset>
-  </path>
-
   <!-- default arguments to pass to JVM executing tests -->
   <property name="testmethod" value=""/>
   <property name="args" value=""/>
@@ -249,10 +250,30 @@
     </echo>
   </target>
 
-  <target name="init">
+  <target name="init" depends="resolve">
     <!-- currently empty -->
   </target>
 
+  <target name="download-ivy" unless="ivy.available">
+      <mkdir dir="${ivy.jar.dir}"/>
+      <!-- download Ivy from web site so that it can be used even without any special installation -->
+      <echo message="installing ivy..."/>
+        <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+            dest="${ivy.jar.file}" usetimestamp="true"/>
+   </target>
+
+  <target name="install-ivy" depends="download-ivy">
+    <path id="ivy.lib.path">
+      <pathelement location="${ivy.jar.file}"/>
+    </path>
+    <taskdef resource="org/apache/ivy/ant/antlib.xml"
+             uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+  </target>
+
+  <target name="resolve" depends="install-ivy">
+    <ivy:retrieve log="quiet"/>
+  </target>
+
   <target name="jflex-uptodate-check">
     <uptodate property="jflex.files.uptodate">
       <srcfiles dir="${src.dir}" includes="**/*.jflex" />
@@ -785,6 +806,8 @@
   </target>
   
   <target name="dist-maven" if="pom.xml.present" depends="jar-core, jar-src, javadocs">
+    <ivy:cachepath organisation="org.apache.maven" module="maven-ant-tasks" revision="2.1.3"
+             inline="true" conf="master" pathid="maven-ant-tasks.classpath"/>
     <taskdef resource="org/apache/maven/artifact/ant/antlib.xml" 
              uri="antlib:org.apache.maven.artifact.ant" 
              classpathref="maven-ant-tasks.classpath"/>
Index: lucene/core/ivy.xml
===================================================================
--- lucene/core/ivy.xml	(revision 0)
+++ lucene/core/ivy.xml	(working copy)
@@ -0,0 +1,21 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="2.0">
+    <info organisation="org.apache.lucene" module="core"/>
+</ivy-module>
Index: lucene/core/ivy.xml
===================================================================
--- lucene/core/ivy.xml	(revision 0)
+++ lucene/core/ivy.xml	(working copy)

Property changes on: lucene/core/ivy.xml
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lucene/test-framework/ivy.xml
===================================================================
--- lucene/test-framework/ivy.xml	(revision 0)
+++ lucene/test-framework/ivy.xml	(working copy)
@@ -0,0 +1,26 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="2.0">
+    <info organisation="org.apache.lucene" module="core-test-framework"/>
+    <dependencies>
+      <dependency org="org.apache.ant" name="ant" rev="1.7.1"/>
+      <dependency org="org.apache.ant" name="ant-junit" rev="1.7.1"/>
+      <dependency org="junit" name="junit" rev="4.10"/>
+    </dependencies>
+</ivy-module>
Index: lucene/test-framework/ivy.xml
===================================================================
--- lucene/test-framework/ivy.xml	(revision 0)
+++ lucene/test-framework/ivy.xml	(working copy)

Property changes on: lucene/test-framework/ivy.xml
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: lucene/tools/ivy.xml
===================================================================
--- lucene/tools/ivy.xml	(revision 0)
+++ lucene/tools/ivy.xml	(working copy)
@@ -0,0 +1,21 @@
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.    
+-->
+<ivy-module version="2.0">
+    <info organisation="org.apache.lucene" module="core-tools"/>
+</ivy-module>
Index: lucene/tools/ivy.xml
===================================================================
--- lucene/tools/ivy.xml	(revision 0)
+++ lucene/tools/ivy.xml	(working copy)

Property changes on: lucene/tools/ivy.xml
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision HeadURL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property