Author: cnauroth
Date: Fri Feb 5 00:31:57 2016
New Revision: 1728578
URL: http://svn.apache.org/viewvc?rev=1728578&view=rev
Log:
ZOOKEEPER-2360: Update commons collections version used by tests/releaseaudit
(phunt via cnauroth)
Modified:
zookeeper/branches/branch-3.5/CHANGES.txt
zookeeper/branches/branch-3.5/ivy.xml
zookeeper/branches/branch-3.5/src/contrib/zooinspector/ivy.xml
Modified: zookeeper/branches/branch-3.5/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/CHANGES.txt?rev=1728578&r1=1728577&r2=1728578&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.5/CHANGES.txt Fri Feb 5 00:31:57 2016
@@ -97,6 +97,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-2270: Allow MBeanRegistry to be overridden for better unit tests
Modified: zookeeper/branches/branch-3.5/ivy.xml
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/ivy.xml?rev=1728578&r1=1728577&r2=1728578&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/ivy.xml (original)
+++ zookeeper/branches/branch-3.5/ivy.xml Fri Feb 5 00:31:57 2016
@@ -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" />
Modified: zookeeper/branches/branch-3.5/src/contrib/zooinspector/ivy.xml
URL:
http://svn.apache.org/viewvc/zookeeper/branches/branch-3.5/src/contrib/zooinspector/ivy.xml?rev=1728578&r1=1728577&r2=1728578&view=diff
==============================================================================
--- zookeeper/branches/branch-3.5/src/contrib/zooinspector/ivy.xml (original)
+++ zookeeper/branches/branch-3.5/src/contrib/zooinspector/ivy.xml Fri Feb 5
00:31:57 2016
@@ -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>
