diff --git a/licenses.yaml b/licenses.yaml index 864f3a81655..89e04b92735 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -3907,10 +3907,9 @@ libraries: name: JCL 1.2 Implemented Over SLF4J license_category: binary module: java-core -license_name: MIT License -version: 1.7.12 +license_name: Apache License version 2.0 +version: 1.7.36 copyright: QOS.ch -license_file_path: licenses/bin/jcl-over-slf4j.MIT libraries: - org.slf4j: jcl-over-slf4j @@ -3920,7 +3919,7 @@ name: SLF4J API license_category: binary module: java-core license_name: MIT License -version: 1.7.25 +version: 1.7.36 copyright: QOS.ch license_file_path: licenses/bin/slf4j.MIT libraries: diff --git a/licenses/bin/jcl-over-slf4j.MIT b/licenses/bin/jcl-over-slf4j.MIT deleted file mode 100644 index 8fda22f4d72..00000000000 --- a/licenses/bin/jcl-over-slf4j.MIT +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) 2004-2014 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/licenses/bin/slf4j.MIT b/licenses/bin/slf4j.MIT index f5ecafa0074..744377c4372 100644 --- a/licenses/bin/slf4j.MIT +++ b/licenses/bin/slf4j.MIT @@ -1,4 +1,4 @@ -Copyright (c) 2004-2008 QOS.ch +Copyright (c) 2004-2017 QOS.ch All rights reserved. Permission is hereby granted, free of charge, to any person obtaining diff --git a/pom.xml b/pom.xml index 109127a33e9..9357fe50dbb 100644 --- a/pom.xml +++ b/pom.xml @@ -105,7 +105,7 @@ 42.2.14 3.11.0 1.3.1 - 1.7.12 + 1.7.36 2.8.5 4.3.1 @@ -789,7 +789,7 @@ org.slf4j slf4j-api - 1.7.25 + ${slf4j.version} org.roaringbitmap