cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jasobr...@apache.org
Subject [1/3] cassandra git commit: Add asm jar to build.xml for maven builds
Date Thu, 09 Nov 2017 00:00:13 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.11 ab6201c65 -> df37bcb7c
  refs/heads/trunk 6186ad97a -> 77a352b26


Add asm jar to build.xml for maven builds

patch by DOAN DuyHai; reviewed by jasobrown for CASSANDRA-11193


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df37bcb7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df37bcb7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df37bcb7

Branch: refs/heads/cassandra-3.11
Commit: df37bcb7cba75c3da35e585726c90ad90a454d48
Parents: ab6201c
Author: DOAN DuyHai <doanduyhai@gmail.com>
Authored: Wed Nov 8 15:42:15 2017 -0800
Committer: Jason Brown <jasedbrown@gmail.com>
Committed: Wed Nov 8 15:56:49 2017 -0800

----------------------------------------------------------------------
 CHANGES.txt |  1 +
 build.xml   | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/df37bcb7/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 1269dcf..83015b1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.11.2
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
  * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
  * Update jackson JSON jars (CASSANDRA-13949)
  * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/df37bcb7/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 38e8963..2990ca9 100644
--- a/build.xml
+++ b/build.xml
@@ -453,8 +453,9 @@
           <dependency groupId="de.jflex" artifactId="jflex" version="1.6.0" />
           <dependency groupId="com.github.rholder" artifactId="snowball-stemmer" version="1.3.0.581.1"
/>
           <dependency groupId="com.googlecode.concurrent-trees" artifactId="concurrent-trees"
version="2.4.0" />
-	  <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6"
/>
-	  <dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/>
+          <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" version="2.2.6"
/>
+          <dependency groupId="org.jctools" artifactId="jctools-core" version="1.2.1"/>
+          <dependency groupId="org.ow2.asm" artifactId="asm" version="5.0.4" />
         </dependencyManagement>
         <developer id="adelapena" name="Andres de la Peña"/>
         <developer id="alakshman" name="Avinash Lakshman"/>
@@ -637,8 +638,9 @@
         <dependency groupId="org.fusesource" artifactId="sigar"/>
         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
-	<dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" />
-	<dependency groupId="org.jctools" artifactId="jctools-core"/>
+        <dependency groupId="com.github.ben-manes.caffeine" artifactId="caffeine" />
+        <dependency groupId="org.jctools" artifactId="jctools-core"/>
+        <dependency groupId="org.ow2.asm" artifactId="asm" />
       </artifact:pom>
       <artifact:pom id="thrift-pom"
                     artifactId="cassandra-thrift"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message