cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject cassandra git commit: o.a.c.u.NoSpamLoggerTest uses slf4j's SubstituteLogger, which doesn't exist in 1.7.2 upgrade slf4j to 1.7.7 which has it.
Date Thu, 23 Apr 2015 04:51:21 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 3510bdb50 -> 792446a5a


o.a.c.u.NoSpamLoggerTest uses slf4j's SubstituteLogger, which doesn't exist in 1.7.2
upgrade slf4j to 1.7.7 which has it.


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

Branch: refs/heads/trunk
Commit: 792446a5a9cbc6dc09de75f4b4a2c12ff2dac542
Parents: 3510bdb
Author: Dave Brosius <dbrosius@mebigfatguy.com>
Authored: Thu Apr 23 00:48:41 2015 -0400
Committer: Dave Brosius <dbrosius@mebigfatguy.com>
Committed: Thu Apr 23 00:48:41 2015 -0400

----------------------------------------------------------------------
 build.xml                               |   8 ++++----
 lib/jcl-over-slf4j-1.7.2.jar            | Bin 16457 -> 0 bytes
 lib/jcl-over-slf4j-1.7.7.jar            | Bin 0 -> 16519 bytes
 lib/licenses/jcl-over-slf4j-1.7.2.txt   |  20 --------------------
 lib/licenses/jcl-over-slf4j-1.7.7.txt   |  20 ++++++++++++++++++++
 lib/licenses/log4j-over-slf4j-1.7.2.txt |  20 --------------------
 lib/licenses/log4j-over-slf4j-1.7.7.txt |  20 ++++++++++++++++++++
 lib/licenses/slf4j-api-1.7.2.txt        |  20 --------------------
 lib/licenses/slf4j-api-1.7.7.txt        |  20 ++++++++++++++++++++
 lib/log4j-over-slf4j-1.7.2.jar          | Bin 20886 -> 0 bytes
 lib/log4j-over-slf4j-1.7.7.jar          | Bin 0 -> 24220 bytes
 lib/slf4j-api-1.7.2.jar                 | Bin 26083 -> 0 bytes
 lib/slf4j-api-1.7.7.jar                 | Bin 0 -> 29257 bytes
 13 files changed, 64 insertions(+), 64 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c2c60f3..8cc03d5 100644
--- a/build.xml
+++ b/build.xml
@@ -333,9 +333,9 @@
           <dependency groupId="org.antlr" artifactId="antlr-runtime" version="3.5.2">
             <exclusion groupId="org.antlr" artifactId="stringtemplate"/>
           </dependency>
-          <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="org.slf4j" artifactId="slf4j-api" version="1.7.7"/>
+          <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.7"/>
+          <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.7"
/>
           <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"/>
@@ -1187,7 +1187,7 @@
         <pathelement location="${build.dir}/${ant.project.name}-clientutil-${version}.jar"
/>
         <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}/slf4j-api-1.7.7.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" />

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/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
deleted file mode 100644
index 867fa62..0000000
Binary files a/lib/jcl-over-slf4j-1.7.2.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/lib/jcl-over-slf4j-1.7.7.jar
----------------------------------------------------------------------
diff --git a/lib/jcl-over-slf4j-1.7.7.jar b/lib/jcl-over-slf4j-1.7.7.jar
new file mode 100644
index 0000000..ed8d4dd
Binary files /dev/null and b/lib/jcl-over-slf4j-1.7.7.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/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
deleted file mode 100644
index dbfc769..0000000
--- a/lib/licenses/jcl-over-slf4j-1.7.2.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-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/792446a5/lib/licenses/jcl-over-slf4j-1.7.7.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/jcl-over-slf4j-1.7.7.txt b/lib/licenses/jcl-over-slf4j-1.7.7.txt
new file mode 100644
index 0000000..dbfc769
--- /dev/null
+++ b/lib/licenses/jcl-over-slf4j-1.7.7.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. 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/lib/licenses/log4j-over-slf4j-1.7.2.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/log4j-over-slf4j-1.7.2.txt b/lib/licenses/log4j-over-slf4j-1.7.2.txt
deleted file mode 100644
index dbfc769..0000000
--- a/lib/licenses/log4j-over-slf4j-1.7.2.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-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/792446a5/lib/licenses/log4j-over-slf4j-1.7.7.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/log4j-over-slf4j-1.7.7.txt b/lib/licenses/log4j-over-slf4j-1.7.7.txt
new file mode 100644
index 0000000..dbfc769
--- /dev/null
+++ b/lib/licenses/log4j-over-slf4j-1.7.7.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. 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/lib/licenses/slf4j-api-1.7.2.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/slf4j-api-1.7.2.txt b/lib/licenses/slf4j-api-1.7.2.txt
deleted file mode 100644
index dbfc769..0000000
--- a/lib/licenses/slf4j-api-1.7.2.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-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/792446a5/lib/licenses/slf4j-api-1.7.7.txt
----------------------------------------------------------------------
diff --git a/lib/licenses/slf4j-api-1.7.7.txt b/lib/licenses/slf4j-api-1.7.7.txt
new file mode 100644
index 0000000..dbfc769
--- /dev/null
+++ b/lib/licenses/slf4j-api-1.7.7.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. 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/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
deleted file mode 100644
index 92e6103..0000000
Binary files a/lib/log4j-over-slf4j-1.7.2.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/lib/log4j-over-slf4j-1.7.7.jar
----------------------------------------------------------------------
diff --git a/lib/log4j-over-slf4j-1.7.7.jar b/lib/log4j-over-slf4j-1.7.7.jar
new file mode 100644
index 0000000..d2a102e
Binary files /dev/null and b/lib/log4j-over-slf4j-1.7.7.jar differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/lib/slf4j-api-1.7.2.jar
----------------------------------------------------------------------
diff --git a/lib/slf4j-api-1.7.2.jar b/lib/slf4j-api-1.7.2.jar
deleted file mode 100644
index 73f38db..0000000
Binary files a/lib/slf4j-api-1.7.2.jar and /dev/null differ

http://git-wip-us.apache.org/repos/asf/cassandra/blob/792446a5/lib/slf4j-api-1.7.7.jar
----------------------------------------------------------------------
diff --git a/lib/slf4j-api-1.7.7.jar b/lib/slf4j-api-1.7.7.jar
new file mode 100644
index 0000000..bebabd9
Binary files /dev/null and b/lib/slf4j-api-1.7.7.jar differ


Mime
View raw message