From 6f195380283d4e298779875aaf78c3729ee170eb Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 25 Jan 2017 22:12:37 -0800 Subject: [PATCH] Update CLI open_source_licenses.txt for json Update the open_source_licenses file to reflect the fact that the org.json library is no longer used. See gh-5929 --- .../content/legal/open_source_licenses.txt | 27 +------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/spring-boot-cli/src/main/content/legal/open_source_licenses.txt b/spring-boot-cli/src/main/content/legal/open_source_licenses.txt index 47f1f81a6d..552c6c073d 100644 --- a/spring-boot-cli/src/main/content/legal/open_source_licenses.txt +++ b/spring-boot-cli/src/main/content/legal/open_source_licenses.txt @@ -32,11 +32,11 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES >>> JLine (jline:jline) >>> JOpt Simple (net.sf.jopt-simple:jopt-simple) >>> ASM 4.0 (org.ow2.asm:asm) - >>> JSON in Java (org.json:json) SECTION 2: Apache License, V2.0 + >>> JSON library from Android SDK (com.vaadin.external.google:android-json) >>> Apache Commons Codec (commons-codec:commons-codec) >>> Apache HttpClient (org.apache.httpcomponents:httpclient) >>> Apache HttpCore (org.apache.httpcomponents:httpcore) @@ -167,31 +167,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ->>> org.json:json - -Copyright (c) 2002 JSON.org - -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 shall be used for Good, not Evil. - -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. - - --------------- SECTION 2: Apache License, V2.0 ----------