You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2011/09/17 02:08:24 UTC
svn commit: r1171866 - in /zookeeper/trunk: CHANGES.txt build.xml ivy.xml
Author: phunt
Date: Sat Sep 17 00:08:23 2011
New Revision: 1171866
URL: http://svn.apache.org/viewvc?rev=1171866&view=rev
Log:
ZOOKEEPER-899. Update Netty version in trunk to 3.2.2 (Thomas Koch via phunt)
Modified:
zookeeper/trunk/CHANGES.txt
zookeeper/trunk/build.xml
zookeeper/trunk/ivy.xml
Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1171866&r1=1171865&r2=1171866&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Sep 17 00:08:23 2011
@@ -22,6 +22,9 @@ IMPROVEMENTS:
ZOOKEEPER-1175. DataNode references parent node for no reason
(Thomas Koch via phunt)
+ ZOOKEEPER-899. Update Netty version in trunk to 3.2.2
+ (Thomas Koch via phunt)
+
Release 3.4.0 -
Non-backward compatible changes:
Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1171866&r1=1171865&r2=1171866&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Sat Sep 17 00:08:23 2011
@@ -341,12 +341,12 @@
</target>
<target name="ivy-retrieve" depends="init,ivy-init">
- <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="default"
+ <ivy:retrieve settingsRef="${ant.project.name}" conf="default"
pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
</target>
<target name="ivy-retrieve-test" depends="init,ivy-init">
- <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="test"
+ <ivy:retrieve settingsRef="${ant.project.name}" conf="test"
pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
</target>
@@ -357,12 +357,12 @@
<target name="ivy-retrieve-jdiff" depends="init,ivy-init">
<mkdir dir="${ivy.jdiff.lib}"/>
- <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="jdiff"
+ <ivy:retrieve settingsRef="${ant.project.name}" conf="jdiff"
pattern="${ivy.jdiff.lib}/[artifact]-[revision].[ext]"/>
</target>
<target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
- <ivy:retrieve settingsRef="${ant.project.name}" type="jar" conf="releaseaudit"
+ <ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
<ivy:cachepath pathid="releaseaudit-classpath" conf="releaseaudit"/>
</target>
Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1171866&r1=1171865&r2=1171866&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Sat Sep 17 00:08:23 2011
@@ -39,20 +39,20 @@
</publications>
<dependencies>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1"/>
- <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.2"/>
+ <dependency org="org.slf4j" name="slf4j-log4j12" rev="1.6.2" transitive="false"/>
<!-- transitive false turns off dependency checking, log4j deps seem borked -->
- <dependency org="log4j" name="log4j" rev="1.2.15" transitive="false" conf="default"/>
+ <dependency org="log4j" name="log4j" rev="1.2.16" transitive="false" conf="default"/>
<dependency org="jline" name="jline" rev="0.9.94" transitive="false" conf="default"/>
- <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.2.Final">
+ <dependency org="org.jboss.netty" name="netty" conf="default" rev="3.2.5.Final">
<artifact name="netty" type="jar" conf="default"/>
</dependency>
<dependency org="org.vafer" name="jdeb" rev="0.8" conf="package->master"/>
- <dependency org="junit" name="junit" rev="4.8.1" conf="test->default"/>
+ <dependency org="junit" name="junit" rev="4.9" conf="test->default"/>
<dependency org="checkstyle" name="checkstyle" rev="5.0"
conf="test->default"/>
@@ -62,13 +62,12 @@
conf="jdiff->default"/>
<dependency org="org.apache.rat" name="apache-rat-tasks"
- rev="0.6" conf="releaseaudit->default"/>
+ rev="0.7" conf="releaseaudit->default"/>
<dependency org="commons-lang" name="commons-lang"
- rev="2.4" conf="releaseaudit->default"/>
+ rev="2.6" conf="releaseaudit->default"/>
<dependency org="commons-collections" name="commons-collections"
- rev="3.1" conf="releaseaudit->default"/>
+ rev="3.2.1" conf="releaseaudit->default"/>
<dependency org="net.java.dev.javacc" name="javacc" rev="5.0" />
</dependencies>
-
</ivy-module>