Repository: cassandra Updated Branches: refs/heads/trunk 12d4e2f18 -> 948fdfc67
Upgrade slf4j to 1.7.25 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/948fdfc6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/948fdfc6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/948fdfc6 Branch: refs/heads/trunk Commit: 948fdfc67922ae7ecd410149b8d386c224ca4a95 Parents: 12d4e2f Author: Stefan Podkowinski <s.podkowin...@gmail.com> Authored: Fri Jun 2 18:57:21 2017 +0200 Committer: Stefan Podkowinski <s.podkowin...@gmail.com> Committed: Thu Jul 20 20:41:55 2017 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + build.xml | 6 ++--- lib/jcl-over-slf4j-1.7.25.jar | Bin 0 -> 16515 bytes lib/jcl-over-slf4j-1.7.7.jar | Bin 16519 -> 0 bytes lib/licenses/jcl-over-slf4j-1.7.25.txt | 24 +++++++++++++++++++ lib/licenses/jcl-over-slf4j-1.7.7.txt | 20 ---------------- lib/licenses/log4j-over-slf4j-1.7.25.txt | 24 +++++++++++++++++++ lib/licenses/log4j-over-slf4j-1.7.7.txt | 20 ---------------- lib/licenses/slf4j-api-1.7.25.txt | 24 +++++++++++++++++++ lib/licenses/slf4j-api-1.7.7.txt | 20 ---------------- lib/log4j-over-slf4j-1.7.25.jar | Bin 0 -> 23645 bytes lib/log4j-over-slf4j-1.7.7.jar | Bin 24220 -> 0 bytes lib/slf4j-api-1.7.25.jar | Bin 0 -> 41203 bytes lib/slf4j-api-1.7.7.jar | Bin 29257 -> 0 bytes .../cassandra/utils/NoSpamLoggerTest.java | 2 +- 15 files changed, 77 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 80d82dd..7632337 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0 + * Upgrade SLF4J from 1.7.7 to 1.7.25 * Default for start_native_transport now true if not set in config (CASSANDRA-13656) * Don't add localhost to the graph when calculating where to stream from (CASSANDRA-13583) * Allow skipping equality-restricted clustering columns in ORDER BY clause (CASSANDRA-10271) http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index ec2466d..7421329 100644 --- a/build.xml +++ b/build.xml @@ -372,9 +372,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.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="org.slf4j" artifactId="slf4j-api" version="1.7.25"/> + <dependency groupId="org.slf4j" artifactId="log4j-over-slf4j" version="1.7.25"/> + <dependency groupId="org.slf4j" artifactId="jcl-over-slf4j" version="1.7.25" /> <dependency groupId="ch.qos.logback" artifactId="logback-core" version="1.1.3"/> <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.3"/> <dependency groupId="org.codehaus.jackson" artifactId="jackson-core-asl" version="1.9.2"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/lib/jcl-over-slf4j-1.7.25.jar ---------------------------------------------------------------------- diff --git a/lib/jcl-over-slf4j-1.7.25.jar b/lib/jcl-over-slf4j-1.7.25.jar new file mode 100644 index 0000000..8e7fec8 Binary files /dev/null and b/lib/jcl-over-slf4j-1.7.25.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/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 deleted file mode 100644 index ed8d4dd..0000000 Binary files a/lib/jcl-over-slf4j-1.7.7.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/lib/licenses/jcl-over-slf4j-1.7.25.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/jcl-over-slf4j-1.7.25.txt b/lib/licenses/jcl-over-slf4j-1.7.25.txt new file mode 100644 index 0000000..315bd49 --- /dev/null +++ b/lib/licenses/jcl-over-slf4j-1.7.25.txt @@ -0,0 +1,24 @@ +Copyright (c) 2004-2017 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/948fdfc6/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 deleted file mode 100644 index dbfc769..0000000 --- a/lib/licenses/jcl-over-slf4j-1.7.7.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/948fdfc6/lib/licenses/log4j-over-slf4j-1.7.25.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/log4j-over-slf4j-1.7.25.txt b/lib/licenses/log4j-over-slf4j-1.7.25.txt new file mode 100644 index 0000000..315bd49 --- /dev/null +++ b/lib/licenses/log4j-over-slf4j-1.7.25.txt @@ -0,0 +1,24 @@ +Copyright (c) 2004-2017 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/948fdfc6/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 deleted file mode 100644 index dbfc769..0000000 --- a/lib/licenses/log4j-over-slf4j-1.7.7.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/948fdfc6/lib/licenses/slf4j-api-1.7.25.txt ---------------------------------------------------------------------- diff --git a/lib/licenses/slf4j-api-1.7.25.txt b/lib/licenses/slf4j-api-1.7.25.txt new file mode 100644 index 0000000..315bd49 --- /dev/null +++ b/lib/licenses/slf4j-api-1.7.25.txt @@ -0,0 +1,24 @@ +Copyright (c) 2004-2017 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/948fdfc6/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 deleted file mode 100644 index dbfc769..0000000 --- a/lib/licenses/slf4j-api-1.7.7.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/948fdfc6/lib/log4j-over-slf4j-1.7.25.jar ---------------------------------------------------------------------- diff --git a/lib/log4j-over-slf4j-1.7.25.jar b/lib/log4j-over-slf4j-1.7.25.jar new file mode 100644 index 0000000..ba241a4 Binary files /dev/null and b/lib/log4j-over-slf4j-1.7.25.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/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 deleted file mode 100644 index d2a102e..0000000 Binary files a/lib/log4j-over-slf4j-1.7.7.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/lib/slf4j-api-1.7.25.jar ---------------------------------------------------------------------- diff --git a/lib/slf4j-api-1.7.25.jar b/lib/slf4j-api-1.7.25.jar new file mode 100644 index 0000000..0143c09 Binary files /dev/null and b/lib/slf4j-api-1.7.25.jar differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/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 deleted file mode 100644 index bebabd9..0000000 Binary files a/lib/slf4j-api-1.7.7.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/cassandra/blob/948fdfc6/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java index 702fa98..fe5d58e 100644 --- a/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java +++ b/test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java @@ -39,7 +39,7 @@ public class NoSpamLoggerTest { Map<Level, Queue<Pair<String, Object[]>>> logged = new HashMap<>(); - Logger mock = new SubstituteLogger(null) + Logger mock = new SubstituteLogger(null, null, true) { @Override --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
