This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch http-4.x in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/http-4.x by this push: new 862c77e784 Remove mentioning of JSON license 862c77e784 is described below commit 862c77e784355351312595fbc910d111d5a456b9 Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Fri Apr 12 14:54:15 2024 +0200 Remove mentioning of JSON license --- .../main/appended-resources/META-INF/DEPENDENCIES | 3 +-- .../src/main/appended-resources/META-INF/LICENSE | 23 ---------------------- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES b/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES index 45b9d47cb5..e5666a764d 100644 --- a/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES +++ b/webconsole/src/main/appended-resources/META-INF/DEPENDENCIES @@ -57,7 +57,6 @@ Licensed under the Apache License 2.0. III. License Summary - Apache License 2.0 -- JSON License - MIT License - Creative Commons Attribution 2.5 License -- Tanner Hildebrand's License \ No newline at end of file +- Tanner Hildebrand's License diff --git a/webconsole/src/main/appended-resources/META-INF/LICENSE b/webconsole/src/main/appended-resources/META-INF/LICENSE index e790e598f1..d0a991b84e 100644 --- a/webconsole/src/main/appended-resources/META-INF/LICENSE +++ b/webconsole/src/main/appended-resources/META-INF/LICENSE @@ -406,26 +406,3 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -For the org.json classes (applies if org.json classes are embedded): - -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. \ No newline at end of file