cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sn...@apache.org
Subject cassandra git commit: build: use correct netty version sources
Date Mon, 23 May 2016 15:12:15 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 400ad9468 -> b8f4ae004


build: use correct netty version sources

patch by Robert Stupp; reviewed by T Jake Luciani for CASSANDRA-11869


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

Branch: refs/heads/trunk
Commit: b8f4ae00430e9b061b127799d6ec34fdc741d794
Parents: 400ad94
Author: Robert Stupp <snazy@snazy.de>
Authored: Mon May 23 17:11:58 2016 +0200
Committer: Robert Stupp <snazy@snazy.de>
Committed: Mon May 23 17:11:58 2016 +0200

----------------------------------------------------------------------
 build.xml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/b8f4ae00/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1e58228..a0d114c 100644
--- a/build.xml
+++ b/build.xml
@@ -414,7 +414,12 @@
           <dependency groupId="io.netty" artifactId="netty-all" version="4.0.36.Final"
/>
           <dependency groupId="com.google.code.findbugs" artifactId="jsr305" version="2.0.2"
/>
           <dependency groupId="com.clearspring.analytics" artifactId="stream" version="2.5.2"
/>
-          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="3.0.1" classifier="shaded" />
+          <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
version="3.0.1" classifier="shaded">
+            <exclusion groupId="io.netty" artifactId="netty-buffer"/>
+            <exclusion groupId="io.netty" artifactId="netty-codec"/>
+            <exclusion groupId="io.netty" artifactId="netty-handler"/>
+            <exclusion groupId="io.netty" artifactId="netty-transport"/>
+          </dependency>
           <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj" version="4.4.2"
/>
           <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.3"
/>
           <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.3"
/>
@@ -472,7 +477,12 @@
       	<dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster"/>
       	<dependency groupId="com.google.code.findbugs" artifactId="jsr305"/>
         <dependency groupId="org.antlr" artifactId="antlr"/>
-        <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded"/>
+        <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded">
+          <exclusion groupId="io.netty" artifactId="netty-buffer"/>
+          <exclusion groupId="io.netty" artifactId="netty-codec"/>
+          <exclusion groupId="io.netty" artifactId="netty-handler"/>
+          <exclusion groupId="io.netty" artifactId="netty-transport"/>
+        </dependency>
         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.3"
/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.3"
/>
@@ -489,7 +499,13 @@
                 artifactId="cassandra-parent"
                 version="${version}"/>
         <dependency groupId="junit" artifactId="junit"/>
-        <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded"/>
+        <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded">
+          <exclusion groupId="io.netty" artifactId="netty-buffer"/>
+          <exclusion groupId="io.netty" artifactId="netty-codec"/>
+          <exclusion groupId="io.netty" artifactId="netty-handler"/>
+          <exclusion groupId="io.netty" artifactId="netty-transport"/>
+        </dependency>
+        <dependency groupId="io.netty" artifactId="netty-all"/>
         <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/>
         <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/>
         <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/>
@@ -564,7 +580,12 @@
         <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" optional="true"/>
 
         <!-- don't need the Java Driver to run, but if you use the hadoop stuff or UDFs
-->
-        <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded" optional="true"/>
+        <dependency groupId="com.datastax.cassandra" artifactId="cassandra-driver-core"
classifier="shaded" optional="true">
+          <exclusion groupId="io.netty" artifactId="netty-buffer"/>
+          <exclusion groupId="io.netty" artifactId="netty-codec"/>
+          <exclusion groupId="io.netty" artifactId="netty-handler"/>
+          <exclusion groupId="io.netty" artifactId="netty-transport"/>
+        </dependency>
 
         <!-- don't need jna to run, but nice to have -->
         <dependency groupId="net.java.dev.jna" artifactId="jna"/>


Mime
View raw message