Browse Source

ZOOKEEPER-2360: Update commons collections version used by tests/releaseaudit (phunt via cnauroth)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1728577 13f79535-47bb-0310-9956-ffa450edef68
Chris Nauroth 9 years ago
parent
commit
576d5c5c4c
3 changed files with 9 additions and 3 deletions
  1. 3 0
      CHANGES.txt
  2. 4 1
      ivy.xml
  3. 2 2
      src/contrib/zooinspector/ivy.xml

+ 3 - 0
CHANGES.txt

@@ -249,6 +249,9 @@ BUGFIXES:
 
   ZOOKEEPER-412: checkstyle target fails trunk build (Akihiro Suda via cnauroth)
 
+  ZOOKEEPER-2360: Update commons collections version used by tests/releaseaudit
+  (phunt via cnauroth)
+
 IMPROVEMENTS:
   ZOOKEEPER-1660 Documentation for Dynamic Reconfiguration (Reed Wanderman-Milne via shralex)  
 

+ 4 - 1
ivy.xml

@@ -62,6 +62,9 @@
                conf="test->default"/>
     <dependency org="com.puppycrawl.tools" name="checkstyle" rev="6.13"
                 conf="test->default"/>
+    <!-- force the tests to pull the latest commons-collections jar -->
+    <dependency org="commons-collections" name="commons-collections" 
+                rev="3.2.2" conf="test->default"/>
 
     <dependency org="jdiff" name="jdiff" rev="1.0.9"
                 conf="jdiff->default"/>
@@ -73,7 +76,7 @@
     <dependency org="commons-lang" name="commons-lang" 
                 rev="2.6" conf="releaseaudit->default"/>
     <dependency org="commons-collections" name="commons-collections" 
-                rev="3.2.1" conf="releaseaudit->default"/>
+                rev="3.2.2" conf="releaseaudit->default"/>
 
     <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" />
 

+ 2 - 2
src/contrib/zooinspector/ivy.xml

@@ -37,12 +37,12 @@
             
     <dependency org="log4j" name="log4j" rev="1.2.17" transitive="false" conf="test->default" />
     <dependency org="junit" name="junit" rev="4.12" conf="test->default"/>
-        <dependency org="org.apache.rat" name="apache-rat-tasks" 
+    <dependency org="org.apache.rat" name="apache-rat-tasks" 
                 rev="0.6" conf="releaseaudit->default"/>
     <dependency org="commons-lang" name="commons-lang" 
                 rev="2.4" conf="releaseaudit->default"/>
     <dependency org="commons-collections" name="commons-collections" 
-                rev="3.1" conf="releaseaudit->default"/>
+                rev="3.2.2" conf="releaseaudit->default"/>
   </dependencies>
 
 </ivy-module>