Skip to content

Commit 6f19538

Browse files
committed
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
1 parent f3db8c9 commit 6f19538

File tree

1 file changed

+1
-26
lines changed

1 file changed

+1
-26
lines changed

spring-boot-cli/src/main/content/legal/open_source_licenses.txt

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
3232
>>> JLine (jline:jline)
3333
>>> JOpt Simple (net.sf.jopt-simple:jopt-simple)
3434
>>> ASM 4.0 (org.ow2.asm:asm)
35-
>>> JSON in Java (org.json:json)
3635

3736

3837
SECTION 2: Apache License, V2.0
3938

39+
>>> JSON library from Android SDK (com.vaadin.external.google:android-json)
4040
>>> Apache Commons Codec (commons-codec:commons-codec)
4141
>>> Apache HttpClient (org.apache.httpcomponents:httpclient)
4242
>>> 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
167167
THE POSSIBILITY OF SUCH DAMAGE.
168168

169169

170-
>>> org.json:json
171-
172-
Copyright (c) 2002 JSON.org
173-
174-
Permission is hereby granted, free of charge, to any person obtaining a copy
175-
of this software and associated documentation files (the "Software"), to deal
176-
in the Software without restriction, including without limitation the rights
177-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
178-
copies of the Software, and to permit persons to whom the Software is
179-
furnished to do so, subject to the following conditions:
180-
181-
The above copyright notice and this permission notice shall be included in all
182-
copies or substantial portions of the Software.
183-
184-
The Software shall be used for Good, not Evil.
185-
186-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
187-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
188-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
189-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
190-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
191-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
192-
SOFTWARE.
193-
194-
195170

196171
--------------- SECTION 2: Apache License, V2.0 ----------
197172

0 commit comments

Comments
 (0)