Author: eevans
Date: Wed Feb 24 19:52:50 2010
New Revision: 915949
URL: http://svn.apache.org/viewvc?rev=915949&view=rev
Log:
CASSANDRA-831 reorganize ivy dependencies into configs
Patch by eevans; reviewed by jbellis for CASSANDRA-831
Modified:
incubator/cassandra/branches/cassandra-0.6/build.xml
incubator/cassandra/branches/cassandra-0.6/ivy.xml
Modified: incubator/cassandra/branches/cassandra-0.6/build.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.6/build.xml?rev=915949&r1=915948&r2=915949&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.6/build.xml (original)
+++ incubator/cassandra/branches/cassandra-0.6/build.xml Wed Feb 24 19:52:50
2010
@@ -148,6 +148,16 @@
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"
+ pattern="${build.dir.lib}/[type]s/[artifact]-[revision].[ext]" />
+ </target>
+
<!--
Generate avro code
-->
@@ -215,7 +225,7 @@
The build target builds all the .class files
-->
<target name="build"
- depends="ivy-retrieve,avro-generate,build-subprojects,build-project"/>
+
depends="ivy-retrieve-build,avro-generate,build-subprojects,build-project"/>
<target name="build-subprojects"/>
<target name="codecoverage"
depends="cobertura-instrument,test,cobertura-report"/>
Modified: incubator/cassandra/branches/cassandra-0.6/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.6/ivy.xml?rev=915949&r1=915948&r2=915949&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.6/ivy.xml (original)
+++ incubator/cassandra/branches/cassandra-0.6/ivy.xml Wed Feb 24 19:52:50 2010
@@ -18,6 +18,12 @@
-->
<ivy-module version="2.0">
<info organisation="apache-cassandra" module="cassandra"/>
+
+ <configurations defaultconfmapping="default">
+ <conf name="default"/>
+ <conf name="build" extends="default" />
+ </configurations>
+
<dependencies>
<!-- for hadoop -->
<dependency org="commons-logging" name="commons-logging" rev="1.1.1"/>
@@ -26,7 +32,7 @@
<!-- FIXME: paranamer and jackson can be dropped after we're depending
on avro (since it depends on them). -->
- <dependency org="com.thoughtworks.paranamer"
+ <dependency org="com.thoughtworks.paranamer" conf="build->default"
name="paranamer-ant" rev="2.1"/>
<dependency org="org.codehaus.jackson"
name="jackson-mapper-asl" rev="1.4.0"/>
@@ -41,7 +47,8 @@
<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"/>
+ <dependency org="junit" name="junit" rev="4.6" conf="build->default" />
+
</dependencies>
</ivy-module>
