You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sn...@apache.org on 2016/02/18 21:43:27 UTC
[3/6] cassandra git commit: fix ohc and java-driver pom dependencies
in build.xml
fix ohc and java-driver pom dependencies in build.xml
patch by Robert Stupp; reviewed by Jeremiah Jordan for CASSANDRA-10793
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71f44060
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71f44060
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71f44060
Branch: refs/heads/trunk
Commit: 71f44060726d4075dee3620d72db5ae1e3d6cd07
Parents: 37680ee
Author: Robert Stupp <sn...@snazy.de>
Authored: Thu Feb 18 21:38:23 2016 +0100
Committer: Robert Stupp <sn...@snazy.de>
Committed: Thu Feb 18 21:38:23 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
build.xml | 3 +++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71f44060/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 53fc168..10f23af 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.2.6
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
* Protect from keyspace dropped during repair (CASSANDRA-11065)
* Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
* Better error message for cleanup (CASSANDRA-10991)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71f44060/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e5fefed..361a057 100644
--- a/build.xml
+++ b/build.xml
@@ -575,6 +575,9 @@
<dependency groupId="joda-time" artifactId="joda-time"/>
<dependency groupId="org.fusesource" artifactId="sigar"/>
+
+ <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
+ <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
</artifact:pom>
<artifact:pom id="thrift-pom"
artifactId="cassandra-thrift"