diff --git a/LICENSE.txt b/LICENSE.txt index 064867c53a..238de7f58e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -498,29 +498,3 @@ intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - - -For lib/slf4j-api-1.5.8.jar and lib/slf4j-log4j12-1.5.8.jar: ------------------------------------------------------------- - -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. diff --git a/NOTICE.txt b/NOTICE.txt index 0696a05785..2dfb2b87cf 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -16,9 +16,6 @@ Copyright 2006-2009 Yidong Fang. This product makes use of the JUnit test framework (http://junit.org). -Logging abstraction provided by SLF4J (http://www.slf4j.org). -Copyright (c) 2004-2008 QOS.ch - Some alternate data structures provided by concurrentlinkedhashmap from http://code.google.com/p/concurrentlinkedhashmap/. Copyright 2009 Benjamin Manes diff --git a/ivy.xml b/ivy.xml index d0aaed8b18..49cbaaff8b 100644 --- a/ivy.xml +++ b/ivy.xml @@ -38,6 +38,8 @@ rev="3.2.1"/> + + diff --git a/lib/log4j-1.2.15.jar b/lib/log4j-1.2.15.jar deleted file mode 100644 index c930a6ab4d..0000000000 Binary files a/lib/log4j-1.2.15.jar and /dev/null differ diff --git a/lib/slf4j-api-1.5.8.jar b/lib/slf4j-api-1.5.8.jar deleted file mode 100644 index 35502caaea..0000000000 Binary files a/lib/slf4j-api-1.5.8.jar and /dev/null differ diff --git a/lib/slf4j-log4j12-1.5.8.jar b/lib/slf4j-log4j12-1.5.8.jar deleted file mode 100644 index b63bcdc746..0000000000 Binary files a/lib/slf4j-log4j12-1.5.8.jar and /dev/null differ