Repository: cassandra Updated Branches: refs/heads/trunk fd67615be -> d182fa1b4
make joda-time a proper pom dependency of cassandra Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d182fa1b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d182fa1b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d182fa1b Branch: refs/heads/trunk Commit: d182fa1b4174a6b030fd49cca6388128303617d3 Parents: fd67615 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Mar 16 23:02:35 2015 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Mar 16 23:02:35 2015 -0400 ---------------------------------------------------------------------- build.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d182fa1b/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 61d912e..3fb4240 100644 --- a/build.xml +++ b/build.xml @@ -339,7 +339,7 @@ <dependency groupId="com.googlecode.json-simple" artifactId="json-simple" version="1.1"/> <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/> <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.3.0"/> - <dependency groupId="com.github.tjake" artifactId="crc32ex" version="0.1.1"/> + <dependency groupId="com.github.tjake" artifactId="crc32ex" version="0.1.1"/> <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7"> <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> </dependency> @@ -385,6 +385,8 @@ <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4"> <exclusion groupId="log4j" artifactId="log4j"/> </dependency> + <dependency groupId="joda-time" artifactId="joda-time" version="2.4" /> + </dependencyManagement> <developer id="alakshman" name="Avinash Lakshman"/> <developer id="aleksey" name="Aleksey Yeschenko"/> @@ -451,7 +453,7 @@ artifactId="cassandra-parent" version="${version}"/> <!-- do NOT remove this, it breaks pig-test --> - <dependency groupId="joda-time" artifactId="joda-time" version="2.3" /> + <dependency groupId="joda-time" artifactId="joda-time" version="2.4" /> </artifact:pom> <!-- now the pom's for artifacts being deployed to Maven Central --> @@ -509,8 +511,10 @@ <!-- don't need jamm unless running a server in which case it needs to be a -javagent to be used anyway --> <dependency groupId="com.github.jbellis" artifactId="jamm"/> - <dependency groupId="com.github.tjake" artifactId="crc32ex"/> + <dependency groupId="com.github.tjake" artifactId="crc32ex"/> <dependency groupId="io.netty" artifactId="netty-all"/> + + <dependency groupId="joda-time" artifactId="joda-time" version="2.4" /> <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4"/> </artifact:pom>
