Author: gtrasuk
Date: Tue Jan 19 12:53:01 2016
New Revision: 1725501
URL: http://svn.apache.org/viewvc?rev=1725501&view=rev
Log:
Downloadable test libraries now go into 'deps-lib/test' rather than 'test/lib'.
This makes it so that 'clean' doesn't blow away the test library.
Modified:
river/jtsk/trunk/build.xml
river/jtsk/trunk/common.xml
Modified: river/jtsk/trunk/build.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/build.xml?rev=1725501&r1=1725500&r2=1725501&view=diff
==============================================================================
--- river/jtsk/trunk/build.xml (original)
+++ river/jtsk/trunk/build.xml Tue Jan 19 12:53:01 2016
@@ -600,7 +600,8 @@
<mkdir dir="dep-libs/groovy"/>
<mkdir dir="dep-libs/high-scale-lib"/>
<mkdir dir="dep-libs/velocity"/>
-
+ <mkdir dir="dep-libs/test"/>
+
<ivy:resolve conf="*, tools, asm, animal, bouncy, dnsjava, groovy,
hslib, velocity"/>
<ivy:retrieve
pattern="dep-libs/animal-sniffer/[artifact]-[revision].[ext]"
conf="animal"/>
@@ -616,7 +617,7 @@
conf="hslib"/>
<ivy:retrieve pattern="dep-libs/velocity/[artifact]-[revision].[ext]"
conf="velocity"/>
- <ivy:retrieve pattern="test/${lib}/[artifact]-[revision].[ext]"
+ <ivy:retrieve pattern="dep-libs/test/[artifact]-[revision].[ext]"
conf="tests"/>
@@ -659,7 +660,6 @@
<target name="clean-deps">
<delete dir="dep-libs" quiet="true"/>
- <delete dir="test/lib" quiet="true"/>
</target>
<target name="clean-dist"
Modified: river/jtsk/trunk/common.xml
URL:
http://svn.apache.org/viewvc/river/jtsk/trunk/common.xml?rev=1725501&r1=1725500&r2=1725501&view=diff
==============================================================================
--- river/jtsk/trunk/common.xml (original)
+++ river/jtsk/trunk/common.xml Tue Jan 19 12:53:01 2016
@@ -45,7 +45,7 @@
<property name="dist" value="dist"/>
<property name="test" value="test"/>
<property name="test.src" value="${test}/src"/>
- <property name="test.lib" value="${test}/lib"/>
+ <property name="test.lib" value="dep-libs/test"/>
<property name="test.classes" value="${test}/classes"/>
<property name="test.results" value="${test}/results"/>
