azkaban-aplcache
Changes
build.xml 2(+1 -1)
ivy.xml 2(+2 -0)
ivy/libraries.properties 1(+1 -0)
unit/build.xml 6(+4 -2)
Details
build.xml 2(+1 -1)
diff --git a/build.xml b/build.xml
index b1b6120..a6cf032 100644
--- a/build.xml
+++ b/build.xml
@@ -465,7 +465,7 @@ ${current.time}
<target name="package" depends="package-all" description="Create all packages">
</target>
- <target name="test" depends="git.info, repo.file, ivy-retrieve" description="Build and run tests">
+ <target name="test" depends="jars" description="Build and run tests">
<subant target="all">
<fileset dir="unit" includes="build.xml" />
</subant>
ivy.xml 2(+2 -0)
diff --git a/ivy.xml b/ivy.xml
index 100d96b..532da37 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -49,6 +49,8 @@
rev="${joda-time.version}" conf="default->master" />
<dependency name="jopt-simple" org="net.sf.jopt-simple"
rev="${jopt-simple.version}" conf="default->master" />
+ <dependency name="junit" org="junit"
+ rev="${junit.version}" conf="default->master" />
<dependency name="log4j" org="log4j"
rev="${log4j.version}" conf="default->master" />
<dependency name="mail" org="javax.mail"
ivy/libraries.properties 1(+1 -0)
diff --git a/ivy/libraries.properties b/ivy/libraries.properties
index 4beee65..a4daa4a 100644
--- a/ivy/libraries.properties
+++ b/ivy/libraries.properties
@@ -21,6 +21,7 @@ jetty.version=6.1.26
jetty-util.version=6.1.26
joda-time.version=2.0
jopt-simple.version=4.3
+junit.version=4.11
log4j.version=1.2.16
mail.version=1.4.5
mysql-connector.version=5.1.28
unit/build.xml 6(+4 -2)
diff --git a/unit/build.xml b/unit/build.xml
index ea20282..bea882a 100644
--- a/unit/build.xml
+++ b/unit/build.xml
@@ -9,6 +9,7 @@
<property name="java.src.dir" value="${base.dir}/unit/java" />
<property name="job.conf.dir" value="${base.dir}/unit/executions" />
<property name="build.ivy.lib.dir" location="../build/ivy/lib" />
+ <property name="build.jars.dir" location="../dist/jars" />
<property environment="env" />
@@ -16,8 +17,9 @@
<fileset dir="${build.ivy.lib.dir}">
<include name="*.jar" />
</fileset>
-
- <pathelement path="${dist.classes.dir}" />
+ <fileset dir="${build.jars.dir}">
+ <include name="*.jar" />
+ </fileset>
</path>
<!-- set the build number based on environment variable, otherwise blank -->