Repository: cassandra Updated Branches: refs/heads/trunk 8f51b8aaf -> d4b23b059
remove use of commons-logging in favor of jcl-over-slf4j Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4b23b05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4b23b05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4b23b05 Branch: refs/heads/trunk Commit: d4b23b0598132382e3b6dfb6d3bde5fec76db9e0 Parents: 8f51b8a Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Thu Jan 22 21:40:32 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Thu Jan 22 21:40:32 2015 -0500 ---------------------------------------------------------------------- build.xml | 11 +++++++---- lib/jcl-over-slf4j-1.7.2.jar | Bin 0 -> 16457 bytes lib/licenses/jcl-over-slf4j-1.7.2.txt | 20 ++++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4b23b05/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b52ca57..9bd565f 100644 --- a/build.xml +++ b/build.xml @@ -330,6 +330,7 @@ <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="org.slf4j" artifactId="jcl-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"/> @@ -341,15 +342,16 @@ <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"/> - + <dependency groupId="org.apache.thrift" artifactId="libthrift" version="0.9.1"> + <exclusion groupId="commons-logging" artifactId="commons-logging"/> + </dependency> <dependency groupId="junit" artifactId="junit" version="4.6" /> - <dependency groupId="commons-logging" artifactId="commons-logging" version="1.1.1"/> <dependency groupId="org.apache.rat" artifactId="apache-rat" version="0.10"> <exclusion groupId="commons-lang" artifactId="commons-lang"/> </dependency> <dependency groupId="org.apache.hadoop" artifactId="hadoop-core" version="1.0.3"> <exclusion groupId="org.mortbay.jetty" artifactId="servlet-api"/> + <exclusion groupId="commons-logging" artifactId="commons-logging"/> </dependency> <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster" version="1.0.3"/> <dependency groupId="org.apache.pig" artifactId="pig" version="0.12.1"/> @@ -417,7 +419,6 @@ artifactId="cassandra-parent" version="${version}"/> <dependency groupId="junit" artifactId="junit"/> - <dependency groupId="commons-logging" artifactId="commons-logging"/> <dependency groupId="org.apache.rat" artifactId="apache-rat"/> <dependency groupId="org.apache.hadoop" artifactId="hadoop-core"/> <dependency groupId="org.apache.hadoop" artifactId="hadoop-minicluster"/> @@ -475,6 +476,7 @@ <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.slf4j" artifactId="jcl-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"/> @@ -520,6 +522,7 @@ <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.slf4j" artifactId="jcl-over-slf4j"/> <dependency groupId="org.apache.thrift" artifactId="libthrift"/> </artifact:pom> <artifact:pom id="clientutil-pom" http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4b23b05/lib/jcl-over-slf4j-1.7.2.jar ---------------------------------------------------------------------- diff --git a/lib/jcl-over-slf4j-1.7.2.jar b/lib/jcl-over-slf4j-1.7.2.jar new file mode 100644 index 0000000..867fa62 Binary files /dev/null and b/lib/jcl-over-slf4j-1.7.2.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4b23b05/lib/licenses/jcl-over-slf4j-1.7.2.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/jcl-over-slf4j-1.7.2.txt b/lib/licenses/jcl-over-slf4j-1.7.2.txt new file mode 100644 index 0000000..dbfc769 --- /dev/null +++ b/lib/licenses/jcl-over-slf4j-1.7.2.txt @@ -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.
