ZOOKEEPER-2906: The OWASP dependency check jar should not be included in the default classpath in the default classpath

Author: Abraham Fine <afine@apache.org>

Reviewers: Patrick Hunt <phunt@apache.org>

Closes #384 from afine/ZOOKEEPER-2906 and squashes the following commits:

45e8eb98 [Abraham Fine] Move releaseaudit jars to their own directory
241fbeb2 [Abraham Fine] ZOOKEEPER-2906: The OWASP dependency check jar should not be included in the default classpath

Change-Id: I6267ddbe15fd932f20ab7fbaa4909e03960c5497

build.xml

@@ -121,6 +121,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
     <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
     <property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
     <property name="ivy.javacc.lib" value="${build.dir}/javacc/lib"/>
+    <property name="ivy.releaseaudit.lib" value="${build.dir}/releaseaudit/lib"/>
+    <property name="ivy.owasp.lib" value="${build.dir}/owasp/lib"/>
     <property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
 
     <property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
@@ -427,10 +429,16 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
 
     <target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
       <ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
-                    pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+                    pattern="${ivy.releaseaudit.lib}/[artifact]-[revision].[ext]"/>
       <ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
     </target>
 
+    <target name="ivy-retrieve-owasp" depends="init,ivy-init">
+        <ivy:retrieve settingsRef="${ant.project.name}" conf="owasp"
+                      pattern="${ivy.owasp.lib}/[artifact]-[revision].[ext]"/>
+        <ivy:cachepath pathid="owasp-classpath" conf="owasp"/>
+    </target>
+
     <target name="process-template">
       <copy todir="${c.src.dir}" verbose="true" overwrite="true" failonerror="true">
         <fileset dir="${c.src.dir}">
@@ -1558,8 +1566,8 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
                classpathref="releaseaudit-classpath"/>
     </target>
 
-    <target name="owasp-taskdef" depends="ivy-retrieve-releaseaudit">
-        <typedef format="properties" resource="dependency-check-taskdefs.properties" uri="antlib:org.owasp.dependencycheck.anttasks" classpathref="releaseaudit-classpath"/>
+    <target name="owasp-taskdef" depends="ivy-retrieve-owasp">
+        <typedef format="properties" resource="dependency-check-taskdefs.properties" uri="antlib:org.owasp.dependencycheck.anttasks" classpathref="owasp-classpath"/>
     </target>
 
     <target name="owasp" depends="owasp-taskdef,ivy-retrieve" description="OWASP dependency check">

ivy.xml

@@ -34,6 +34,7 @@
     <conf name="jdiff" visibility="private"/>
     <conf name="javacc" visibility="private"/>
     <conf name="releaseaudit" visibility="private" description="Artifacts required for releaseaudit target"/>
+    <conf name="owasp" visibility="private" description="Artifacts required for owasp target"/>
   </configurations>
 
   <publications>
@@ -82,7 +83,7 @@
     <dependency org="commons-collections" name="commons-collections" 
                 rev="${commons-collections.version}" conf="releaseaudit->default"/>
     <dependency org="org.owasp" name="dependency-check-ant"
-                rev="${dependency-check-ant.version}" conf="releaseaudit->default"/>
+                rev="${dependency-check-ant.version}" conf="owasp->default"/>
 
     <dependency org="net.java.dev.javacc" name="javacc" rev="${javacc.version}"
                 conf="javacc->default" />