Return-Path: <commits-return-5750-archive-asf-public=cust-asf.ponee.io@zookeeper.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id AD8AC200D1D
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Sat, 30 Sep 2017 00:56:20 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id AC2E01609ED; Fri, 29 Sep 2017 22:56:20 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 06CB61609D1
	for <archive-asf-public@cust-asf.ponee.io>; Sat, 30 Sep 2017 00:56:19 +0200 (CEST)
Received: (qmail 67985 invoked by uid 500); 29 Sep 2017 22:56:19 -0000
Mailing-List: contact commits-help@zookeeper.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@zookeeper.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@zookeeper.apache.org>
List-Post: <mailto:commits@zookeeper.apache.org>
List-Id: <commits.zookeeper.apache.org>
Reply-To: dev@zookeeper.apache.org
Delivered-To: mailing list commits@zookeeper.apache.org
Received: (qmail 67971 invoked by uid 99); 29 Sep 2017 22:56:19 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 29 Sep 2017 22:56:19 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 15775F5C0C; Fri, 29 Sep 2017 22:56:19 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: phunt@apache.org
To: commits@zookeeper.apache.org
Message-Id: <b1dff01d8c884c1e80c0b7f24d19c541@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: zookeeper git commit: ZOOKEEPER-2906: The OWASP dependency check jar
 should not be included in the default classpath in the default classpath
Date: Fri, 29 Sep 2017 22:56:19 +0000 (UTC)
archived-at: Fri, 29 Sep 2017 22:56:20 -0000

Repository: zookeeper
Updated Branches:
  refs/heads/branch-3.5 2b3653579 -> 27d775a29


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
(cherry picked from commit 54cd7519a3afc43dabbf49490b9b012d6be68fee)
Signed-off-by: Patrick Hunt <phunt@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/27d775a2
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/27d775a2
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/27d775a2

Branch: refs/heads/branch-3.5
Commit: 27d775a2901ca00bdfbb7d6e185916cfcba04e6d
Parents: 2b36535
Author: Abraham Fine <afine@apache.org>
Authored: Fri Sep 29 15:53:40 2017 -0700
Committer: Patrick Hunt <phunt@apache.org>
Committed: Fri Sep 29 15:55:05 2017 -0700

----------------------------------------------------------------------
 build.xml | 14 +++++++++++---
 ivy.xml   |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/27d775a2/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6611c9c..45c2a81 100644
--- a/build.xml
+++ b/build.xml
@@ -122,6 +122,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"/>
@@ -431,10 +433,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}">
@@ -1567,8 +1575,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">

http://git-wip-us.apache.org/repos/asf/zookeeper/blob/27d775a2/ivy.xml
----------------------------------------------------------------------
diff --git a/ivy.xml b/ivy.xml
index 9e39172..0424ecb 100644
--- a/ivy.xml
+++ b/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="commons-io" name="commons-io"
                 rev="${commons-io.version}" conf="test->default"/>