Skip to content

Commit

Permalink
Remove references to JSON License (#25943)
Browse files Browse the repository at this point in the history
The JSON license was included for the `org.json` transitive dependency,
but that [no longer uses this
license](stleary/JSON-java#688).

Changes:
- Removed support for this license (so that the build will fail if
re-introduced)
- Removed license text from `thirdparty-template`

Fixes #25343
  • Loading branch information
JackPGreen authored Nov 20, 2023
1 parent 25cec84 commit 999805c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 32 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1558,33 +1558,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-----

The JSON License
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.

-----

GNU LIBRARY GENERAL PUBLIC LICENSE
Expand Down
5 changes: 0 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,6 @@
<includedLicense>Eclipse Distribution License - v 1.0</includedLicense>
<includedLicense>EPL-1.0</includedLicense>
<includedLicense>EPL-2.0</includedLicense>
<includedLicense>JSON</includedLicense>
<includedLicense>Public Domain</includedLicense>
</includedLicenses>
<licenseMerges>
Expand Down Expand Up @@ -647,10 +646,6 @@
Eclipse Public License - Version 2.0 |
Eclipse Public License, Version 2.0
</licenseMerge>
<licenseMerge>
JSON |
The JSON License
</licenseMerge>
</licenseMerges>
</configuration>
</execution>
Expand Down

0 comments on commit 999805c

Please sign in to comment.