Repository: cassandra Updated Branches: refs/heads/trunk f44110c7f -> c832a36f2
route sigar's use of log4j thru slf4j Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c832a36f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c832a36f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c832a36f Branch: refs/heads/trunk Commit: c832a36f25c3b54f2a12a865455368e5243682bd Parents: f44110c Author: Dave Brosius <[email protected]> Authored: Sat Nov 8 23:12:04 2014 -0500 Committer: Dave Brosius <[email protected]> Committed: Sat Nov 8 23:12:04 2014 -0500 ---------------------------------------------------------------------- build.xml | 10 ++++++++-- lib/licenses/log4j-over-slf4j-1.7.2.jar | 20 ++++++++++++++++++++ lib/log4j-over-slf4j-1.7.2.jar | Bin 0 -> 20886 bytes 3 files changed, 28 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c832a36f/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 5eb1955..c4e27a7 100644 --- a/build.xml +++ b/build.xml @@ -327,6 +327,7 @@ <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2"/> <dependency groupId="org.antlr" artifactId="stringtemplate" version="4.0.2"/> <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.7.2"/> + <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.2"/> <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.2"/> <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.2"/> @@ -335,7 +336,7 @@ <dependency groupId="com.boundary" artifactId="high-scale-lib" version="1.0.6"/> <dependency groupId="com.github.jbellis" artifactId="jamm" version="0.2.8"/> <dependency groupId="com.thinkaurelius.thrift" artifactId="thrift-server" version="0.3.7"> - <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> + <exclusion groupId="org.slf4j" artifactId="slf4j-log4j12"/> </dependency> <dependency groupId="org.yaml" artifactId="snakeyaml" version="1.11"/> <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1"/> @@ -374,7 +375,9 @@ <dependency groupId="org.javassist" artifactId="javassist" version="3.18.2-GA" /> <dependency groupId="net.sf.supercsv" artifactId="super-csv" version="2.1.0" /> <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" /> + <dependency groupId="org.fusesource" artifactId="sigar" version="1.6.4"> + <exclusion groupId="log4j" artifactId="log4j"/> + </dependency> </dependencyManagement> <developer id="alakshman" name="Avinash Lakshman"/> <developer id="aleksey" name="Aleksey Yeschenko"/> @@ -468,6 +471,7 @@ <dependency groupId="org.antlr" artifactId="antlr-runtime"/> <dependency groupId="org.antlr" artifactId="stringtemplate" version="4.0.2"/> <dependency groupId="org.slf4j" artifactId="slf4j-api"/> + <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/> <dependency groupId="com.googlecode.json-simple" artifactId="json-simple"/> @@ -512,6 +516,7 @@ <scm connection="${scm.connection}" developerConnection="${scm.developerConnection}" url="${scm.url}"/> <dependency groupId="org.apache.commons" artifactId="commons-lang3"/> <dependency groupId="org.slf4j" artifactId="slf4j-api"/> + <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j"/> <dependency groupId="org.apache.thrift" artifactId="libthrift"/> </artifact:pom> <artifact:pom id="clientutil-pom" @@ -1163,6 +1168,7 @@ <pathelement location="${build.dir}/${ant.project.name}-thrift-${version}.jar" /> <pathelement location="${build.lib}/libthrift-0.9.0.jar" /> <pathelement location="${build.lib}/slf4j-api-1.7.2.jar" /> + <pathelement location="${build.lib}/log4j-over-slf4j.jar" /> <pathelement location="${build.lib}/logback-core-1.1.2.jar" /> <pathelement location="${build.lib}/logback-classic-1.1.2.jar" /> <pathelement location="${build.lib}/jackson-core-asl-1.9.2.jar" /> http://git-wip-us.apache.org/repos/asf/cassandra/blob/c832a36f/lib/licenses/log4j-over-slf4j-1.7.2.jar ---------------------------------------------------------------------- diff --git a/lib/licenses/log4j-over-slf4j-1.7.2.jar b/lib/licenses/log4j-over-slf4j-1.7.2.jar new file mode 100644 index 0000000..dbfc769 --- /dev/null +++ b/lib/licenses/log4j-over-slf4j-1.7.2.jar @@ -0,0 +1,20 @@ +Copyright (c) 2004-2008 QOS.ch +All rights reserved. + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. http://git-wip-us.apache.org/repos/asf/cassandra/blob/c832a36f/lib/log4j-over-slf4j-1.7.2.jar ---------------------------------------------------------------------- diff --git a/lib/log4j-over-slf4j-1.7.2.jar b/lib/log4j-over-slf4j-1.7.2.jar new file mode 100644 index 0000000..92e6103 Binary files /dev/null and b/lib/log4j-over-slf4j-1.7.2.jar differ
