Repository: cassandra Updated Branches: refs/heads/trunk 95ccf2de8 -> 481e60034
Exclude transitive slf4j dependencies patch by Stefan Podkowinski; reviewed by Robert Stupp for CASSANDRA-12996 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/481e6003 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/481e6003 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/481e6003 Branch: refs/heads/trunk Commit: 481e6003461d0e94f29e2853810deb79ed588d2d Parents: 95ccf2d Author: Stefan Podkowinski <stefan.podkowin...@1und1.de> Authored: Mon Jul 24 14:22:28 2017 +0200 Committer: Stefan Podkowinski <stefan.podkowin...@1und1.de> Committed: Tue Jul 25 12:35:01 2017 +0200 ---------------------------------------------------------------------- build.xml | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/481e6003/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 7421329..121ef17 100644 --- a/build.xml +++ b/build.xml @@ -394,9 +394,11 @@ <exclusion groupId="org.eclipse.jdt" artifactId="core"/> <exclusion groupId="ant" artifactId="ant"/> <exclusion groupId="junit" artifactId="junit"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> </dependency> <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"> <exclusion groupId="asm" artifactId="asm"/> <!-- this is the outdated version 3.1 --> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> </dependency> <dependency groupId="net.java.dev.jna" artifactId="jna" version="4.2.2"/> @@ -426,9 +428,12 @@ <exclusion groupId="io.netty" artifactId="netty-codec"/> <exclusion groupId="io.netty" artifactId="netty-handler"/> <exclusion groupId="io.netty" artifactId="netty-transport"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> </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.4" /> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.4"> + <exclusion groupId="org.slf4j" artifactId="slf4j-api"/> + </dependency> <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.4" /> <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations" version="1.2.0" /> <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4"> @@ -501,15 +506,10 @@ <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"> - <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="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded"/> <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/> - <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core" version="0.4.4" /> - <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8" version="0.4.4" /> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/> + <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core-j8"/> <dependency groupId="org.openjdk.jmh" artifactId="jmh-core"/> <dependency groupId="org.openjdk.jmh" artifactId="jmh-generator-annprocess"/> <dependency groupId="net.ju-n.compile-command-annotations" artifactId="compile-command-annotations"/> @@ -523,12 +523,7 @@ artifactId="cassandra-parent" version="${version}"/> <dependency groupId="junit" artifactId="junit"/> - <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="com.datastax.cassandra" artifactId="cassandra-driver-core" classifier="shaded"/> <dependency groupId="io.netty" artifactId="netty-all"/> <dependency groupId="org.eclipse.jdt.core.compiler" artifactId="ecj"/> <dependency groupId="org.caffinitas.ohc" artifactId="ohc-core"/> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
