From f0f54e5f7e52786aaf16fba3597a662b5862e98d Mon Sep 17 00:00:00 2001 From: Paul King Date: Thu, 21 May 2015 15:00:42 +1000 Subject: [PATCH] tweak licenses --- LICENSE | 87 +++++++++++++++++++++++++++++++++++++ NOTICE | 2 +- gradle/assemble.gradle | 1 + licenses/javadocfixtool.txt | 85 ++++++++++++++++++++++++++++++++++++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 licenses/javadocfixtool.txt diff --git a/LICENSE b/LICENSE index b54541b582c..88257139854 100644 --- a/LICENSE +++ b/LICENSE @@ -290,6 +290,93 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--------------------------------------------------------------------- +Oracle Javadoc FixTool License + +Copyright (c) 2013 Oracle and/or its affiliates. +All rights reserved. Use is subject to license terms. + +License Agreement + +PLEASE READ THE FOLLOWING LICENSE TERMS CAREFULLY BEFORE USING THE +ACCOMPANYING PROGRAM. THESE TERMS CONSTITUTE A LEGAL AGREEMENT BETWEEN +YOU AND US. + +"Oracle" refers to Oracle America, Inc., for and on behalf of itself and its +subsidiaries and affiliates under common control. "We," "us," and "our" +refers to Oracle and any Program contributors. "You" and "your" refers to +the individual or entity that wishes to use the Program. "Program" refers to +the Java API Documentation Updater Tool, Copyright (c) 2013, Oracle America, +Inc., and updates or error corrections provided by Oracle or contributors. + +WARNING: +The Program will analyze directory information on your computer +system and may modify software components on such computer system. You +should only use the Program on computer systems that you maintain sufficient +rights to update software components. + +If your computer system is owned by a person or entity other than you, +you should check with such person or entity before using the Program. + +It is possible that you may lose some software functionality, and make +Java API Documentation pages unusable on your computer system after you use +the Program to update software components. + +License Rights and Obligations +We grant you a perpetual, nonexclusive, limited license to use, modify and +distribute the Program in binary and/or source code form, only for the +purpose of analyzing the directory structure of your computer system and +updating Java API Documentation files. If you distribute the Program, in +either or both binary or source form, including as modified by you, you +shall include this License Agreement ("Agreement") with your distribution. + +All rights not expressly granted above are hereby reserved. If you want to +use the Program for any purpose other than as permitted under this +Agreement, you must obtain a valid license permitting such use from Oracle. +Neither the name of Oracle nor the names of any Program contributors may be +used to endorse or promote products derived from this software without +specific prior written permission. + +Ownership and Restrictions +We retain all ownership and intellectual property rights in the Program as +provided by us. You retain all ownership and intellectual property rights +in your modifications. + +Export +You agree to comply fully with export laws and regulations of the United +States and any other applicable export laws ("Export Laws") to assure that +neither the Program nor any direct products thereof are: (1) exported, +directly or indirectly, in violation of this Agreement or Export Laws; or +(2) used for any purposes prohibited by the Export Laws, including, without +limitation, nuclear, chemical, or biological weapons proliferation, or +development of missile technology. + +Disclaimer of Warranty and Limitation of Liability +THE PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. USE AT YOUR +OWN RISK. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, +INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT. + +IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, DIRECT, INCIDENTAL, +SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, +REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN +ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. ORACLE SHALL HAVE NO LIABILITY FOR MODIFICATIONS MADE BY +YOU OR ANY THIRD PARTY. + +Entire Agreement +You agree that this Agreement is the complete agreement for the Program, and +this Agreement supersedes all prior or contemporaneous agreements or +representations. If any term of this Agreement is found to be invalid or +unenforceable, the remaining provisions will remain effective. This +Agreement is governed by the substantive and procedural laws of California. +You and Oracle agree to submit to the exclusive jurisdiction of, and venue +in, the courts of San Francisco or Santa Clara counties in California in +any dispute between you and Oracle arising out of or relating to this +Agreement. + +Last updated: 14 June 2013 + --------------------------------------------------------------------- JLine License diff --git a/NOTICE b/NOTICE index 33aa2ea84fd..a5654b21a95 100644 --- a/NOTICE +++ b/NOTICE @@ -19,7 +19,7 @@ Hamcrest (https://github.com/hamcrest/JavaHamcrest) JCommander (http://jcommander.org/) Openbeans (https://code.google.com/p/openbeans/) QDox (http://qdox.codehaus.org/) -TestNG (http://qdox.codehaus.org/) +TestNG (http://testng.org/) XStream (http://xstream.codehaus.org/) For the following files in the groovy-jsr223 component: diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle index 6f5f1d1b618..7f78bbb9db7 100644 --- a/gradle/assemble.gradle +++ b/gradle/assemble.gradle @@ -38,6 +38,7 @@ ext.licenseSpec = copySpec { ext.srcSpec = copySpec { from(projectDir) { exclude 'target', + 'benchmark', 'subprojects/*/target', 'buildSrc/target', buildDir.path, diff --git a/licenses/javadocfixtool.txt b/licenses/javadocfixtool.txt new file mode 100644 index 00000000000..ca81be8e605 --- /dev/null +++ b/licenses/javadocfixtool.txt @@ -0,0 +1,85 @@ +Oracle Javadoc FixTool License + +Copyright (c) 2013 Oracle and/or its affiliates. +All rights reserved. Use is subject to license terms. + +License Agreement + +PLEASE READ THE FOLLOWING LICENSE TERMS CAREFULLY BEFORE USING THE +ACCOMPANYING PROGRAM. THESE TERMS CONSTITUTE A LEGAL AGREEMENT BETWEEN +YOU AND US. + +"Oracle" refers to Oracle America, Inc., for and on behalf of itself and its +subsidiaries and affiliates under common control. "We," "us," and "our" +refers to Oracle and any Program contributors. "You" and "your" refers to +the individual or entity that wishes to use the Program. "Program" refers to +the Java API Documentation Updater Tool, Copyright (c) 2013, Oracle America, +Inc., and updates or error corrections provided by Oracle or contributors. + +WARNING: +The Program will analyze directory information on your computer +system and may modify software components on such computer system. You +should only use the Program on computer systems that you maintain sufficient +rights to update software components. + +If your computer system is owned by a person or entity other than you, +you should check with such person or entity before using the Program. + +It is possible that you may lose some software functionality, and make +Java API Documentation pages unusable on your computer system after you use +the Program to update software components. + +License Rights and Obligations +We grant you a perpetual, nonexclusive, limited license to use, modify and +distribute the Program in binary and/or source code form, only for the +purpose of analyzing the directory structure of your computer system and +updating Java API Documentation files. If you distribute the Program, in +either or both binary or source form, including as modified by you, you +shall include this License Agreement ("Agreement") with your distribution. + +All rights not expressly granted above are hereby reserved. If you want to +use the Program for any purpose other than as permitted under this +Agreement, you must obtain a valid license permitting such use from Oracle. +Neither the name of Oracle nor the names of any Program contributors may be +used to endorse or promote products derived from this software without +specific prior written permission. + +Ownership and Restrictions +We retain all ownership and intellectual property rights in the Program as +provided by us. You retain all ownership and intellectual property rights +in your modifications. + +Export +You agree to comply fully with export laws and regulations of the United +States and any other applicable export laws ("Export Laws") to assure that +neither the Program nor any direct products thereof are: (1) exported, +directly or indirectly, in violation of this Agreement or Export Laws; or +(2) used for any purposes prohibited by the Export Laws, including, without +limitation, nuclear, chemical, or biological weapons proliferation, or +development of missile technology. + +Disclaimer of Warranty and Limitation of Liability +THE PROGRAM IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. USE AT YOUR +OWN RISK. WE FURTHER DISCLAIM ALL WARRANTIES, EXPRESS AND IMPLIED, +INCLUDING WITHOUT LIMITATION, ANY IMPLIED WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE OR NONINFRINGEMENT. + +IN NO EVENT SHALL WE BE LIABLE FOR ANY INDIRECT, DIRECT, INCIDENTAL, +SPECIAL, PUNITIVE OR CONSEQUENTIAL DAMAGES, OR DAMAGES FOR LOSS OF PROFITS, +REVENUE, DATA OR DATA USE, INCURRED BY YOU OR ANY THIRD PARTY, WHETHER IN AN +ACTION IN CONTRACT OR TORT, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. ORACLE SHALL HAVE NO LIABILITY FOR MODIFICATIONS MADE BY +YOU OR ANY THIRD PARTY. + +Entire Agreement +You agree that this Agreement is the complete agreement for the Program, and +this Agreement supersedes all prior or contemporaneous agreements or +representations. If any term of this Agreement is found to be invalid or +unenforceable, the remaining provisions will remain effective. This +Agreement is governed by the substantive and procedural laws of California. +You and Oracle agree to submit to the exclusive jurisdiction of, and venue +in, the courts of San Francisco or Santa Clara counties in California in +any dispute between you and Oracle arising out of or relating to this +Agreement. + +Last updated: 14 June 2013