From 940554aaa8e8c03f74ad54014d635f8606ec30c8 Mon Sep 17 00:00:00 2001
From: Abraham Fine <afine@apache.org>
Date: Sat, 7 Oct 2017 15:19:45 -0700
Subject: [PATCH] ZOOKEEPER-2915: Use "strict" conflict management in ivy

Change-Id: Icc3165d3d6674d3579a62fc3c96c300059a6a277
---
 build.xml | 22 +++++++++++++---------
 ivy.xml   | 14 +++++++++++---
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/build.xml b/build.xml
index 67136844ace..372174b450b 100644
--- a/build.xml
+++ b/build.xml
@@ -240,25 +240,29 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       </sequential>
     </macrodef>
 
-    <!-- the normal classpath -->
-    <path id="java.classpath">
+    <path id="base.classpath">
       <pathelement location="${build.classes}"/>
       <!-- allow the user to override (e.g. if there are local versions) -->
       <fileset dir="${additional.lib.dir}">
-        <include name="${additional.lib.dir.includes}" />
-        <exclude name="${additional.lib.dir.excludes}" />
+          <include name="${additional.lib.dir.includes}" />
+          <exclude name="${additional.lib.dir.excludes}" />
       </fileset>
       <fileset dir="${lib.dir}">
-        <include name="${lib.dir.includes}" />
-        <exclude name="${lib.dir.excludes}" />
+          <include name="${lib.dir.includes}" />
+          <exclude name="${lib.dir.excludes}" />
       </fileset>
       <fileset dir="${ant.home}/lib">
-        <include name="ant.jar" />
+          <include name="ant.jar" />
       </fileset>
+      <pathelement path="${clover.jar}" />
+    </path>
+
+    <!-- the normal classpath -->
+    <path id="java.classpath">
+      <path refid="base.classpath"/>
       <fileset dir="${ivy.lib}">
         <include name="**/*.jar" />
       </fileset>
-      <pathelement path="${clover.jar}" />
     </path>
 
     <path id="test.java.classpath">
@@ -266,7 +270,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
       <fileset dir="${ivy.test.lib}">
         <include name="**/*.jar" />
       </fileset>
-      <path refid="java.classpath"/>
+      <path refid="base.classpath"/>
     </path>
 
     <!-- ====================================================== -->
diff --git a/ivy.xml b/ivy.xml
index 0ad1f4d5899..8a9c6038f0d 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -28,7 +28,7 @@
   <configurations defaultconfmapping="default">
     <conf name="master"/>
     <conf name="default" extends="optional"/>
-    <conf name="test"/>
+    <conf name="test" extends="default"/>
     <conf name="mvn-ant-task" visibility="private"/>
     <conf name="optional"/> <!-- optional in generated pom -->
     <conf name="jdiff" visibility="private"/>
@@ -66,7 +66,10 @@
 	<dependency org="org.mockito" name="mockito-all" rev="${mockito.version}"
                conf="test->default"/>
     <dependency org="com.puppycrawl.tools" name="checkstyle" rev="${checkstyle.version}"
-                conf="test->default"/>
+                conf="test->default">
+        <exclude org="commons-collections" module="commons-collections"/>
+        <exclude org="commons-cli" module="commons-cli"/>
+    </dependency>
     <!-- force the tests to pull the latest commons-collections jar -->
     <dependency org="commons-collections" name="commons-collections" 
                 rev="${commons-collections.version}" conf="test->default"/>
@@ -77,7 +80,9 @@
                 conf="jdiff->default"/>
 
     <dependency org="org.apache.rat" name="apache-rat-tasks" 
-                rev="${apache-rat-tasks.version}" conf="releaseaudit->default"/>
+                rev="${apache-rat-tasks.version}" conf="releaseaudit->default">
+        <exclude org="commons-collections" module="commons-collections"/>
+    </dependency>
     <dependency org="commons-lang" name="commons-lang" 
                 rev="${commons-lang.version}" conf="releaseaudit->default"/>
     <dependency org="commons-collections" name="commons-collections" 
@@ -94,5 +99,8 @@
                   conf="optional->default"/>
     <dependency org="org.codehaus.jackson" name="jackson-mapper-asl"
                 rev="${jackson-mapper-asl.version}" conf="optional->default"/>
+
+    <conflict manager="strict"/>
+
   </dependencies>
 </ivy-module>