Author: eevans
Date: Fri Mar 26 15:51:58 2010
New Revision: 927932
URL: http://svn.apache.org/viewvc?rev=927932&view=rev
Log:
remove default (runtime) ivy config
Patch by eevans for CASSANDRA-850
Modified:
cassandra/branches/cassandra-0.6/build.xml
cassandra/branches/cassandra-0.6/ivy.xml
Modified: cassandra/branches/cassandra-0.6/build.xml
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/build.xml?rev=927932&r1=927931&r2=927932&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/build.xml (original)
+++ cassandra/branches/cassandra-0.6/build.xml Fri Mar 26 15:51:58 2010
@@ -67,16 +67,19 @@
<!--
Add all the dependencies.
-->
+ <path id="autoivy.classpath">
+ <fileset dir="${build.dir.lib}">
+ <include name="**/*.jar" />
+ </fileset>
+ <pathelement location="${build.dir}/ivy-${ivy.version}.jar"/>
+ </path>
<path id="cassandra.classpath">
<pathelement location="${cobertura.classes.dir}"/>
<pathelement location="${build.classes}"/>
<fileset dir="${build.lib}">
<include name="**/*.jar" />
</fileset>
- <fileset dir="${build.dir.lib}">
- <include name="**/*.jar" />
- </fileset>
- <pathelement location="${build.dir}/ivy-${ivy.version}.jar"/>
+ <path refid="autoivy.classpath" />
</path>
<!--
@@ -139,22 +142,12 @@
<mkdir dir="${build.dir.lib}"/>
<taskdef resource="org/apache/ivy/ant/antlib.xml"
uri="antlib:org.apache.ivy.ant"
- classpathref="cassandra.classpath"/>
+ classpathref="autoivy.classpath"/>
<property name="ivy.initialized" value="true"/>
</target>
- <target name="ivy-retrieve" depends="ivy-init">
- <ivy:retrieve type="jar,source" conf="default" sync="true"
- pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
- </target>
-
- <target name="ivy-retrieve-build" depends="ivy-init,ivy-retrieve">
- <ivy:retrieve type="jar,source" conf="build" sync="true"
- pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
- </target>
-
- <target name="ivy-retrieve-qa" depends="ivy-init,ivy-retrieve">
- <ivy:retrieve type="jar,source" conf="qa" sync="true"
+ <target name="ivy-retrieve-build" depends="ivy-init">
+ <ivy:retrieve type="jar,source" sync="true"
pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
</target>
@@ -426,7 +419,7 @@
<!--
License audit tool
-->
- <target name="rat-init" depends="ivy-retrieve-qa">
+ <target name="rat-init" depends="ivy-retrieve-build">
<typedef resource="org/apache/rat/anttasks/antlib.xml"
uri="antlib:org.apache.rat.anttasks">
<classpath>
Modified: cassandra/branches/cassandra-0.6/ivy.xml
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.6/ivy.xml?rev=927932&r1=927931&r2=927932&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.6/ivy.xml (original)
+++ cassandra/branches/cassandra-0.6/ivy.xml Fri Mar 26 15:51:58 2010
@@ -19,39 +19,13 @@
<ivy-module version="2.0">
<info organisation="apache-cassandra" module="cassandra"/>
- <configurations defaultconfmapping="default">
- <conf name="default"/>
- <conf name="build" extends="default" />
- <conf name="qa" extends="default" />
- </configurations>
-
<dependencies>
- <!-- for hadoop -->
- <dependency org="commons-logging" name="commons-logging" rev="1.1.1"/>
- <dependency org="org.apache.mahout.hadoop" name="hadoop-core"
rev="0.20.1"/>
- <dependency org="commons-httpclient" name="commons-httpclient" rev="3.1"/>
-
- <!-- FIXME: paranamer and jackson can be dropped after we're depending
- on avro (since it depends on them). -->
- <dependency org="com.thoughtworks.paranamer" conf="build->default"
+ <!-- FIXME: paranamer can be dropped after we're depending on avro
+ (since it depends on them). -->
+ <dependency org="com.thoughtworks.paranamer"
name="paranamer-ant" rev="2.1"/>
- <dependency org="org.codehaus.jackson"
- name="jackson-mapper-asl" rev="1.4.0"/>
-
- <dependency org="com.google.collections" name="google-collections"
- rev="1.0"/>
- <dependency org="commons-cli" name="commons-cli" rev="1.1"/>
- <dependency org="commons-collections" name="commons-collections"
- rev="3.2.1"/>
- <dependency org="commons-lang" name="commons-lang" rev="2.4"/>
- <dependency org="jline" name="jline" rev="0.9.94"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.5.8"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.8"/>
- <dependency org="com.googlecode.json-simple" name="json-simple" rev="1.1"/>
- <dependency org="junit" name="junit" rev="4.6" conf="build->default" />
-
- <dependency org="org.apache.rat" name="apache-rat" rev="0.6"
- conf="qa->default"/>
+ <dependency org="junit" name="junit" rev="4.6" />
+ <dependency org="org.apache.rat" name="apache-rat" rev="0.6" />
</dependencies>
</ivy-module>
