Ian Maxon has submitted this change and it was merged. Change subject: Add other licenses to LICENSE, fix source assembly ......................................................................
Add other licenses to LICENSE, fix source assembly Change-Id: I43b6844aabf917ebec48a03cf5616735809077cf Reviewed-on: https://asterix-gerrit.ics.uci.edu/383 Tested-by: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- M LICENSE.txt A NOTICE M src/main/assembly/source.xml 3 files changed, 125 insertions(+), 0 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: Verified diff --git a/LICENSE.txt b/LICENSE.txt index d645695..5465b54 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -200,3 +200,108 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. + + +ASTERIXDB COMPONENTS: + +AsterixDB includes a number of subcomponents with separate copyright +notices and license terms. Your use of the source code for these +subcomponents is subject to the terms and condition of the following +licenses. + +For portions of the AsterixDB WebUI at: +asterix-app/src/main/resources/webui/static/js/jquery.min.js +and +asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js + + Copyright jQuery Foundation and other contributors, https://jquery.org/ + + This software consists of voluntary contributions made by many + individuals. For exact contribution history, see the revision history + available at https://github.com/jquery/jquery + + The following license applies to all parts of this software except as + documented below: + + ==== + + 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 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. + + ==== + + All files located in the node_modules and external directories are + externally maintained libraries used by this software which have their + own licenses; we recommend you read them, as their terms may differ from + the terms above. + +as well as portions of the WebUI at: +asterix-app/src/main/resources/webui/static/js/bootstrap.min.js + + The MIT License (MIT) + + Copyright (c) 2011-2015 Twitter, Inc + + 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 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. + + +and portions of the WebUI at: +asterix-app/src/main/resources/webui/static/js/smoothie.js +and +asterix-app/src/main/resources/feed/smoothie.js + + MIT License + ----------- + + Copyright (c) 2010-2013, Joe Walnes + 2013-2014, Drew Noakes + + 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 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. diff --git a/NOTICE b/NOTICE new file mode 100644 index 0000000..6285a2e --- /dev/null +++ b/NOTICE @@ -0,0 +1,5 @@ +Apache AsterixDB +Copyright 2015 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). diff --git a/src/main/assembly/source.xml b/src/main/assembly/source.xml index 210c49a..f879f80 100644 --- a/src/main/assembly/source.xml +++ b/src/main/assembly/source.xml @@ -34,6 +34,21 @@ <include>**/pom.xml</include> <include>**/build*.xml</include> <include>**/findbugs*.xml</include> + <include>**/*site.xml</include> + <include>**/*.adm</include> + <include>**/*.json</include> + <include>**/*.aql</include> + <include>**/*.ddl</include> + <include>**/*.seq</include> + <include>**/*.rc</include> + <include>**/*.big</include> + <include>**/*textFileS</include> + <include>**/*large_text</include> + <include>**/*.csv*</include> + <include>**/*.tbl</include> + <include>**/*.txt</include> + <include>**/part-*</include> + <include>**/*.cleaned</include> </includes> <excludes> <exclude>**/${project.build.directory}/**</exclude> -- To view, visit https://asterix-gerrit.ics.uci.edu/383 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I43b6844aabf917ebec48a03cf5616735809077cf Gerrit-PatchSet: 2 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Ian Maxon <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
