Michael Blow has submitted this change and it was merged. Change subject: [NO ISSUE][LIC] Incremental progress on dashboard licensing ......................................................................
[NO ISSUE][LIC] Incremental progress on dashboard licensing Change-Id: I85e7cef82d54ff5af1a5942ab368931490b70707 Reviewed-on: https://asterix-gerrit.ics.uci.edu/2462 Tested-by: Michael Blow <[email protected]> Contrib: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Till Westmann <[email protected]> --- M asterixdb/LICENSE M asterixdb/asterix-license/pom.xml M asterixdb/asterix-server/pom.xml M asterixdb/src/main/licenses/templates/source_licenses.ftl 4 files changed, 222 insertions(+), 225 deletions(-) Approvals: Till Westmann: Looks good to me, approved Jenkins: ; Verified Michael Blow: Verified diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE index c49b8b8..7c968b8 100644 --- a/asterixdb/LICENSE +++ b/asterixdb/LICENSE @@ -274,15 +274,6 @@ even a nice Tweet is enough. Of course if you want, you can say thank you and support me by buying more icons on GLYPHICONS.com. --- - Portions of the AsterixDB runtime - located at: - asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/* - - are available under The Apache License, Version 2.0: ---- - Source files in asterix-hivecompat are derived from portions of Apache Hive - Query Language v0.13.0 (org.apache.hive:hive-exec). ---- Portions of the AsterixDB WebUI located at: asterix-app/src/main/resources/webui/static/js/jquery.json-viewer.js, @@ -311,14 +302,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- - - Portions of the File Saver portions of the AsterixDB Dashboard + Portions of the AsterixDB runtime located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.ts, - and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-hivecompat/src/main/java/org/apache/asterix/hivecompat/io/* - are available under the MIT license : + are available under The Apache License, Version 2.0: +--- + Source files in asterix-hivecompat are derived from portions of Apache Hive + Query Language v0.13.0 (org.apache.hive:hive-exec). +--- + Portions of the File Saver portions of the AsterixDB Dashboard + located at: + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.ts, + and + asterix-dashboard/src/main/resources/dashboard/static + + are available under The MIT license : --- The MIT License @@ -343,15 +342,15 @@ --- Portions of the ReactiveX/rxjs located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datasets-collection/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datatypes-collection/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/dataverses-collection/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datasets-collection/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datatypes-collection/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/dataverses-collection/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, + asterix-dashboard/src/main/resources/dashboard/src/app/, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static are available under Apache License 2.0: --- @@ -557,16 +556,16 @@ See the License for the specific language governing permissions and limitations under the License. --- - Portions of the PrimeNG components of the AsterixDB dashboard + Portions of the PrimeNG components of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.ts, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.html, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.scss, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.ts, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.html, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.scss, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.ts, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.html, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.scss, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.ts, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.html, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.scss, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static are available under The MIT License: --- @@ -593,23 +592,23 @@ --- Portions of the NGRX portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datasets-collection/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datatypes-collection/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/dataverses-collection/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static/main.37b7b7cad656490b195a.bundle.js, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static/styles.9f50282210bba5318775.bundle, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static/scripts.da68998bdd77aff4e764.bundle.js, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static/polyfills.32ca5670d6503e090789.bundle.js, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static/inline.66bd6b83f86cf773a001.bundle.js, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datasets-collection/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datatypes-collection/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/dataverses-collection/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, + asterix-dashboard/src/main/resources/dashboard/src/app/, + asterix-dashboard/src/main/resources/dashboard/static/main.37b7b7cad656490b195a.bundle.js, + asterix-dashboard/src/main/resources/dashboard/static/styles.9f50282210bba5318775.bundle, + asterix-dashboard/src/main/resources/dashboard/static/scripts.da68998bdd77aff4e764.bundle.js, + asterix-dashboard/src/main/resources/dashboard/static/polyfills.32ca5670d6503e090789.bundle.js, + asterix-dashboard/src/main/resources/dashboard/static/inline.66bd6b83f86cf773a001.bundle.js, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static/index.html + asterix-dashboard/src/main/resources/dashboard/static/index.html - are available under The MIT License: + are available under The MIT License: --- The MIT License (MIT) @@ -635,18 +634,18 @@ --- Portions of the Codemirror portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.ts, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.html, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.scss, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/codemirror.component.ts, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/codemirror.component.scss, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.ts, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.html, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.scss, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/codemirror-metadata.component.ts, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/codemirror-metadata.component.scss, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.ts, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.html, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.scss, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/codemirror.component.ts, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/codemirror.component.scss, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.ts, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.html, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.scss, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/codemirror-metadata.component.ts, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/codemirror-metadata.component.scss, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static are available under The MIT License: --- @@ -672,9 +671,9 @@ --- Portions of the AngularJS portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/, + asterix-dashboard/src/main/resources/dashboard/src/, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static are available under The MIT License: --- @@ -702,11 +701,11 @@ --- Portions of the Angular Material and HammerJS portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/app/material.module.ts, - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/main.ts, + asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/, + asterix-dashboard/src/main/resources/dashboard/src/app/material.module.ts, + asterix-dashboard/src/main/resources/dashboard/src/main.ts, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static are available under The MIT License: --- @@ -732,9 +731,9 @@ --- Portions of the CoreJS portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/, + asterix-dashboard/src/main/resources/dashboard/src/, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static are available under The MIT License: --- @@ -760,9 +759,9 @@ --- Portions of the Roboto Font portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/index.html, + asterix-dashboard/src/main/resources/dashboard/src/index.html, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static are available under Apache License 2.0: --- @@ -971,9 +970,9 @@ Portions of the Font Awesome portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/index.html, + asterix-dashboard/src/main/resources/dashboard/src/index.html, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static/index.html + asterix-dashboard/src/main/resources/dashboard/static/index.html are available under The MIT License: --- @@ -983,12 +982,12 @@ index.html License: MIT License URL: http://opensource.org/licenses/mit-license.html --- - Portions of the webpack portions of the AsterixDB dashboard + Portions of the webpack portions of the AsterixDB dashboard located at: and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/ + asterix-dashboard/src/main/resources/dashboard/ - are available under The MIT License: + are available under The MIT License: --- Copyright JS Foundation and other contributors @@ -1011,14 +1010,13 @@ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- - Portions of the zonejs portions of the AsterixDB dashboard located at: - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/src/, + asterix-dashboard/src/main/resources/dashboard/src/, and - asterix-app/src/main/resources/asterix-dashboard/src/main/resources/dashboard/static + asterix-dashboard/src/main/resources/dashboard/static - are available under The MIT License: + are available under The MIT License: --- Copyright (c) 2016 Google, Inc. diff --git a/asterixdb/asterix-license/pom.xml b/asterixdb/asterix-license/pom.xml index 55abf98..7097e50 100644 --- a/asterixdb/asterix-license/pom.xml +++ b/asterixdb/asterix-license/pom.xml @@ -89,6 +89,7 @@ <templateProperties> <asterixAppResourcesPrefix>asterix-app/src/main/resources/</asterixAppResourcesPrefix> <hivecompatPrefix>asterix-hivecompat/src/main/java/</hivecompatPrefix> + <asterixDashboardResourcesPrefix>asterix-dashboard/src/main/resources/</asterixDashboardResourcesPrefix> <packageName /> </templateProperties> </configuration> diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index a98cc28..8a28a49 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -233,6 +233,7 @@ <asterixAppLocation>repo/asterix-app-${project.version}.jar, within this assembly</asterixAppLocation> <hyracksControlCcLocation>repo/hyracks-control-cc-${project.version}.jar, within this assembly</hyracksControlCcLocation> <hivecompatLocation>repo/asterix-hivecompat-${project.version}.jar, within this assembly</hivecompatLocation> + <asterixDashboardLocation>repo/asterix-dashboard-${project.version}.jar, within this assembly</asterixDashboardLocation> </templateProperties> </configuration> </plugin> diff --git a/asterixdb/src/main/licenses/templates/source_licenses.ftl b/asterixdb/src/main/licenses/templates/source_licenses.ftl index 7d0d370..7970221 100644 --- a/asterixdb/src/main/licenses/templates/source_licenses.ftl +++ b/asterixdb/src/main/licenses/templates/source_licenses.ftl @@ -16,36 +16,42 @@ ! specific language governing permissions and limitations ! under the License. --> -<#macro license files component="AsterixDB WebUI" location="${asterixAppLocation!}" - filePrefix="${asterixAppResourcesPrefix!}" - licenseName="the following license"> +<#macro license files component="${licenseComponent}" location="${licenseLocation}" + filePrefix="${licenseFilePrefix}" + licenseName="the following license"> Portions of the ${component} -<#if location?has_content> +<#if !licenseSkipLocations!false> + <#if location?has_content> in: ${location} -</#if> + </#if> located at: -<#if files?is_sequence> -<#list files as file> -<#if file?counter < files?size> + <#if files?is_sequence> + <#list files as file> + <#if file?counter < files?size> ${filePrefix}${file}, -<#else> + <#else> and ${filePrefix}${file} -</#if> -</#list> -<#else> + </#if> + </#list> + <#else> ${filePrefix}${files} + </#if> </#if> are available under ${licenseName}: --- -<@indent spaces=3 unpad=true wrap=true> -<#nested> -</@indent> + <@indent spaces=3 unpad=true wrap=true> + <#nested> + </@indent> --- </#macro> -<@license files=["webui/static/js/jquery.min.js", "webui/static/js/jquery.autosize-min.js", "queryui/js/jquery-1.12.4.min.js"] - licenseName="an MIT-style license"> +<#if !asterixAppSkip!false> + <#assign licenseComponent="AsterixDB WebUI"/> + <#assign licenseLocation="${asterixAppLocation!}"/> + <#assign licenseFilePrefix="${asterixAppResourcesPrefix!}"/> + <@license files=["webui/static/js/jquery.min.js", "webui/static/js/jquery.autosize-min.js", "queryui/js/jquery-1.12.4.min.js"] + licenseName="an MIT-style license"> Copyright jQuery Foundation and other contributors, https://jquery.org/ This software consists of voluntary contributions made by many @@ -82,8 +88,13 @@ 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. -</@license> -<@license files=["webui/static/js/bootstrap.min.js", "webui/static/css/bootstrap-responsive.min.css", "webui/static/css/bootstrap.min.css", "webui/static/img/glyphicons-halflings-white.png", "webui/static/img/glyphicons-halflings.png"]> + </@license> + <@license files=[ + "webui/static/js/bootstrap.min.js", + "webui/static/css/bootstrap-responsive.min.css", + "webui/static/css/bootstrap.min.css", + "webui/static/img/glyphicons-halflings-white.png", + "webui/static/img/glyphicons-halflings.png"]> Copyright 2012 Twitter, Inc. http://www.apache.org/licenses/LICENSE-2.0.txt @@ -96,14 +107,9 @@ Bootstrap-based projects, I would certainly appreciate any form of support, even a nice Tweet is enough. Of course if you want, you can say thank you and support me by buying more icons on GLYPHICONS.com. -</@license> -<@license component="AsterixDB runtime" files="org/apache/asterix/hivecompat/io/*" - licenseName="The Apache License, Version 2.0" - location="${hivecompatLocation!}" filePrefix="${hivecompatPrefix!}"> -Source files in asterix-hivecompat are derived from portions of Apache Hive Query Language v0.13.0 (org.apache.hive:hive-exec). -</@license> -<@license component="AsterixDB WebUI" licenseName="The MIT License" - files=["webui/static/js/jquery.json-viewer.js","webui/static/css/jquery.json-viewer.css"]> + </@license> + <@license component="AsterixDB WebUI" licenseName="The MIT License" + files=["webui/static/js/jquery.json-viewer.js","webui/static/css/jquery.json-viewer.css"]> Copyright (c) 2014 Alexandre Bodelot Permission is hereby granted, free of charge, to any person obtaining a copy @@ -123,13 +129,24 @@ 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. -</@license> - -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.ts", -"asterix-dashboard/src/main/resources/dashboard/static"] - component=" File Saver portions of the AsterixDB Dashboard" - licenseName=" the MIT license "> + </@license> +</#if> +<#if !hivecompatSkip!false> + <@license component="AsterixDB runtime" files="org/apache/asterix/hivecompat/io/*" + licenseName="The Apache License, Version 2.0" + location="${hivecompatLocation!}" filePrefix="${hivecompatPrefix!}"> +Source files in asterix-hivecompat are derived from portions of Apache Hive Query Language v0.13.0 (org.apache.hive:hive-exec). + </@license> +</#if> +<#if !asterixDashboardSkip!false> + <#assign licenseComponent="AsterixDB Dashboard"/> + <#assign licenseLocation="${asterixDashboardLocation!}"/> + <#assign licenseFilePrefix="${asterixDashboardResourcesPrefix!}"/> + <@license files=[ + "dashboard/src/app/dashboard/query/output.component.ts", + "dashboard/static"] + component="File Saver portions of the AsterixDB Dashboard" + licenseName="The MIT license "> The MIT License Copyright © 2016 Eli Grey. @@ -150,18 +167,18 @@ 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. -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datasets-collection/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datatypes-collection/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/dataverses-collection/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/", -"asterix-dashboard/src/main/resources/dashboard/src/app/", -"asterix-dashboard/src/main/resources/dashboard/static"] - component="ReactiveX/rxjs" - licenseName="Apache License 2.0"> + </@license> + <@license files=[ + "dashboard/src/app/dashboard/metadata/", + "dashboard/src/app/dashboard/metadata/datasets-collection/", + "dashboard/src/app/dashboard/metadata/datatypes-collection/", + "dashboard/src/app/dashboard/metadata/dataverses-collection/", + "dashboard/src/app/dashboard/query/", + "dashboard/src/app/dashboard/", + "dashboard/src/app/", + "dashboard/static"] + component="ReactiveX/rxjs" + licenseName="Apache License 2.0"> Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -363,19 +380,17 @@ 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. -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.ts", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.html", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/output.component.scss", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.ts", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.html", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/metadata.component.scss", -"asterix-dashboard/src/main/resources/dashboard/static"] - component=" PrimeNG components of the AsterixDB dashboard" - licenseName="The MIT License"> - - + </@license> + <@license files=[ + "dashboard/src/app/dashboard/query/output.component.ts", + "dashboard/src/app/dashboard/query/output.component.html", + "dashboard/src/app/dashboard/query/output.component.scss", + "dashboard/src/app/dashboard/query/metadata.component.ts", + "dashboard/src/app/dashboard/query/metadata.component.html", + "dashboard/src/app/dashboard/query/metadata.component.scss", + "dashboard/static"] + component="PrimeNG components of the AsterixDB dashboard" + licenseName="The MIT License"> The MIT License (MIT) Copyright (c) 2016-2017 PrimeTek @@ -396,27 +411,24 @@ 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. - -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datasets-collection/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/datatypes-collection/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/dataverses-collection/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/", -"asterix-dashboard/src/main/resources/dashboard/src/app/", -"asterix-dashboard/src/main/resources/dashboard/static/main.37b7b7cad656490b195a.bundle.js", -"asterix-dashboard/src/main/resources/dashboard/static/styles.9f50282210bba5318775.bundle", -"asterix-dashboard/src/main/resources/dashboard/static/scripts.da68998bdd77aff4e764.bundle.js", -"asterix-dashboard/src/main/resources/dashboard/static/polyfills.32ca5670d6503e090789.bundle.js", -"asterix-dashboard/src/main/resources/dashboard/static/inline.66bd6b83f86cf773a001.bundle.js", -"asterix-dashboard/src/main/resources/dashboard/static/index.html"] - component="NGRX portions of the AsterixDB dashboard" - licenseName=" The MIT License"> - - + </@license> + <@license files=[ + "dashboard/src/app/dashboard/metadata/", + "dashboard/src/app/dashboard/metadata/datasets-collection/", + "dashboard/src/app/dashboard/metadata/datatypes-collection/", + "dashboard/src/app/dashboard/metadata/dataverses-collection/", + "dashboard/src/app/dashboard/query/", + "dashboard/src/app/dashboard/", + "dashboard/src/app/dashboard/", + "dashboard/src/app/", + "dashboard/static/main.37b7b7cad656490b195a.bundle.js", + "dashboard/static/styles.9f50282210bba5318775.bundle", + "dashboard/static/scripts.da68998bdd77aff4e764.bundle.js", + "dashboard/static/polyfills.32ca5670d6503e090789.bundle.js", + "dashboard/static/inline.66bd6b83f86cf773a001.bundle.js", + "dashboard/static/index.html"] + component="NGRX portions of the AsterixDB dashboard" + licenseName="The MIT License"> The MIT License (MIT) Copyright (c) 2017 Brandon Roberts, Mike Ryan, Victor Savkin, Rob Wormald @@ -438,24 +450,21 @@ 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. - -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.ts", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.html", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/input.component.scss", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/codemirror.component.ts", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/query/codemirror.component.scss", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.ts", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.html", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/input-metadata.component.scss", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/codemirror-metadata.component.ts", -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/metadata/codemirror-metadata.component.scss", -"asterix-dashboard/src/main/resources/dashboard/static"] - component="Codemirror portions of the AsterixDB dashboard" - licenseName="The MIT License"> - - + </@license> + <@license files=[ + "dashboard/src/app/dashboard/query/input.component.ts", + "dashboard/src/app/dashboard/query/input.component.html", + "dashboard/src/app/dashboard/query/input.component.scss", + "dashboard/src/app/dashboard/query/codemirror.component.ts", + "dashboard/src/app/dashboard/query/codemirror.component.scss", + "dashboard/src/app/dashboard/metadata/input-metadata.component.ts", + "dashboard/src/app/dashboard/metadata/input-metadata.component.html", + "dashboard/src/app/dashboard/metadata/input-metadata.component.scss", + "dashboard/src/app/dashboard/metadata/codemirror-metadata.component.ts", + "dashboard/src/app/dashboard/metadata/codemirror-metadata.component.scss", + "dashboard/static"] + component="Codemirror portions of the AsterixDB dashboard" + licenseName="The MIT License"> Copyright (C) 2017 by Marijn Haverbeke <[email protected]> and others Permission is hereby granted, free of charge, to any person obtaining a copy @@ -475,15 +484,12 @@ 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. - -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/", -"asterix-dashboard/src/main/resources/dashboard/static"] - component="AngularJS portions of the AsterixDB dashboard" - licenseName="The MIT License"> - - + </@license> + <@license files=[ + "dashboard/src/", + "dashboard/static"] + component="AngularJS portions of the AsterixDB dashboard" + licenseName="The MIT License"> The MIT License Copyright (c) 2014-2017 Google, Inc. http://angular.io @@ -505,16 +511,14 @@ 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. - -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/app/dashboard/", -"asterix-dashboard/src/main/resources/dashboard/src/app/material.module.ts", -"asterix-dashboard/src/main/resources/dashboard/src/main.ts", -"asterix-dashboard/src/main/resources/dashboard/static"] - component="Angular Material and HammerJS portions of the AsterixDB dashboard" - licenseName="The MIT License"> - + </@license> + <@license files=[ + "dashboard/src/app/dashboard/", + "dashboard/src/app/material.module.ts", + "dashboard/src/main.ts", + "dashboard/static"] + component="Angular Material and HammerJS portions of the AsterixDB dashboard" + licenseName="The MIT License"> Copyright (c) 2017 Google LLC. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -534,15 +538,12 @@ 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. - -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/", -"asterix-dashboard/src/main/resources/dashboard/static"] - component="CoreJS portions of the AsterixDB dashboard" - licenseName="The MIT License"> - - + </@license> + <@license files=[ + "dashboard/src/", + "dashboard/static"] + component="CoreJS portions of the AsterixDB dashboard" + licenseName="The MIT License"> Copyright (c) 2014-2017 Denis Pushkarev Permission is hereby granted, free of charge, to any person obtaining a copy @@ -562,13 +563,12 @@ 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. - -</@license> -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/index.html", -"asterix-dashboard/src/main/resources/dashboard/static"] - component="Roboto Font portions of the AsterixDB dashboard" - licenseName="Apache License 2.0"> + </@license> + <@license files=[ + "dashboard/src/index.html", + "dashboard/static"] + component="Roboto Font portions of the AsterixDB dashboard" + licenseName="Apache License 2.0"> Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ @@ -771,8 +771,8 @@ See the License for the specific language governing permissions and limitations under the License.</@license> <@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/index.html", -"asterix-dashboard/src/main/resources/dashboard/static/index.html"] +"dashboard/src/index.html", +"dashboard/static/index.html"] component="Font Awesome portions of the AsterixDB dashboard" licenseName="The MIT License"> @@ -782,11 +782,10 @@ index.html License: MIT License URL: http://opensource.org/licenses/mit-license.html - </@license> -<@license files=["asterix-dashboard/src/main/resources/dashboard/"] - component=" webpack portions of the AsterixDB dashboard" - licenseName=" The MIT License"> +<@license files=["dashboard/"] + component="webpack portions of the AsterixDB dashboard" + licenseName="The MIT License"> Copyright JS Foundation and other contributors Permission is hereby granted, free of charge, to any person obtaining @@ -807,15 +806,12 @@ 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. - -</@license> - -<@license files=[ -"asterix-dashboard/src/main/resources/dashboard/src/", -"asterix-dashboard/src/main/resources/dashboard/static"] - component="zonejs portions of the AsterixDB dashboard" - licenseName=" The MIT License"> - + </@license> + <@license files=[ + "dashboard/src/", + "dashboard/static"] + component="zonejs portions of the AsterixDB dashboard" + licenseName="The MIT License"> Copyright (c) 2016 Google, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy @@ -835,4 +831,5 @@ 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. -</@license> + </@license> +</#if> -- To view, visit https://asterix-gerrit.ics.uci.edu/2462 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I85e7cef82d54ff5af1a5942ab368931490b70707 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Michael Blow <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Michael Blow <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]>
