Merge branch 'spark2-doc' into spark2-merge
diff --git a/LICENSE b/LICENSE
index eb94865..9c8f3ea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -173,242 +173,29 @@
       incurred by, or claims asserted against, such Contributor by reason
       of your accepting any such warranty or additional liability.
 
----------------------------------------------------
+   END OF TERMS AND CONDITIONS
 
-The Apache Griffin contains subcomponents in the source code
-release with separate copyright notices and license terms. Your use of
-the source code for the these subcomponents is subject to the terms and
-conditions of their respective licenses.
+   APPENDIX: How to apply the Apache License to your work.
 
-----------------------------------------------
-Public Domain
-----------------------------------------------
-The following components are provided in Public Domain. See project link for details.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
 
-     (Public Domain) XZ for Java (org.tukaani:xz:1.0 - http://tukaani.org/xz/java.html)
-     (Public Domain) AOP alliance (aopalliance:aopalliance:1.0 - http://aopalliance.sourceforge.net)
-     (Public Domain) XZ for Java (org.tukaani:xz:1.0 - http://tukaani.org/xz/java.html)
+   Copyright {yyyy} {name of copyright owner}
 
-----------------------------------------------
-JSON license
-----------------------------------------------
-The following components are provided under a JSON license. See project link for details.
-The text of each license is also included at licenses/JSON.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
 
-     (The JSON License) JSON in Java (org.json:json:20140107 - https://github.com/douglascrockford/JSON-java)
+       http://www.apache.org/licenses/LICENSE-2.0
 
-----------------------------------------------
-The PostgreSQL License
-----------------------------------------------
-The following components are provided under a PostgreSQL license. See project link for details.
-The text of each license is also included at licenses/PostgreSQL.
-
-     (The PostgreSQL License) PostgreSQL JDBC Driver - JDBC 4.1 (org.postgresql:postgresql:9.4.1212.jre7 - https://github.com/pgjdbc/pgjdbc-parent-poms/pgjdbc-core-parent/pgjdbc-core-prevjre/postgresql)
-
-----------------------------------------------
-EPL license
-----------------------------------------------
-The following components are provided under a EPL license. See project link for details.
-The text of each license is also included at licenses/EPL.
-
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) Javax Persistence (org.eclipse.persistence:javax.persistence:2.1.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink ANTLR (org.eclipse.persistence:org.eclipse.persistence.antlr:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink ASM (org.eclipse.persistence:org.eclipse.persistence.asm:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink Core (org.eclipse.persistence:org.eclipse.persistence.core:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink JPA (org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink Hermes JPQL Parser (org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.1.9 - http://logback.qos.ch/logback-classic)
-     (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.1.9 - http://logback.qos.ch/logback-core)
-     (MPL 2.0 or EPL 1.0) H2 Database Engine (com.h2database:h2:1.4.193 - http://www.h2database.com)
-     (Eclipse Public License - v 1.0) AspectJ weaver (org.aspectj:aspectjweaver:1.8.9 - http://www.aspectj.org)
-     (GNU LESSER GENERAL PUBLIC LICENSE)(Eclipse Public License) c3p0:JDBC DataSources/Resource Pools (c3p0:c3p0:0.9.1.1 - http://c3p0.sourceforge.net)
-
-----------------------------------------------
-CDDL licenses
-----------------------------------------------
-The following components are provided under a CDDL license. See project link for details.
-The text of each license is also included at licenses/CDDL-1.0 and licenses/CDDL-1.1.
-
-     (CDDL) (GPLv2+CE) JavaMail API (com.sun.mail:javax.mail:1.4.4 - http://kenai.com/projects/javamail/javax.mail)
-     (Common Development and Distribution License (CDDL) v1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
-     (CDDL license) jsp-api (javax.servlet.jsp:jsp-api:2.1 - no url defined)
-     (CDDL-1.0 license) Java Transaction API (javax.transaction:jta:1.1 - http://java.sun.com/products/jta)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:1.9 - https://jersey.java.net/jersey-client/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:1.9 - https://jersey.java.net/jersey-core/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:1.9 - https://jersey.java.net/jersey-json/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-server (com.sun.jersey:jersey-server:1.9 - https://jersey.java.net/jersey-server/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-guice (com.sun.jersey.contribs:jersey-guice:1.9 - https://jersey.java.net/jersey-contribs/jersey-guice/)
-     (CDDL 1.1) (GPL2 w/ CPE) JAXB RI (com.sun.xml.bind:jaxb-impl:2.2.3-1 - http://jaxb.java.net/)
-     (Common Development and Distribution License (CDDL) v1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
-     (CDDL + GPLv2 with classpath exception) javax.transaction API (javax.transaction:javax.transaction-api:1.2 - http://jta-spec.java.net)
-     (CDDL 1.1) (GPL2 w/ CPE) JAXB API bundle for GlassFish V3 (javax.xml.bind:jaxb-api:2.2.2 - https://jaxb.dev.java.net/)
-     (COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) (GNU General Public Library) Streaming API for XML (javax.xml.stream:stax-api:1.0-2 - no url defined)
-
-----------------------------------------------
-BSD-style licenses
-----------------------------------------------
-The following components are provided under a BSD-style license. See project link for details.
-The text of each license is also included at licenses/BSD-3-Clause and licenses/BSD-2-Clause.
-
-     (BSD) ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 - http://paranamer.codehaus.org/paranamer)
-     (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.6 - http://www.scala-lang.org/)
-     (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.10.6 - http://www.scala-lang.org/)
-     (BSD license) ASM Core (asm:asm:3.1 - http://asm.objectweb.org/asm/)
-     (BSD license) dom4j (dom4j:dom4j:1.6.1 - http://dom4j.org)
-     (BSD license) Antlr 3.4 Runtime (org.antlr:antlr-runtime:3.4 - http://www.antlr.org)
-     (BSD License) AntLR Parser Generator (antlr:antlr:2.7.7 - http://www.antlr.org/)
-     (New BSD License) Kryo (com.esotericsoftware.kryo:kryo:2.22 - http://code.google.com/p/kryo/)
-     (New BSD license) Protocol Buffer Java API (com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf)
-     (BSD) ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 - http://paranamer.codehaus.org/paranamer)
-     (BSD licence) ANTLR StringTemplate (org.antlr:stringtemplate:3.2.1 - http://www.stringtemplate.org)
-     (The BSD 3-Clause License) leveldbjni-all (org.fusesource.leveldbjni:leveldbjni-all:1.8 - http://leveldbjni.fusesource.org/leveldbjni-all)
-     (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.4 - http://www.scala-lang.org/)
-     (The BSD License) xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net)
-
-----------------------------------------------
-MIT licenses
-----------------------------------------------
-The following components are provided under a MIT license. See project link for details.
-The text of each license is also included at licenses/MIT.
-
-     (MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org)
-     (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org)
-     (MIT License) JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.22 - http://www.slf4j.org)
-     (MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.22 - http://www.slf4j.org)
-     (MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.22 - http://www.slf4j.org)
-     (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.22 - http://www.slf4j.org)
-
-
----------------------------------------------------
-
-This project includes the software: angular
-  Available at: https://angular.io
-  Version used: 4.4.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2014-2016 Google, Inc.
-
-This project includes the software: echarts
-  Available at: http://echarts.baidu.com
-  Version used: 3.7.0
-  Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) 2013, Baidu Inc.
-
-This project includes the software: Font Awesome (code)
-  Available at: http://fontawesome.io
-  Inclusive of: font-awesome/{css,scss,less}/*
-  Version used: 4.7.0
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) Dave Gandy (2016)
-
-This project includes the software: Font Awesome (fonts)
-  Available at: http://fontawesome.io
-  Inclusive of: font-awesome/fonts/*
-  Version used: 4.7.0
-  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
-  See details in licenses/SIL-OFL-1.1
-  Copyright (c) Dave Gandy (2016)
-
-This project includes the software: requirejs
-  Available at: http://requirejs.org
-  Version used: 2.2.0
-  Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) 2010-2015, The Dojo Foundation
-
-This project includes the software: jQuery JavaScript Library
-  Available at: http://jquery.com
-  Developed by: The jQuery Foundation (http://jquery.org/)
-  Inclusive of: jquery.js
-  Version used: 3.2.1
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright 2018 The jQuery Foundation
-
-This project includes the software: angular2-multiselect-dropdown
-  Available at: http://cuppalabs.github.io/components/multiselectDropdown
-  Version used: 1.3.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2009-2017, Cuppa Labs. All rights reserved and copyrighted to Pradeep Kumar Terli.
-
-This project includes the software: angular2-toaster
-  Available at: https://github.com/Stabzs/Angular2-Toaster
-  Version used: 4.0.1
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2016-2017 Stabzs.
-
-This project includes the software: Twitter Bootstrap
-  Available at: https://getbootstrap.com
-  Version used: 3.3.7
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2011-2014 Twitter, Inc
-
-This project includes the software: Glyphicons Halflings(glyphicons-halflings-regular.*)
-  Available at: http://glyphicons.com
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2010 - 2016 Jan Kovarik
-
-This project includes the software: nouislider
-  Available at: https://refreshless.com/nouislider
-  Version used: 11.0.3
-  Used under the following license: WTFPL
-  See details in licenses/WTFPL
-
-This project includes the software: ng2-nouislider
-  Available at: http://tb.github.io/ng2-nouislider
-  Version used: 1.7.6
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: angular-tree-component
-  Available at: https://angular2-tree.readme.io/docs
-  Version used: 4.1.0
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: angular2-datatable
-  Available at: https://github.com/mariuszfoltak/angular2-datatable
-  Version used: 0.6.0
-  Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
-This project includes the software: rxjs
-  Available at: http://reactivex.io/rxjs
-  Version used: 5.4.2
-  Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
-This project includes the software: webpack
-  Available at: https://webpack.js.org
-  Version used: 3.5.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: css-loader
-  Available at:  https://github.com/webpack-contrib/css-loader
-  Version used: 0.28.7
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: lodash
-  Available at:  https://github.com/lodash/lodash
-  Version used: 4.17.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: mobx-angular
-  Available at:  https://github.com/mobxjs/mobx-angular
-  Version used: 1.5.0
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: mobx
-  Available at:  https://mobx.js.org/
-  Version used: 3.1.11
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: style-loader
-  Available at:  https://github.com/webpack-contrib/style-loader
-  Version used: 0.13.2
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: tslib
-  Available at:  http://www.tslib.org/
-  Version used: 0.13.2
-  Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
----------------------------------------------------
-
-All the dependent components licenses are listed in licenses/ directory.
\ No newline at end of file
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   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.
\ No newline at end of file
diff --git a/griffin-doc/measure/measure-configuration-guide.md b/griffin-doc/measure/measure-configuration-guide.md
index 0db3643..53f173c 100644
--- a/griffin-doc/measure/measure-configuration-guide.md
+++ b/griffin-doc/measure/measure-configuration-guide.md
@@ -191,8 +191,8 @@
 	+ hive data connector
 		* database: data base name, optional, "default" as default.
 		* table.name: table name.
-		* partitions: partition conditions string, split by ";" and ",", optional. 
-			e.g. `dt=20170410, hour=15; dt=20170411, hour=15; dt=20170412, hour=15`
+		* where: where conditions string, split by ",", optional.
+			e.g. `dt=20170410 AND hour=15, dt=20170411 AND hour=15, dt=20170412 AND hour=15`
 	+ text dir data connector
 		* dir.path: parent directory path.
 		* data.dir.depth: integer, depth of data directories, 0 as default.
diff --git a/licenses/BSD-2-Clause b/licenses/BSD-2-Clause
deleted file mode 100644
index c964b53..0000000
--- a/licenses/BSD-2-Clause
+++ /dev/null
@@ -1,22 +0,0 @@
-The BSD 2-Clause License
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY 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.
\ No newline at end of file
diff --git a/licenses/BSD-3-Clause b/licenses/BSD-3-Clause
deleted file mode 100644
index c3ca1b9..0000000
--- a/licenses/BSD-3-Clause
+++ /dev/null
@@ -1,26 +0,0 @@
-The BSD 3-Clause License ("New BSD")
-
-  Redistribution and use in source and binary forms, with or without modification,
-  are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-  this list of conditions and the following disclaimer.
-
-  2. Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-  3. Neither the name of the copyright holder nor the names of its contributors
-  may be used to endorse or promote products derived from this software without
-  specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 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.
\ No newline at end of file
diff --git a/licenses/CDDL-1.0 b/licenses/CDDL-1.0
deleted file mode 100644
index 253f4cc..0000000
--- a/licenses/CDDL-1.0
+++ /dev/null
@@ -1,363 +0,0 @@
-Common Development and Distribution License 1.0
-
-  1. Definitions.
-
-      1.1. "Contributor" means each individual or entity that creates
-           or contributes to the creation of Modifications.
-
-      1.2. "Contributor Version" means the combination of the Original
-           Software, prior Modifications used by a Contributor (if any),
-           and the Modifications made by that particular Contributor.
-
-      1.3. "Covered Software" means (a) the Original Software, or (b)
-           Modifications, or (c) the combination of files containing
-           Original Software with files containing Modifications, in
-           each case including portions thereof.
-
-      1.4. "Executable" means the Covered Software in any form other
-           than Source Code.
-
-      1.5. "Initial Developer" means the individual or entity that first
-           makes Original Software available under this License.
-
-      1.6. "Larger Work" means a work which combines Covered Software or
-           portions thereof with code not governed by the terms of this
-           License.
-
-      1.7. "License" means this document.
-
-      1.8. "Licensable" means having the right to grant, to the maximum
-           extent possible, whether at the time of the initial grant or
-           subsequently acquired, any and all of the rights conveyed
-           herein.
-
-      1.9. "Modifications" means the Source Code and Executable form of
-           any of the following:
-
-          A. Any file that results from an addition to, deletion from or
-             modification of the contents of a file containing Original
-             Software or previous Modifications;
-
-          B. Any new file that contains any part of the Original
-             Software or previous Modifications; or
-
-          C. Any new file that is contributed or otherwise made
-             available under the terms of this License.
-
-      1.10. "Original Software" means the Source Code and Executable
-            form of computer software code that is originally released
-            under this License.
-
-      1.11. "Patent Claims" means any patent claim(s), now owned or
-            hereafter acquired, including without limitation, method,
-            process, and apparatus claims, in any patent Licensable by
-            grantor.
-
-      1.12. "Source Code" means (a) the common form of computer software
-            code in which modifications are made and (b) associated
-            documentation included in or with such code.
-
-      1.13. "You" (or "Your") means an individual or a legal entity
-            exercising rights under, and complying with all of the terms
-            of, this License.  For legal entities, "You" includes any
-            entity which controls, is controlled by, or is under common
-            control with You.  For purposes of this definition,
-            "control" means (a) the power, direct or indirect, to cause
-            the direction or management of such entity, whether by
-            contract or otherwise, or (b) ownership of more than fifty
-            percent (50%) of the outstanding shares or beneficial
-            ownership of such entity.
-
-  2. License Grants.
-
-      2.1. The Initial Developer Grant.
-
-      Conditioned upon Your compliance with Section 3.1 below and
-      subject to third party intellectual property claims, the Initial
-      Developer hereby grants You a world-wide, royalty-free,
-      non-exclusive license:
-
-          (a) under intellectual property rights (other than patent or
-              trademark) Licensable by Initial Developer, to use,
-              reproduce, modify, display, perform, sublicense and
-              distribute the Original Software (or portions thereof),
-              with or without Modifications, and/or as part of a Larger
-              Work; and
-
-          (b) under Patent Claims infringed by the making, using or
-              selling of Original Software, to make, have made, use,
-              practice, sell, and offer for sale, and/or otherwise
-              dispose of the Original Software (or portions thereof).
-
-          (c) The licenses granted in Sections 2.1(a) and (b) are
-              effective on the date Initial Developer first distributes
-              or otherwise makes the Original Software available to a
-              third party under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-              granted: (1) for code that You delete from the Original
-              Software, or (2) for infringements caused by: (i) the
-              modification of the Original Software, or (ii) the
-              combination of the Original Software with other software
-              or devices.
-
-      2.2. Contributor Grant.
-
-      Conditioned upon Your compliance with Section 3.1 below and
-      subject to third party intellectual property claims, each
-      Contributor hereby grants You a world-wide, royalty-free,
-      non-exclusive license:
-
-          (a) under intellectual property rights (other than patent or
-              trademark) Licensable by Contributor to use, reproduce,
-              modify, display, perform, sublicense and distribute the
-              Modifications created by such Contributor (or portions
-              thereof), either on an unmodified basis, with other
-              Modifications, as Covered Software and/or as part of a
-              Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-              selling of Modifications made by that Contributor either
-              alone and/or in combination with its Contributor Version
-              (or portions of such combination), to make, use, sell,
-              offer for sale, have made, and/or otherwise dispose of:
-              (1) Modifications made by that Contributor (or portions
-              thereof); and (2) the combination of Modifications made by
-              that Contributor with its Contributor Version (or portions
-              of such combination).
-
-          (c) The licenses granted in Sections 2.2(a) and 2.2(b) are
-              effective on the date Contributor first distributes or
-              otherwise makes the Modifications available to a third
-              party.
-
-          (d) Notwithstanding Section 2.2(b) above, no patent license is
-              granted: (1) for any code that Contributor has deleted
-              from the Contributor Version; (2) for infringements caused
-              by: (i) third party modifications of Contributor Version,
-              or (ii) the combination of Modifications made by that
-              Contributor with other software (except as part of the
-              Contributor Version) or other devices; or (3) under Patent
-              Claims infringed by Covered Software in the absence of
-              Modifications made by that Contributor.
-
-  3. Distribution Obligations.
-
-      3.1. Availability of Source Code.
-
-      Any Covered Software that You distribute or otherwise make
-      available in Executable form must also be made available in Source
-      Code form and that Source Code form must be distributed only under
-      the terms of this License.  You must include a copy of this
-      License with every copy of the Source Code form of the Covered
-      Software You distribute or otherwise make available.  You must
-      inform recipients of any such Covered Software in Executable form
-      as to how they can obtain such Covered Software in Source Code
-      form in a reasonable manner on or through a medium customarily
-      used for software exchange.
-
-      3.2. Modifications.
-
-      The Modifications that You create or to which You contribute are
-      governed by the terms of this License.  You represent that You
-      believe Your Modifications are Your original creation(s) and/or
-      You have sufficient rights to grant the rights conveyed by this
-      License.
-
-      3.3. Required Notices.
-
-      You must include a notice in each of Your Modifications that
-      identifies You as the Contributor of the Modification.  You may
-      not remove or alter any copyright, patent or trademark notices
-      contained within the Covered Software, or any notices of licensing
-      or any descriptive text giving attribution to any Contributor or
-      the Initial Developer.
-
-      3.4. Application of Additional Terms.
-
-      You may not offer or impose any terms on any Covered Software in
-      Source Code form that alters or restricts the applicable version
-      of this License or the recipients' rights hereunder.  You may
-      choose to offer, and to charge a fee for, warranty, support,
-      indemnity or liability obligations to one or more recipients of
-      Covered Software.  However, you may do so only on Your own behalf,
-      and not on behalf of the Initial Developer or any Contributor.
-      You must make it absolutely clear that any such warranty, support,
-      indemnity or liability obligation is offered by You alone, and You
-      hereby agree to indemnify the Initial Developer and every
-      Contributor for any liability incurred by the Initial Developer or
-      such Contributor as a result of warranty, support, indemnity or
-      liability terms You offer.
-
-      3.5. Distribution of Executable Versions.
-
-      You may distribute the Executable form of the Covered Software
-      under the terms of this License or under the terms of a license of
-      Your choice, which may contain terms different from this License,
-      provided that You are in compliance with the terms of this License
-      and that the license for the Executable form does not attempt to
-      limit or alter the recipient's rights in the Source Code form from
-      the rights set forth in this License.  If You distribute the
-      Covered Software in Executable form under a different license, You
-      must make it absolutely clear that any terms which differ from
-      this License are offered by You alone, not by the Initial
-      Developer or Contributor.  You hereby agree to indemnify the
-      Initial Developer and every Contributor for any liability incurred
-      by the Initial Developer or such Contributor as a result of any
-      such terms You offer.
-
-      3.6. Larger Works.
-
-      You may create a Larger Work by combining Covered Software with
-      other code not governed by the terms of this License and
-      distribute the Larger Work as a single product.  In such a case,
-      You must make sure the requirements of this License are fulfilled
-      for the Covered Software.
-
-  4. Versions of the License.
-
-      4.1. New Versions.
-
-      Sun Microsystems, Inc. is the initial license steward and may
-      publish revised and/or new versions of this License from time to
-      time.  Each version will be given a distinguishing version number.
-      Except as provided in Section 4.3, no one other than the license
-      steward has the right to modify this License.
-
-      4.2. Effect of New Versions.
-
-      You may always continue to use, distribute or otherwise make the
-      Covered Software available under the terms of the version of the
-      License under which You originally received the Covered Software.
-      If the Initial Developer includes a notice in the Original
-      Software prohibiting it from being distributed or otherwise made
-      available under any subsequent version of the License, You must
-      distribute and make the Covered Software available under the terms
-      of the version of the License under which You originally received
-      the Covered Software.  Otherwise, You may also choose to use,
-      distribute or otherwise make the Covered Software available under
-      the terms of any subsequent version of the License published by
-      the license steward.
-
-      4.3. Modified Versions.
-
-      When You are an Initial Developer and You want to create a new
-      license for Your Original Software, You may create and use a
-      modified version of this License if You: (a) rename the license
-      and remove any references to the name of the license steward
-      (except to note that the license differs from this License); and
-      (b) otherwise make it clear that the license contains terms which
-      differ from this License.
-
-  5. DISCLAIMER OF WARRANTY.
-
-      COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS"
-      BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-      INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED
-      SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR
-      PURPOSE OR NON-INFRINGING.  THE ENTIRE RISK AS TO THE QUALITY AND
-      PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU.  SHOULD ANY
-      COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE
-      INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY
-      NECESSARY SERVICING, REPAIR OR CORRECTION.  THIS DISCLAIMER OF
-      WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.  NO USE OF
-      ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS
-      DISCLAIMER.
-
-  6. TERMINATION.
-
-      6.1. This License and the rights granted hereunder will terminate
-      automatically if You fail to comply with terms herein and fail to
-      cure such breach within 30 days of becoming aware of the breach.
-      Provisions which, by their nature, must remain in effect beyond
-      the termination of this License shall survive.
-
-      6.2. If You assert a patent infringement claim (excluding
-      declaratory judgment actions) against Initial Developer or a
-      Contributor (the Initial Developer or Contributor against whom You
-      assert such claim is referred to as "Participant") alleging that
-      the Participant Software (meaning the Contributor Version where
-      the Participant is a Contributor or the Original Software where
-      the Participant is the Initial Developer) directly or indirectly
-      infringes any patent, then any and all rights granted directly or
-      indirectly to You by such Participant, the Initial Developer (if
-      the Initial Developer is not the Participant) and all Contributors
-      under Sections 2.1 and/or 2.2 of this License shall, upon 60 days
-      notice from Participant terminate prospectively and automatically
-      at the expiration of such 60 day notice period, unless if within
-      such 60 day period You withdraw Your claim with respect to the
-      Participant Software against such Participant either unilaterally
-      or pursuant to a written agreement with Participant.
-
-      6.3. In the event of termination under Sections 6.1 or 6.2 above,
-      all end user licenses that have been validly granted by You or any
-      distributor hereunder prior to termination (excluding licenses
-      granted to You by any distributor) shall survive termination.
-
-  7. LIMITATION OF LIABILITY.
-
-      UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-      (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-      INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-      COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE
-      LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-      CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-      LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK
-      STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-      COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-      INFORMED OF THE POSSIBILITY OF SUCH DAMAGES.  THIS LIMITATION OF
-      LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL
-      INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT
-      APPLICABLE LAW PROHIBITS SUCH LIMITATION.  SOME JURISDICTIONS DO
-      NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR
-      CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT
-      APPLY TO YOU.
-
-  8. U.S. GOVERNMENT END USERS.
-
-      The Covered Software is a "commercial item," as that term is
-      defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial
-      computer software" (as that term is defined at 48
-      C.F.R. 252.227-7014(a)(1)) and "commercial computer software
-      documentation" as such terms are used in 48 C.F.R. 12.212
-      (Sept. 1995).  Consistent with 48 C.F.R. 12.212 and 48
-      C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all
-      U.S. Government End Users acquire Covered Software with only those
-      rights set forth herein.  This U.S. Government Rights clause is in
-      lieu of, and supersedes, any other FAR, DFAR, or other clause or
-      provision that addresses Government rights in computer software
-      under this License.
-
-  9. MISCELLANEOUS.
-
-      This License represents the complete agreement concerning subject
-      matter hereof.  If any provision of this License is held to be
-      unenforceable, such provision shall be reformed only to the extent
-      necessary to make it enforceable.  This License shall be governed
-      by the law of the jurisdiction specified in a notice contained
-      within the Original Software (except to the extent applicable law,
-      if any, provides otherwise), excluding such jurisdiction's
-      conflict-of-law provisions.  Any litigation relating to this
-      License shall be subject to the jurisdiction of the courts located
-      in the jurisdiction and venue specified in a notice contained
-      within the Original Software, with the losing party responsible
-      for costs, including, without limitation, court costs and
-      reasonable attorneys' fees and expenses.  The application of the
-      United Nations Convention on Contracts for the International Sale
-      of Goods is expressly excluded.  Any law or regulation which
-      provides that the language of a contract shall be construed
-      against the drafter shall not apply to this License.  You agree
-      that You alone are responsible for compliance with the United
-      States export administration regulations (and the export control
-      laws and regulation of any other countries) when You use,
-      distribute or otherwise make available any Covered Software.
-
-  10. RESPONSIBILITY FOR CLAIMS.
-
-      As between Initial Developer and the Contributors, each party is
-      responsible for claims and damages arising, directly or
-      indirectly, out of its utilization of rights under this License
-      and You agree to work with Initial Developer and Contributors to
-      distribute such responsibility on an equitable basis.  Nothing
-      herein is intended or shall be deemed to constitute any admission
-      of liability.
\ No newline at end of file
diff --git a/licenses/CDDL-1.1 b/licenses/CDDL-1.1
deleted file mode 100644
index 4a00ba9..0000000
--- a/licenses/CDDL-1.1
+++ /dev/null
@@ -1,362 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.1
-
-1. Definitions.
-
-    1.1. "Contributor" means each individual or entity that creates or
-    contributes to the creation of Modifications.
-
-    1.2. "Contributor Version" means the combination of the Original
-    Software, prior Modifications used by a Contributor (if any), and
-    the Modifications made by that particular Contributor.
-
-    1.3. "Covered Software" means (a) the Original Software, or (b)
-    Modifications, or (c) the combination of files containing Original
-    Software with files containing Modifications, in each case including
-    portions thereof.
-
-    1.4. "Executable" means the Covered Software in any form other than
-    Source Code.
-
-    1.5. "Initial Developer" means the individual or entity that first
-    makes Original Software available under this License.
-
-    1.6. "Larger Work" means a work which combines Covered Software or
-    portions thereof with code not governed by the terms of this License.
-
-    1.7. "License" means this document.
-
-    1.8. "Licensable" means having the right to grant, to the maximum
-    extent possible, whether at the time of the initial grant or
-    subsequently acquired, any and all of the rights conveyed herein.
-
-    1.9. "Modifications" means the Source Code and Executable form of
-    any of the following:
-
-    A. Any file that results from an addition to, deletion from or
-    modification of the contents of a file containing Original Software
-    or previous Modifications;
-
-    B. Any new file that contains any part of the Original Software or
-    previous Modification; or
-
-    C. Any new file that is contributed or otherwise made available
-    under the terms of this License.
-
-    1.10. "Original Software" means the Source Code and Executable form
-    of computer software code that is originally released under this
-    License.
-
-    1.11. "Patent Claims" means any patent claim(s), now owned or
-    hereafter acquired, including without limitation, method, process,
-    and apparatus claims, in any patent Licensable by grantor.
-
-    1.12. "Source Code" means (a) the common form of computer software
-    code in which modifications are made and (b) associated
-    documentation included in or with such code.
-
-    1.13. "You" (or "Your") means an individual or a legal entity
-    exercising rights under, and complying with all of the terms of,
-    this License. For legal entities, "You" includes any entity which
-    controls, is controlled by, or is under common control with You. For
-    purposes of this definition, "control" means (a) the power, direct
-    or indirect, to cause the direction or management of such entity,
-    whether by contract or otherwise, or (b) ownership of more than
-    fifty percent (50%) of the outstanding shares or beneficial
-    ownership of such entity.
-
-2. License Grants.
-
-    2.1. The Initial Developer Grant.
-
-    Conditioned upon Your compliance with Section 3.1 below and subject
-    to third party intellectual property claims, the Initial Developer
-    hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-    (a) under intellectual property rights (other than patent or
-    trademark) Licensable by Initial Developer, to use, reproduce,
-    modify, display, perform, sublicense and distribute the Original
-    Software (or portions thereof), with or without Modifications,
-    and/or as part of a Larger Work; and
-
-    (b) under Patent Claims infringed by the making, using or selling of
-    Original Software, to make, have made, use, practice, sell, and
-    offer for sale, and/or otherwise dispose of the Original Software
-    (or portions thereof).
-
-    (c) The licenses granted in Sections 2.1(a) and (b) are effective on
-    the date Initial Developer first distributes or otherwise makes the
-    Original Software available to a third party under the terms of this
-    License.
-
-    (d) Notwithstanding Section 2.1(b) above, no patent license is
-    granted: (1) for code that You delete from the Original Software, or
-    (2) for infringements caused by: (i) the modification of the
-    Original Software, or (ii) the combination of the Original Software
-    with other software or devices.
-
-    2.2. Contributor Grant.
-
-    Conditioned upon Your compliance with Section 3.1 below and subject
-    to third party intellectual property claims, each Contributor hereby
-    grants You a world-wide, royalty-free, non-exclusive license:
-
-    (a) under intellectual property rights (other than patent or
-    trademark) Licensable by Contributor to use, reproduce, modify,
-    display, perform, sublicense and distribute the Modifications
-    created by such Contributor (or portions thereof), either on an
-    unmodified basis, with other Modifications, as Covered Software
-    and/or as part of a Larger Work; and
-
-    (b) under Patent Claims infringed by the making, using, or selling
-    of Modifications made by that Contributor either alone and/or in
-    combination with its Contributor Version (or portions of such
-    combination), to make, use, sell, offer for sale, have made, and/or
-    otherwise dispose of: (1) Modifications made by that Contributor (or
-    portions thereof); and (2) the combination of Modifications made by
-    that Contributor with its Contributor Version (or portions of such
-    combination).
-
-    (c) The licenses granted in Sections 2.2(a) and 2.2(b) are effective
-    on the date Contributor first distributes or otherwise makes the
-    Modifications available to a third party.
-
-    (d) Notwithstanding Section 2.2(b) above, no patent license is
-    granted: (1) for any code that Contributor has deleted from the
-    Contributor Version; (2) for infringements caused by: (i) third
-    party modifications of Contributor Version, or (ii) the combination
-    of Modifications made by that Contributor with other software
-    (except as part of the Contributor Version) or other devices; or (3)
-    under Patent Claims infringed by Covered Software in the absence of
-    Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-    3.1. Availability of Source Code.
-
-    Any Covered Software that You distribute or otherwise make available
-    in Executable form must also be made available in Source Code form
-    and that Source Code form must be distributed only under the terms
-    of this License. You must include a copy of this License with every
-    copy of the Source Code form of the Covered Software You distribute
-    or otherwise make available. You must inform recipients of any such
-    Covered Software in Executable form as to how they can obtain such
-    Covered Software in Source Code form in a reasonable manner on or
-    through a medium customarily used for software exchange.
-
-    3.2. Modifications.
-
-    The Modifications that You create or to which You contribute are
-    governed by the terms of this License. You represent that You
-    believe Your Modifications are Your original creation(s) and/or You
-    have sufficient rights to grant the rights conveyed by this License.
-
-    3.3. Required Notices.
-
-    You must include a notice in each of Your Modifications that
-    identifies You as the Contributor of the Modification. You may not
-    remove or alter any copyright, patent or trademark notices contained
-    within the Covered Software, or any notices of licensing or any
-    descriptive text giving attribution to any Contributor or the
-    Initial Developer.
-
-    3.4. Application of Additional Terms.
-
-    You may not offer or impose any terms on any Covered Software in
-    Source Code form that alters or restricts the applicable version of
-    this License or the recipients' rights hereunder. You may choose to
-    offer, and to charge a fee for, warranty, support, indemnity or
-    liability obligations to one or more recipients of Covered Software.
-    However, you may do so only on Your own behalf, and not on behalf of
-    the Initial Developer or any Contributor. You must make it
-    absolutely clear that any such warranty, support, indemnity or
-    liability obligation is offered by You alone, and You hereby agree
-    to indemnify the Initial Developer and every Contributor for any
-    liability incurred by the Initial Developer or such Contributor as a
-    result of warranty, support, indemnity or liability terms You offer.
-
-    3.5. Distribution of Executable Versions.
-
-    You may distribute the Executable form of the Covered Software under
-    the terms of this License or under the terms of a license of Your
-    choice, which may contain terms different from this License,
-    provided that You are in compliance with the terms of this License
-    and that the license for the Executable form does not attempt to
-    limit or alter the recipient's rights in the Source Code form from
-    the rights set forth in this License. If You distribute the Covered
-    Software in Executable form under a different license, You must make
-    it absolutely clear that any terms which differ from this License
-    are offered by You alone, not by the Initial Developer or
-    Contributor. You hereby agree to indemnify the Initial Developer and
-    every Contributor for any liability incurred by the Initial
-    Developer or such Contributor as a result of any such terms You offer.
-
-    3.6. Larger Works.
-
-    You may create a Larger Work by combining Covered Software with
-    other code not governed by the terms of this License and distribute
-    the Larger Work as a single product. In such a case, You must make
-    sure the requirements of this License are fulfilled for the Covered
-    Software.
-
-4. Versions of the License.
-
-    4.1. New Versions.
-
-    Oracle is the initial license steward and may publish revised and/or
-    new versions of this License from time to time. Each version will be
-    given a distinguishing version number. Except as provided in Section
-    4.3, no one other than the license steward has the right to modify
-    this License.
-
-    4.2. Effect of New Versions.
-
-    You may always continue to use, distribute or otherwise make the
-    Covered Software available under the terms of the version of the
-    License under which You originally received the Covered Software. If
-    the Initial Developer includes a notice in the Original Software
-    prohibiting it from being distributed or otherwise made available
-    under any subsequent version of the License, You must distribute and
-    make the Covered Software available under the terms of the version
-    of the License under which You originally received the Covered
-    Software. Otherwise, You may also choose to use, distribute or
-    otherwise make the Covered Software available under the terms of any
-    subsequent version of the License published by the license steward.
-
-    4.3. Modified Versions.
-
-    When You are an Initial Developer and You want to create a new
-    license for Your Original Software, You may create and use a
-    modified version of this License if You: (a) rename the license and
-    remove any references to the name of the license steward (except to
-    note that the license differs from this License); and (b) otherwise
-    make it clear that the license contains terms which differ from this
-    License.
-
-5. DISCLAIMER OF WARRANTY.
-
-    COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-    WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
-    INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE
-    IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR
-    NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF
-    THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE
-    DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY
-    OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING,
-    REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN
-    ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS
-    AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-    6.1. This License and the rights granted hereunder will terminate
-    automatically if You fail to comply with terms herein and fail to
-    cure such breach within 30 days of becoming aware of the breach.
-    Provisions which, by their nature, must remain in effect beyond the
-    termination of this License shall survive.
-
-    6.2. If You assert a patent infringement claim (excluding
-    declaratory judgment actions) against Initial Developer or a
-    Contributor (the Initial Developer or Contributor against whom You
-    assert such claim is referred to as "Participant") alleging that the
-    Participant Software (meaning the Contributor Version where the
-    Participant is a Contributor or the Original Software where the
-    Participant is the Initial Developer) directly or indirectly
-    infringes any patent, then any and all rights granted directly or
-    indirectly to You by such Participant, the Initial Developer (if the
-    Initial Developer is not the Participant) and all Contributors under
-    Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice
-    from Participant terminate prospectively and automatically at the
-    expiration of such 60 day notice period, unless if within such 60
-    day period You withdraw Your claim with respect to the Participant
-    Software against such Participant either unilaterally or pursuant to
-    a written agreement with Participant.
-
-    6.3. If You assert a patent infringement claim against Participant
-    alleging that the Participant Software directly or indirectly
-    infringes any patent where such claim is resolved (such as by
-    license or settlement) prior to the initiation of patent
-    infringement litigation, then the reasonable value of the licenses
-    granted by such Participant under Sections 2.1 or 2.2 shall be taken
-    into account in determining the amount or value of any payment or
-    license.
-
-    6.4. In the event of termination under Sections 6.1 or 6.2 above,
-    all end user licenses that have been validly granted by You or any
-    distributor hereunder prior to termination (excluding licenses
-    granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-    UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-    (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE
-    INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF
-    COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE
-    TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
-    CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT
-    LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER
-    FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR
-    LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE
-    POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT
-    APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH
-    PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH
-    LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR
-    LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION
-    AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-    The Covered Software is a "commercial item," as that term is defined
-    in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-    software" (as that term is defined at 48 C.F.R. §
-    252.227-7014(a)(1)) and "commercial computer software documentation"
-    as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent
-    with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4
-    (June 1995), all U.S. Government End Users acquire Covered Software
-    with only those rights set forth herein. This U.S. Government Rights
-    clause is in lieu of, and supersedes, any other FAR, DFAR, or other
-    clause or provision that addresses Government rights in computer
-    software under this License.
-
-9. MISCELLANEOUS.
-
-    This License represents the complete agreement concerning subject
-    matter hereof. If any provision of this License is held to be
-    unenforceable, such provision shall be reformed only to the extent
-    necessary to make it enforceable. This License shall be governed by
-    the law of the jurisdiction specified in a notice contained within
-    the Original Software (except to the extent applicable law, if any,
-    provides otherwise), excluding such jurisdiction's conflict-of-law
-    provisions. Any litigation relating to this License shall be subject
-    to the jurisdiction of the courts located in the jurisdiction and
-    venue specified in a notice contained within the Original Software,
-    with the losing party responsible for costs, including, without
-    limitation, court costs and reasonable attorneys' fees and expenses.
-    The application of the United Nations Convention on Contracts for
-    the International Sale of Goods is expressly excluded. Any law or
-    regulation which provides that the language of a contract shall be
-    construed against the drafter shall not apply to this License. You
-    agree that You alone are responsible for compliance with the United
-    States export administration regulations (and the export control
-    laws and regulation of any other countries) when You use, distribute
-    or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-    As between Initial Developer and the Contributors, each party is
-    responsible for claims and damages arising, directly or indirectly,
-    out of its utilization of rights under this License and You agree to
-    work with Initial Developer and Contributors to distribute such
-    responsibility on an equitable basis. Nothing herein is intended or
-    shall be deemed to constitute any admission of liability.
-
-------------------------------------------------------------------------
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION
-LICENSE (CDDL)
-
-The code released under the CDDL shall be governed by the laws of the
-State of California (excluding conflict-of-law provisions). Any
-litigation relating to this License shall be subject to the jurisdiction
-of the Federal Courts of the Northern District of California and the
-state courts of the State of California, with venue lying in Santa Clara
-County, California.
diff --git a/licenses/EPL b/licenses/EPL
deleted file mode 100644
index 3fa0083..0000000
--- a/licenses/EPL
+++ /dev/null
@@ -1,86 +0,0 @@
-Eclipse Public License - v 1.0
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-
-1. DEFINITIONS
-
-"Contribution" means:
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
-
-"Contributor" means any person or entity that distributes the Program.
-
-"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
-
-"Program" means the Contributions distributed in accordance with this Agreement.
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
-
-2. GRANT OF RIGHTS
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
-
-3. REQUIREMENTS
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
-
-When the Program is made available in source code form:
-
-a) it must be made available under this Agreement; and
-
-b) a copy of this Agreement must be included with each copy of the Program.
-
-Contributors may not remove or alter any copyright notices contained within the Program.
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
-
-4. COMMERCIAL DISTRIBUTION
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
-
-5. NO WARRANTY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
-
-6. DISCLAIMER OF LIABILITY
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. GENERAL
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
\ No newline at end of file
diff --git a/licenses/JSON b/licenses/JSON
deleted file mode 100644
index b32b43c..0000000
--- a/licenses/JSON
+++ /dev/null
@@ -1,26 +0,0 @@
-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.
\ No newline at end of file
diff --git a/licenses/MIT b/licenses/MIT
deleted file mode 100644
index 4a9e716..0000000
--- a/licenses/MIT
+++ /dev/null
@@ -1,19 +0,0 @@
-The MIT License ("MIT")
-
-  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.
\ No newline at end of file
diff --git a/licenses/NOTICE-Jackson b/licenses/NOTICE-Jackson
deleted file mode 100644
index deee84d..0000000
--- a/licenses/NOTICE-Jackson
+++ /dev/null
@@ -1,20 +0,0 @@
-# Jackson JSON processor
-
-Jackson is a high-performance, Free/Open Source JSON processing library.
-It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
-been in development since 2007.
-It is currently developed by a community of developers, as well as supported
-commercially by FasterXML.com.
-
-## Licensing
-
-Jackson core and extension components may licensed under different licenses.
-To find the details that apply to this artifact see the accompanying LICENSE file.
-For more information, including possible other licensing options, contact
-FasterXML.com (http://fasterxml.com).
-
-## Credits
-
-A list of contributors may be found from CREDITS file, which is included
-in some artifacts (usually source distributions); but is always available
-from the source code management (SCM) system project uses.
\ No newline at end of file
diff --git a/licenses/NOTICE-Tomcat b/licenses/NOTICE-Tomcat
deleted file mode 100644
index 2eff8d9..0000000
--- a/licenses/NOTICE-Tomcat
+++ /dev/null
@@ -1,55 +0,0 @@
-Apache Tomcat
-Copyright 1999-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This software contains code derived from netty-native
-developed by the Netty project
-(http://netty.io, https://github.com/netty/netty-tcnative/)
-and from finagle-native developed at Twitter
-(https://github.com/twitter/finagle).
-
-The Windows Installer is built with the Nullsoft
-Scriptable Install System (NSIS), which is
-open source software.  The original software and
-related information is available at
-http://nsis.sourceforge.net.
-
-Java compilation software for JSP pages is provided by the Eclipse
-JDT Core Batch Compiler component, which is open source software.
-The original software and related information is available at
-http://www.eclipse.org/jdt/core/.
-
-For portions of the Tomcat JNI OpenSSL API and the OpenSSL JSSE integration
-The org.apache.tomcat.jni and the org.apache.tomcat.net.openssl packages
-are derivative work originating from the Netty project and the finagle-native
-project developed at Twitter
-* Copyright 2014 The Netty Project
-* Copyright 2014 Twitter
-
-The original XML Schemas for Java EE Deployment Descriptors:
- - javaee_5.xsd
- - javaee_web_services_1_2.xsd
- - javaee_web_services_client_1_2.xsd
- - javaee_6.xsd
- - javaee_web_services_1_3.xsd
- - javaee_web_services_client_1_3.xsd
- - jsp_2_2.xsd
- - web-app_3_0.xsd
- - web-common_3_0.xsd
- - web-fragment_3_0.xsd
- - javaee_7.xsd
- - javaee_web_services_1_4.xsd
- - javaee_web_services_client_1_4.xsd
- - jsp_2_3.xsd
- - web-app_3_1.xsd
- - web-common_3_1.xsd
- - web-fragment_3_1.xsd
- - javaee_8.xsd
- - web-app_4_0.xsd
- - web-common_4_0.xsd
- - web-fragment_4_0.xsd
-
-may be obtained from:
-http://www.oracle.com/webfolder/technetwork/jsc/xml/ns/javaee/index.html
\ No newline at end of file
diff --git a/licenses/PostgreSQL b/licenses/PostgreSQL
deleted file mode 100644
index f910804..0000000
--- a/licenses/PostgreSQL
+++ /dev/null
@@ -1,12 +0,0 @@
-PostgreSQL Database Management System
-(formerly known as Postgres, then as Postgres95)
-
-Portions Copyright (c) 1996-2018, The PostgreSQL Global Development Group
-
-Portions Copyright (c) 1994, The Regents of the University of California
-
-Permission to use, copy, modify, and distribute this software and its documentation for any purpose, without fee, and without a written agreement is hereby granted, provided that the above copyright notice and this paragraph and the following two paragraphs appear in all copies.
-
-IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
\ No newline at end of file
diff --git a/licenses/SIL-OFL-1.1 b/licenses/SIL-OFL-1.1
deleted file mode 100644
index fa6a1ae..0000000
--- a/licenses/SIL-OFL-1.1
+++ /dev/null
@@ -1,84 +0,0 @@
-SIL OPEN FONT LICENSE Version 1.1
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting — in part or in whole — any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file
diff --git a/licenses/WTFPL b/licenses/WTFPL
deleted file mode 100644
index 07b7a81..0000000
--- a/licenses/WTFPL
+++ /dev/null
@@ -1,13 +0,0 @@
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                   Version 2, December 2004
-
-Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
-
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. You just DO WHAT THE FUCK YOU WANT TO.
\ No newline at end of file
diff --git a/measure/src/main/resources/META-INF/LICENSE b/measure/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index b0c4890..0000000
--- a/measure/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,256 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-
----------------------------------------------------
-
-The Apache Griffin Measure module contains subcomponents in the source code
-release with separate copyright notices and license terms. Your use of
-the source code for the these subcomponents is subject to the terms and
-conditions of their respective licenses.
-
-----------------------------------------------
-Public Domain
-----------------------------------------------
-The following components are provided in Public Domain. See project link for details.
-
-     (Public Domain) XZ for Java (org.tukaani:xz:1.0 - http://tukaani.org/xz/java.html)
-
-----------------------------------------------
-CDDL licenses
-----------------------------------------------
-The following components are provided under a CDDL license. See project link for details.
-The text of each license is also included at licenses/CDDL-1.0 and licenses/CDDL-1.1.
-
-     (CDDL) (GPLv2+CE) JavaMail API (com.sun.mail:javax.mail:1.4.4 - http://kenai.com/projects/javamail/javax.mail)
-     (Common Development and Distribution License (CDDL) v1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
-
-----------------------------------------------
-BSD-style licenses
-----------------------------------------------
-The following components are provided under a BSD-style license. See project link for details.
-The text of each license is also included at licenses/BSD-3-Clause and licenses/BSD-2-Clause.
-
-     (BSD) ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 - http://paranamer.codehaus.org/paranamer)
-     (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.6 - http://www.scala-lang.org/)
-     (BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.10.6 - http://www.scala-lang.org/)
-
-----------------------------------------------
-MIT licenses
-----------------------------------------------
-The following components are provided under a MIT license. See project link for details.
-The text of each license is also included at licenses/MIT.
-
-     (MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.21 - http://www.slf4j.org)
-     (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.21 - http://www.slf4j.org)
-
-----------------------------------------------
-Apache License 2.0
-----------------------------------------------
-The following components are provided under a Apache License 2.0. See project link for details.
-
-     (The Apache Software License, Version 2.0) ZkClient (com.101tec:zkclient:0.3 - https://github.com/sgroschupf/zkclient)
-     (Apache-2.0) spark-avro (com.databricks:spark-avro_2.10:2.0.1 - https://github.com/databricks/spark-avro)
-     (Apache License, Version 2.0) spark-csv (com.databricks:spark-csv_2.10:1.5.0 - https://github.com/databricks/spark-csv)
-     (The Apache Software License, Version 2.0) Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.8.0 - http://github.com/FasterXML/jackson)
-     (The Apache Software License, Version 2.0) Jackson-core (com.fasterxml.jackson.core:jackson-core:2.8.7 - https://github.com/FasterXML/jackson-core)
-     (The Apache Software License, Version 2.0) jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.8.7 - http://github.com/FasterXML/jackson)
-     (The Apache Software License, Version 2.0) Jackson module: Paranamer (com.fasterxml.jackson.module:jackson-module-paranamer:2.8.7 - https://github.com/FasterXML/jackson-modules-base)
-     (The Apache Software License, Version 2.0) jackson-module-scala (com.fasterxml.jackson.module:jackson-module-scala_2.10:2.8.7 - http://wiki.fasterxml.com/JacksonModuleScala)
-     (The Apache Software License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:14.0.1 - http://code.google.com/p/guava-libraries/guava)
-     (Apache 2) univocity-parsers (com.univocity:univocity-parsers:1.5.1 - http://github.com/uniVocity/univocity-parsers)
-     (Apache License 2.0) Metrics Core Library (com.yammer.metrics:metrics-core:2.2.0 - http://metrics.codahale.com/metrics-core/)
-     (The Apache Software License, Version 2.0) Apache Log4j (log4j:log4j:1.2.16 - http://logging.apache.org/log4j/1.2/)
-     (The Apache Software License, Version 2.0) LZ4 and xxHash (net.jpountz.lz4:lz4:1.3.0 - https://github.com/jpountz/lz4-java)
-     (The Apache Software License, Version 2.0) Apache Avro (org.apache.avro:avro:1.7.7 - http://avro.apache.org)
-     (The Apache Software License, Version 2.0) Commons Compress (org.apache.commons:commons-compress:1.4.1 - http://commons.apache.org/compress/)
-     (Apache License, Version 2.0) Apache Commons CSV (org.apache.commons:commons-csv:1.1 - http://commons.apache.org/proper/commons-csv/)
-     (The Apache Software License, Version 2.0) Curator Client (org.apache.curator:curator-client:2.10.0 - http://curator.apache.org/curator-client)
-     (The Apache Software License, Version 2.0) Curator Framework (org.apache.curator:curator-framework:2.10.0 - http://curator.apache.org/curator-framework)
-     (The Apache Software License, Version 2.0) Curator Recipes (org.apache.curator:curator-recipes:2.10.0 - http://curator.apache.org/curator-recipes)
-     (The Apache Software License, Version 2.0) Apache Kafka (org.apache.kafka:kafka-clients:0.8.2.1 - http://kafka.apache.org)
-     (The Apache Software License, Version 2.0) Apache Kafka (org.apache.kafka:kafka_2.10:0.8.2.1 - http://kafka.apache.org)
-     (Apache 2.0 License) Spark Project External Kafka (org.apache.spark:spark-streaming-kafka_2.10:1.6.0 - http://spark.apache.org/)
-     (The Apache Software License, Version 2.0) Jackson (org.codehaus.jackson:jackson-core-asl:1.9.13 - http://jackson.codehaus.org)
-     (The Apache Software License, Version 2.0) Data Mapper for Jackson (org.codehaus.jackson:jackson-mapper-asl:1.9.13 - http://jackson.codehaus.org)
-     (The Apache Software License, Version 2.0) BSON (org.mongodb:bson:3.4.2 - http://bsonspec.org)
-     (The Apache Software License, Version 2.0) MongoDB Asynchronous Driver (org.mongodb:mongodb-driver-async:3.4.2 - http://www.mongodb.org)
-     (The Apache Software License, Version 2.0) MongoDB Java Driver Core (org.mongodb:mongodb-driver-core:3.4.2 - http://www.mongodb.org)
-     (Apache 2) mongo-scala-bson (org.mongodb.scala:mongo-scala-bson_2.11:2.1.0 - http://mongodb.github.io/mongo-scala-driver)
-     (Apache 2) mongo-scala-driver (org.mongodb.scala:mongo-scala-driver_2.11:2.1.0 - http://mongodb.github.io/mongo-scala-driver)
-     (Apache 2) scalaj-http (org.scalaj:scalaj-http_2.10:2.3.0 - http://github.com/scalaj/scalaj-http)
-     (The Apache License, Version 2.0) empty (org.spark-project.spark:unused:1.0.0 - http://nexus.sonatype.org/oss-repository-hosting.html/unused)
-     (The Apache Software License, Version 2.0) snappy-java (org.xerial.snappy:snappy-java:1.1.2 - https://github.com/xerial/snappy-java)
-     (Apache license) zookeeper (org.apache.zookeeper:zookeeper:3.4.5 - no url defined)
\ No newline at end of file
diff --git a/measure/src/main/resources/META-INF/NOTICE b/measure/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 65a05ee..0000000
--- a/measure/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-Apache Griffin
-Copyright 2017-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-================================================================
-Notice for Jackson
-
-See licenses/NOTICE-Jackson
\ No newline at end of file
diff --git a/service/pom.xml b/service/pom.xml
index 2fac5f9..33677af 100644
--- a/service/pom.xml
+++ b/service/pom.xml
@@ -155,6 +155,10 @@
                     <groupId>javax.servlet</groupId>
                     <artifactId>servlet-api</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>de.ruedigermoeller</groupId>
+                    <artifactId>fst</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
diff --git a/service/src/main/resources/META-INF/LICENSE b/service/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index 03a3df7..0000000
--- a/service/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,414 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-
----------------------------------------------------
-
-The Apache Griffin Service module contains subcomponents in the source code
-release with separate copyright notices and license terms. Your use of
-the source code for the these subcomponents is subject to the terms and
-conditions of their respective licenses.
-
-----------------------------------------------
-Public Domain
-----------------------------------------------
-The following components are provided in Public Domain. See project link for details.
-
-     (Public Domain) AOP alliance (aopalliance:aopalliance:1.0 - http://aopalliance.sourceforge.net)
-     (Public Domain) XZ for Java (org.tukaani:xz:1.0 - http://tukaani.org/xz/java.html)
-
-----------------------------------------------
-JSON license
-----------------------------------------------
-The following components are provided under a JSON license. See project link for details.
-The text of each license is also included at licenses/JSON.
-
-     (The JSON License) JSON in Java (org.json:json:20140107 - https://github.com/douglascrockford/JSON-java)
-
-----------------------------------------------
-The PostgreSQL License
-----------------------------------------------
-The following components are provided under a PostgreSQL license. See project link for details.
-The text of each license is also included at licenses/PostgreSQL.
-
-     (The PostgreSQL License) PostgreSQL JDBC Driver - JDBC 4.1 (org.postgresql:postgresql:9.4.1212.jre7 - https://github.com/pgjdbc/pgjdbc-parent-poms/pgjdbc-core-parent/pgjdbc-core-prevjre/postgresql)
-
-----------------------------------------------
-EPL license
-----------------------------------------------
-The following components are provided under a EPL license. See project link for details.
-The text of each license is also included at licenses/EPL.
-
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) Javax Persistence (org.eclipse.persistence:javax.persistence:2.1.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink ANTLR (org.eclipse.persistence:org.eclipse.persistence.antlr:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink ASM (org.eclipse.persistence:org.eclipse.persistence.asm:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink Core (org.eclipse.persistence:org.eclipse.persistence.core:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink JPA (org.eclipse.persistence:org.eclipse.persistence.jpa:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Distribution License v. 1.0) (Eclipse Public License v1.0) EclipseLink Hermes JPQL Parser (org.eclipse.persistence:org.eclipse.persistence.jpa.jpql:2.6.0 - http://www.eclipse.org/eclipselink)
-     (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Classic Module (ch.qos.logback:logback-classic:1.1.9 - http://logback.qos.ch/logback-classic)
-     (Eclipse Public License - v 1.0) (GNU Lesser General Public License) Logback Core Module (ch.qos.logback:logback-core:1.1.9 - http://logback.qos.ch/logback-core)
-     (MPL 2.0 or EPL 1.0) H2 Database Engine (com.h2database:h2:1.4.193 - http://www.h2database.com)
-     (Eclipse Public License - v 1.0) AspectJ weaver (org.aspectj:aspectjweaver:1.8.9 - http://www.aspectj.org)
-     (GNU LESSER GENERAL PUBLIC LICENSE)(Eclipse Public License) c3p0:JDBC DataSources/Resource Pools (c3p0:c3p0:0.9.1.1 - http://c3p0.sourceforge.net)
-
-----------------------------------------------
-CDDL licenses
-----------------------------------------------
-The following components are provided under a CDDL license. See project link for details.
-The text of each license is also included at licenses/CDDL-1.0 and licenses/CDDL-1.1.
-
-     (CDDL license) jsp-api (javax.servlet.jsp:jsp-api:2.1 - no url defined)
-     (CDDL-1.0 license) Java Transaction API (javax.transaction:jta:1.1 - http://java.sun.com/products/jta)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-client (com.sun.jersey:jersey-client:1.9 - https://jersey.java.net/jersey-client/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-core (com.sun.jersey:jersey-core:1.9 - https://jersey.java.net/jersey-core/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-json (com.sun.jersey:jersey-json:1.9 - https://jersey.java.net/jersey-json/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-server (com.sun.jersey:jersey-server:1.9 - https://jersey.java.net/jersey-server/)
-     (CDDL 1.1) (GPL2 w/ CPE) jersey-guice (com.sun.jersey.contribs:jersey-guice:1.9 - https://jersey.java.net/jersey-contribs/jersey-guice/)
-     (CDDL 1.1) (GPL2 w/ CPE) JAXB RI (com.sun.xml.bind:jaxb-impl:2.2.3-1 - http://jaxb.java.net/)
-     (Common Development and Distribution License (CDDL) v1.0) JavaBeans Activation Framework (JAF) (javax.activation:activation:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
-     (CDDL + GPLv2 with classpath exception) javax.transaction API (javax.transaction:javax.transaction-api:1.2 - http://jta-spec.java.net)
-     (CDDL 1.1) (GPL2 w/ CPE) JAXB API bundle for GlassFish V3 (javax.xml.bind:jaxb-api:2.2.2 - https://jaxb.dev.java.net/)
-     (COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0) (GNU General Public Library) Streaming API for XML (javax.xml.stream:stax-api:1.0-2 - no url defined)
-
-----------------------------------------------
-BSD-style licenses
-----------------------------------------------
-The following components are provided under a BSD-style license. See project link for details.
-The text of each license is also included at licenses/BSD-3-Clause and licenses/BSD-2-Clause.
-
-     (BSD license) ASM Core (asm:asm:3.1 - http://asm.objectweb.org/asm/)
-     (BSD license) dom4j (dom4j:dom4j:1.6.1 - http://dom4j.org)
-     (BSD license) Antlr 3.4 Runtime (org.antlr:antlr-runtime:3.4 - http://www.antlr.org)
-     (BSD License) AntLR Parser Generator (antlr:antlr:2.7.7 - http://www.antlr.org/)
-     (New BSD License) Kryo (com.esotericsoftware.kryo:kryo:2.22 - http://code.google.com/p/kryo/)
-     (New BSD license) Protocol Buffer Java API (com.google.protobuf:protobuf-java:2.5.0 - http://code.google.com/p/protobuf)
-     (BSD) ParaNamer Core (com.thoughtworks.paranamer:paranamer:2.3 - http://paranamer.codehaus.org/paranamer)
-     (BSD licence) ANTLR StringTemplate (org.antlr:stringtemplate:3.2.1 - http://www.stringtemplate.org)
-     (The BSD 3-Clause License) leveldbjni-all (org.fusesource.leveldbjni:leveldbjni-all:1.8 - http://leveldbjni.fusesource.org/leveldbjni-all)
-     (BSD-like) Scala Library (org.scala-lang:scala-library:2.10.4 - http://www.scala-lang.org/)
-     (The BSD License) xmlenc Library (xmlenc:xmlenc:0.52 - http://xmlenc.sourceforge.net)
-
-----------------------------------------------
-MIT licenses
-----------------------------------------------
-The following components are provided under a MIT license. See project link for details.
-The text of each license is also included at licenses/MIT.
-
-     (MIT License) JCL 1.1.1 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.22 - http://www.slf4j.org)
-     (MIT License) JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.22 - http://www.slf4j.org)
-     (MIT License) SLF4J API Module (org.slf4j:slf4j-api:1.7.22 - http://www.slf4j.org)
-     (MIT License) SLF4J LOG4J-12 Binding (org.slf4j:slf4j-log4j12:1.7.22 - http://www.slf4j.org)
-
-----------------------------------------------
-Apache License 2.0
-----------------------------------------------
-The following components are provided under a Apache License 2.0. See project link for details.
-
-     (The Apache Software License, Version 2.0) livy-api (com.cloudera.livy:livy-api:0.3.0 - http://livy.io/livy-api/)
-     (The Apache Software License, Version 2.0) livy-client-common (com.cloudera.livy:livy-client-common:0.3.0 - http://livy.io/livy-client-common/)
-     (The Apache Software License, Version 2.0) livy-core_2.10 (com.cloudera.livy:livy-core_2.10:0.3.0 - http://livy.io/multi-scala-project-root/livy-core-parent/livy-core_2.10/)
-     (The Apache Software License, Version 2.0) ClassMate (com.fasterxml:classmate:1.3.3 - http://github.com/cowtowncoder/java-classmate)
-     (The Apache Software License, Version 2.0) Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.8.0 - http://github.com/FasterXML/jackson)
-     (The Apache Software License, Version 2.0) Jackson-core (com.fasterxml.jackson.core:jackson-core:2.8.6 - https://github.com/FasterXML/jackson-core)
-     (The Apache Software License, Version 2.0) jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.6.3 - http://github.com/FasterXML/jackson)
-     (The Apache Software License, Version 2.0) FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.0 - http://findbugs.sourceforge.net/)
-     (Apache 2.0) Gson (com.google.code.gson:gson:2.8.0 - https://github.com/google/gson/gson)
-     (The Apache Software License, Version 2.0) Guava: Google Core Libraries for Java (com.google.guava:guava:14.0.1 - http://code.google.com/p/guava-libraries/guava)
-     (The Apache Software License, Version 2.0) Google Guice - Core Library (com.google.inject:guice:3.0 - http://code.google.com/p/google-guice/guice/)
-     (The Apache Software License, Version 2.0) Google Guice - Extensions - Servlet (com.google.inject.extensions:guice-servlet:3.0 - http://code.google.com/p/google-guice/extensions-parent/guice-servlet/)
-     (Apache v2) BoneCP :: Core Library (com.jolbox:bonecp:0.8.0.RELEASE - http://jolbox.com/bonecp)
-     (The Apache Software License, Version 2.0) Apache Parquet Hadoop Bundle (Incubating) (com.twitter:parquet-hadoop-bundle:1.6.0 - https://parquet.incubator.apache.org)
-     (Apache License, Version 2.0) Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.3 - https://commons.apache.org/proper/commons-beanutils/)
-     (The Apache Software License, Version 2.0) Commons BeanUtils Core (commons-beanutils:commons-beanutils-core:1.8.0 - http://commons.apache.org/beanutils/)
-     (The Apache Software License, Version 2.0) Commons CLI (commons-cli:commons-cli:1.2 - http://commons.apache.org/cli/)
-     (Apache License, Version 2.0) Apache Commons Codec (commons-codec:commons-codec:1.10 - http://commons.apache.org/proper/commons-codec/)
-     (Apache License, Version 2.0) Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/)
-     (The Apache Software License, Version 2.0) Commons Configuration (commons-configuration:commons-configuration:1.6 - http://commons.apache.org/${pom.artifactId.substring(8)}/)
-     (The Apache Software License, Version 2.0) Commons DBCP (commons-dbcp:commons-dbcp:1.4 - http://commons.apache.org/dbcp/)
-     (The Apache Software License, Version 2.0) Commons Digester (commons-digester:commons-digester:2.1 - http://commons.apache.org/digester/)
-     (Apache License) HttpClient (commons-httpclient:commons-httpclient:3.1 - http://jakarta.apache.org/httpcomponents/httpclient-3.x/)
-     (The Apache Software License, Version 2.0) Commons IO (commons-io:commons-io:2.4 - http://commons.apache.org/io/)
-     (The Apache Software License, Version 2.0) Commons Lang (commons-lang:commons-lang:2.6 - http://commons.apache.org/lang/)
-     (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.3 - http://commons.apache.org/proper/commons-logging/)
-     (The Apache Software License, Version 2.0) Commons Net (commons-net:commons-net:3.1 - http://commons.apache.org/net/)
-     (The Apache Software License, Version 2.0) Commons Pool (commons-pool:commons-pool:1.6 - http://commons.apache.org/pool/)
-     (Apache License 2.0) kafka-schema-registry-client (io.confluent:kafka-schema-registry-client:3.2.0 - http://confluent.io/kafka-schema-registry-client)
-     (Apache License, Version 2.0) The Netty Project (io.netty:netty:3.7.0.Final - http://netty.io/)
-     (Apache License, Version 2.0) Netty/All-in-One (io.netty:netty-all:4.0.23.Final - http://netty.io/netty-all/)
-     (The Apache Software License, Version 2.0) javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
-     (Apache 2) JDO API (javax.jdo:jdo-api:3.0.1 - http://db.apache.org/jdo)
-     (The Apache Software License, Version 2.0) Bean Validation API (javax.validation:validation-api:1.1.0.Final - http://beanvalidation.org)
-     (Apache 2) Joda-Time (joda-time:joda-time:2.9.7 - http://www.joda.org/joda-time/)
-     (The Apache Software License, Version 2.0) Apache Extras™ for Apache log4j™. (log4j:apache-log4j-extras:1.2.17 - http://logging.apache.org/log4j/extras)
-     (The Apache Software License, Version 2.0) Apache Log4j (log4j:log4j:1.2.16 - http://logging.apache.org/log4j/1.2/)
-     (Apache 2) opencsv (net.sf.opencsv:opencsv:2.3 - http://opencsv.sf.net)
-     (The Apache Software License, Version 2.0) Apache Ant Core (org.apache.ant:ant:1.9.1 - http://ant.apache.org/)
-     (The Apache Software License, Version 2.0) Apache Ant Launcher (org.apache.ant:ant-launcher:1.9.1 - http://ant.apache.org/)
-     (The Apache Software License, Version 2.0) Apache Avro (org.apache.avro:avro:1.7.7 - http://avro.apache.org)
-     (The Apache Software License, Version 2.0) Commons Compress (org.apache.commons:commons-compress:1.4.1 - http://commons.apache.org/compress/)
-     (The Apache Software License, Version 2.0) Commons Math (org.apache.commons:commons-math3:3.1.1 - http://commons.apache.org/math/)
-     (The Apache Software License, Version 2.0) Curator Client (org.apache.curator:curator-client:2.7.1 - http://curator.apache.org/curator-client)
-     (The Apache Software License, Version 2.0) Curator Framework (org.apache.curator:curator-framework:2.7.1 - http://curator.apache.org/curator-framework)
-     (The Apache Software License, Version 2.0) Curator Recipes (org.apache.curator:curator-recipes:2.7.1 - http://curator.apache.org/curator-recipes)
-     (Apache 2) Apache Derby Database Engine and Embedded JDBC Driver (org.apache.derby:derby:10.13.1.1 - http://db.apache.org/derby/)
-     (Apache 2) Apache Derby Client JDBC Driver (org.apache.derby:derbyclient:10.14.1.0 - http://db.apache.org/derby/)
-     (The Apache Software License, Version 2.0) Apache Directory API ASN.1 API (org.apache.directory.api:api-asn1-api:1.0.0-M20 - http://directory.apache.org/api-parent/api-asn1-parent/api-asn1-api/)
-     (The Apache Software License, Version 2.0) Apache Directory LDAP API Utilities (org.apache.directory.api:api-util:1.0.0-M20 - http://directory.apache.org/api-parent/api-util/)
-     (The Apache Software License, Version 2.0) ApacheDS I18n (org.apache.directory.server:apacheds-i18n:2.0.0-M15 - http://directory.apache.org/apacheds/1.5/apacheds-i18n)
-     (The Apache Software License, Version 2.0) ApacheDS Protocol Kerberos Codec (org.apache.directory.server:apacheds-kerberos-codec:2.0.0-M15 - http://directory.apache.org/apacheds/1.5/apacheds-kerberos-codec)
-     (Apache License, Version 2.0) Apache Hadoop Annotations (org.apache.hadoop:hadoop-annotations:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop Client (org.apache.hadoop:hadoop-client:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop Common (org.apache.hadoop:hadoop-common:2.7.1 - no url defined)
-     (Apache License, Version 2.0) Apache Hadoop HDFS (org.apache.hadoop:hadoop-hdfs:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-app (org.apache.hadoop:hadoop-mapreduce-client-app:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-common (org.apache.hadoop:hadoop-mapreduce-client-common:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-core (org.apache.hadoop:hadoop-mapreduce-client-core:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-jobclient (org.apache.hadoop:hadoop-mapreduce-client-jobclient:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-mapreduce-client-shuffle (org.apache.hadoop:hadoop-mapreduce-client-shuffle:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-yarn-api (org.apache.hadoop:hadoop-yarn-api:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-yarn-client (org.apache.hadoop:hadoop-yarn-client:2.7.1 - no url defined)
-     (Apache License, Version 2.0) hadoop-yarn-common (org.apache.hadoop:hadoop-yarn-common:2.7.1 - no url defined)
-     (The Apache Software License, Version 2.0) hadoop-yarn-server-applicationhistoryservice (org.apache.hadoop:hadoop-yarn-server-applicationhistoryservice:2.6.0 - no url defined)
-     (Apache License, Version 2.0) hadoop-yarn-server-common (org.apache.hadoop:hadoop-yarn-server-common:2.7.1 - no url defined)
-     (The Apache Software License, Version 2.0) hadoop-yarn-server-resourcemanager (org.apache.hadoop:hadoop-yarn-server-resourcemanager:2.6.0 - no url defined)
-     (The Apache Software License, Version 2.0) hadoop-yarn-server-web-proxy (org.apache.hadoop:hadoop-yarn-server-web-proxy:2.6.0 - no url defined)
-     (The Apache Software License, Version 2.0) Hive Common (org.apache.hive:hive-common:1.2.1 - http://hive.apache.org/hive-common)
-     (The Apache Software License, Version 2.0) Hive Metastore (org.apache.hive:hive-metastore:1.2.1 - http://hive.apache.org/hive-metastore)
-     (The Apache Software License, Version 2.0) Hive Serde (org.apache.hive:hive-serde:1.2.1 - http://hive.apache.org/hive-serde)
-     (The Apache Software License, Version 2.0) Hive Shims (org.apache.hive:hive-shims:1.2.1 - http://hive.apache.org/hive-shims)
-     (The Apache Software License, Version 2.0) Hive Shims 0.20S (org.apache.hive.shims:hive-shims-0.20S:1.2.1 - http://hive.apache.org/hive-shims-0.20S)
-     (The Apache Software License, Version 2.0) Hive Shims 0.23 (org.apache.hive.shims:hive-shims-0.23:1.2.1 - http://hive.apache.org/hive-shims-0.23)
-     (The Apache Software License, Version 2.0) Hive Shims Common (org.apache.hive.shims:hive-shims-common:1.2.1 - http://hive.apache.org/hive-shims-common)
-     (The Apache Software License, Version 2.0) Hive Shims Scheduler (org.apache.hive.shims:hive-shims-scheduler:1.2.1 - http://hive.apache.org/hive-shims-scheduler)
-     (The Apache Software License, Version 2.0) htrace-core (org.apache.htrace:htrace-core:3.1.0-incubating - http://incubator.apache.org/projects/htrace.html)
-     (Apache License, Version 2.0) Apache HttpAsyncClient (org.apache.httpcomponents:httpasyncclient:4.1.2 - http://hc.apache.org/httpcomponents-asyncclient)
-     (Apache License, Version 2.0) Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.2 - http://hc.apache.org/httpcomponents-client)
-     (Apache License, Version 2.0) Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.6 - http://hc.apache.org/httpcomponents-core-ga)
-     (Apache License, Version 2.0) Apache HttpCore NIO (org.apache.httpcomponents:httpcore-nio:4.4.5 - http://hc.apache.org/httpcomponents-core-ga)
-     (The Apache Software License, Version 2.0) Apache Thrift (org.apache.thrift:libfb303:0.9.2 - http://thrift.apache.org)
-     (The Apache Software License, Version 2.0) Apache Thrift (org.apache.thrift:libthrift:0.9.2 - http://thrift.apache.org)
-     (Apache License, Version 2.0) tomcat-jdbc (org.apache.tomcat:tomcat-jdbc:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-juli (org.apache.tomcat:tomcat-juli:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:8.5.11 - http://tomcat.apache.org/)
-     (Apache License, Version 2.0) tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:8.5.11 - http://tomcat.apache.org/)
-     (The Apache Software License, Version 2.0) Jackson (org.codehaus.jackson:jackson-core-asl:1.9.13 - http://jackson.codehaus.org)
-     (The Apache Software License, Version 2.0) Data Mapper for Jackson (org.codehaus.jackson:jackson-mapper-asl:1.9.13 - http://jackson.codehaus.org)
-     (The Apache Software License, Version 2.0) DataNucleus JDO API plugin (org.datanucleus:datanucleus-api-jdo:3.2.6 - http://www.datanucleus.org)
-     (The Apache Software License, Version 2.0) DataNucleus Core (org.datanucleus:datanucleus-core:3.2.10 - http://www.datanucleus.org)
-     (The Apache Software License, Version 2.0) DataNucleus RDBMS (org.datanucleus:datanucleus-rdbms:3.2.9 - http://www.datanucleus.org)
-     (The Apache Software License, Version 2.0) rest (org.elasticsearch.client:elasticsearch-rest-client:6.0.1 - https://github.com/elastic/elasticsearch)
-     (Apache License, Version 2.0) Hibernate Validator Engine (org.hibernate:hibernate-validator:5.3.4.Final - http://hibernate.org/validator/hibernate-validator)
-     (Apache License 2.0) (LGPL 2.1) (MPL 1.1) Javassist (org.javassist:javassist:3.21.0-GA - http://www.javassist.org/)
-     (Apache License, Version 2.0) Java Annotation Indexer (org.jboss:jandex:2.0.0.Final - http://www.jboss.org/jandex)
-     (Apache License, version 2.0) JBoss Logging 3 (org.jboss.logging:jboss-logging:3.3.0.Final - http://www.jboss.org)
-     (Apache Software License - Version 2.0) (Eclipse Public License - Version 1.0) Jetty Server (org.mortbay.jetty:jetty:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty)
-     (Apache Software License - Version 2.0) (Eclipse Public License - Version 1.0) Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-util)
-     (The Apache Software License, Version 2.0) quartz (org.quartz-scheduler:quartz:2.2.2 - http://www.quartz-scheduler.org/quartz)
-     (The Apache Software License, Version 2.0) quartz-jobs (org.quartz-scheduler:quartz-jobs:2.2.2 - http://www.quartz-scheduler.org/quartz-jobs)
-     (Apache Software Licenses) Log4j Implemented Over SLF4J (org.slf4j:log4j-over-slf4j:1.7.22 - http://www.slf4j.org)
-     (The Apache Software License, Version 2.0) Spring AOP (org.springframework:spring-aop:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Aspects (org.springframework:spring-aspects:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Beans (org.springframework:spring-beans:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Context (org.springframework:spring-context:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Context Support (org.springframework:spring-context-support:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Core (org.springframework:spring-core:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Expression Language (SpEL) (org.springframework:spring-expression:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring JDBC (org.springframework:spring-jdbc:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Object/Relational Mapping (org.springframework:spring-orm:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Transaction (org.springframework:spring-tx:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Web (org.springframework:spring-web:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (The Apache Software License, Version 2.0) Spring Web MVC (org.springframework:spring-webmvc:4.3.6.RELEASE - https://github.com/spring-projects/spring-framework)
-     (Apache License, Version 2.0) Spring Boot (org.springframework.boot:spring-boot:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot AutoConfigure (org.springframework.boot:spring-boot-autoconfigure:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Starter (org.springframework.boot:spring-boot-starter:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot AOP Starter (org.springframework.boot:spring-boot-starter-aop:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Data JPA Starter (org.springframework.boot:spring-boot-starter-data-jpa:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot JDBC Starter (org.springframework.boot:spring-boot-starter-jdbc:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Logging Starter (org.springframework.boot:spring-boot-starter-logging:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Tomcat Starter (org.springframework.boot:spring-boot-starter-tomcat:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Boot Web Starter (org.springframework.boot:spring-boot-starter-web:1.5.1.RELEASE - http://projects.spring.io/spring-boot/)
-     (Apache License, Version 2.0) Spring Data Core (org.springframework.data:spring-data-commons:1.13.0.RELEASE - http://www.spring.io/spring-data/spring-data-commons)
-     (Apache License, Version 2.0) Spring Data JPA (org.springframework.data:spring-data-jpa:1.11.0.RELEASE - http://projects.spring.io/spring-data-jpa)
-     (Apache 2.0) Spring Retry (org.springframework.retry:spring-retry:1.2.0.RELEASE - http://www.springsource.org)
-     (The Apache Software License, Version 2.0) Snappy for Java (org.xerial.snappy:snappy-java:1.0.5 - http://github.com/xerial/snappy-java/)
-     (Apache License, Version 2.0) SnakeYAML (org.yaml:snakeyaml:1.17 - http://www.snakeyaml.org)
-     (The Apache Software License, Version 2.0) Xerces2 Java Parser (xerces:xercesImpl:2.9.1 - http://xerces.apache.org/xerces2-j)
-     (The Apache Software License, Version 2.0) (The SAX License) (The W3C License) XML Commons External Components XML APIs (xml-apis:xml-apis:1.4.01 - http://xml.apache.org/commons/components/external/)
-     (Apache 2.0) zookeeper (org.apache.zookeeper:zookeeper:3.4.6 - no url defined)
-     (Apache 2.0) Jettison (org.codehaus.jettison:jettison:1.1 - no url defined)
-     (GNU Lesser General Public License (LGPL), Version 2.1) (The Apache Software License, Version 2.0) JAX-RS provider for JSON content type (org.codehaus.jackson:jackson-jaxrs:1.9.13 - http://jackson.codehaus.org)
-     (GNU Lesser General Public License (LGPL), Version 2.1) (The Apache Software License, Version 2.0) Xml Compatibility extensions for Jackson (org.codehaus.jackson:jackson-xc:1.9.13 - http://jackson.codehaus.org)
diff --git a/service/src/main/resources/META-INF/NOTICE b/service/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 35c1b27..0000000
--- a/service/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,15 +0,0 @@
-Apache Griffin
-Copyright 2017-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-================================================================
-Notice for Jackson
-
-See licenses/NOTICE-Jackson
-
-================================================================
-Notice for Tomcat
-
-See licenses/NOTICE-Tomcat
\ No newline at end of file
diff --git a/ui/LICENSE b/ui/LICENSE
deleted file mode 100644
index 2bf4bc2..0000000
--- a/ui/LICENSE
+++ /dev/null
@@ -1,310 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-
----------------------------------------------------
-
-The Apache Griffin UI module contains subcomponents in the source code
-release with separate copyright notices and license terms. Your use of
-the source code for the these subcomponents is subject to the terms and
-conditions of their respective licenses.
-
-This project includes the software: angular
-  Available at: https://angular.io
-  Version used: 4.4.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2014-2016 Google, Inc.
-
-This project includes the software: echarts
-  Available at: http://echarts.baidu.com
-  Version used: 3.7.0
-  Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) 2013, Baidu Inc.
-
-This project includes the software: Font Awesome (code)
-  Available at: http://fontawesome.io
-  Inclusive of: font-awesome/{css,scss,less}/*
-  Version used: 4.7.0
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) Dave Gandy (2016)
-
-This project includes the software: Font Awesome (fonts)
-  Available at: http://fontawesome.io
-  Inclusive of: font-awesome/fonts/*
-  Version used: 4.7.0
-  Used under the following license: SIL OFL 1.1 (http://scripts.sil.org/OFL)
-  See details in licenses/SIL-OFL-1.1
-  Copyright (c) Dave Gandy (2016)
-
-This project includes the software: requirejs
-  Available at: http://requirejs.org
-  Version used: 2.2.0
-  Used under the following license: The BSD 3-Clause (New BSD) License (http://opensource.org/licenses/BSD-3-Clause)
-  Copyright (c) 2010-2015, The Dojo Foundation
-
-This project includes the software: jQuery JavaScript Library
-  Available at: http://jquery.com
-  Developed by: The jQuery Foundation (http://jquery.org/)
-  Inclusive of: jquery.js
-  Version used: 3.2.1
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright 2018 The jQuery Foundation
-
-This project includes the software: angular2-multiselect-dropdown
-  Available at: http://cuppalabs.github.io/components/multiselectDropdown
-  Version used: 1.3.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2009-2017, Cuppa Labs. All rights reserved and copyrighted to Pradeep Kumar Terli.
-
-This project includes the software: angular2-toaster
-  Available at: https://github.com/Stabzs/Angular2-Toaster
-  Version used: 4.0.1
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2016-2017 Stabzs.
-
-This project includes the software: Twitter Bootstrap
-  Available at: https://getbootstrap.com
-  Version used: 3.3.7
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2011-2014 Twitter, Inc
-
-This project includes the software: Glyphicons Halflings(glyphicons-halflings-regular.*)
-  Available at: http://glyphicons.com
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-  Copyright (c) 2010 - 2016 Jan Kovarik
-
-This project includes the software: nouislider
-  Available at: https://refreshless.com/nouislider
-  Version used: 11.0.3
-  Used under the following license: WTFPL
-  See details in licenses/WTFPL
-
-This project includes the software: ng2-nouislider
-  Available at: http://tb.github.io/ng2-nouislider
-  Version used: 1.7.6
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: angular-tree-component
-  Available at: https://angular2-tree.readme.io/docs
-  Version used: 4.1.0
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: angular2-datatable
-  Available at: https://github.com/mariuszfoltak/angular2-datatable
-  Version used: 0.6.0
-  Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
-This project includes the software: rxjs
-  Available at: http://reactivex.io/rxjs
-  Version used: 5.4.2
-  Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
-
-This project includes the software: webpack
-  Available at: https://webpack.js.org
-  Version used: 3.5.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: css-loader
-  Available at:  https://github.com/webpack-contrib/css-loader
-  Version used: 0.28.7
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: lodash
-  Available at:  https://github.com/lodash/lodash
-  Version used: 4.17.4
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: mobx-angular
-  Available at:  https://github.com/mobxjs/mobx-angular
-  Version used: 1.5.0
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: mobx
-  Available at:  https://mobx.js.org/
-  Version used: 3.1.11
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: style-loader
-  Available at:  https://github.com/webpack-contrib/style-loader
-  Version used: 0.13.2
-  Used under the following license: The MIT License (http://opensource.org/licenses/MIT)
-
-This project includes the software: tslib
-  Available at:  http://www.tslib.org/
-  Version used: 0.13.2
-  Used under the following license: Apache License, version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
-  Copyright (c) Twitter, Inc. (2012)
\ No newline at end of file
diff --git a/ui/NOTICE b/ui/NOTICE
deleted file mode 100644
index e511be3..0000000
--- a/ui/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Griffin
-Copyright 2017-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/ui/angular/b3vHigh.jpg b/ui/angular/b3vHigh.jpg
deleted file mode 100644
index 0d6949d..0000000
--- a/ui/angular/b3vHigh.jpg
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/app/health/health.component.ts b/ui/angular/src/app/health/health.component.ts
index cd62ccc..a2c99b4 100644
--- a/ui/angular/src/app/health/health.component.ts
+++ b/ui/angular/src/app/health/health.component.ts
@@ -195,7 +195,7 @@
               metricNode.details = JSON.parse(
                 JSON.stringify(jobs[i].metricValues)
               );
-              metricNode.name = mesName; //jobs[i].name;// to avoid same metricName
+              metricNode.name = jobs[i].name;
               metricNode.timestamp = jobs[i].metricValues[0].tmst;
               metricNode.dq =
                 jobs[i].metricValues[0].value.matched /
diff --git a/ui/angular/src/app/job/create-job/create-job.component.html b/ui/angular/src/app/job/create-job/create-job.component.html
index 7bf5e37..86b82e3 100644
--- a/ui/angular/src/app/job/create-job/create-job.component.html
+++ b/ui/angular/src/app/job/create-job/create-job.component.html
@@ -169,7 +169,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-default" data-dismiss="modal" (click)="hide()">Cancel</button>
-              <button type="button" class="btn btn-primary" (click)="save()">Save</button>
+              <button type="button" id="save" class="btn btn-primary" (click)="save()">Save</button>
             </div>
           </div>
         </div>
diff --git a/ui/angular/src/app/job/create-job/create-job.component.ts b/ui/angular/src/app/job/create-job/create-job.component.ts
index 61d1947..2b97728 100644
--- a/ui/angular/src/app/job/create-job/create-job.component.ts
+++ b/ui/angular/src/app/job/create-job/create-job.component.ts
@@ -110,6 +110,7 @@
     setTimeout(() => (this.visible = false), 300);
     this.originBegin = [];
     this.originLength = [];
+    $("#save").removeAttr("disabled");
   }
 
   public onContainerClicked(event: MouseEvent): void {
@@ -187,6 +188,7 @@
 
   save() {
     var addJobs = this.serviceService.config.uri.addJobs;
+    $("#save").attr("disabled", "true");
     this.http.post(addJobs, this.newJob).subscribe(
       data => {
         this.createResult = data["results"];
diff --git a/ui/angular/src/app/job/job.component.html b/ui/angular/src/app/job/job.component.html
index b78a3c7..f7dab88 100644
--- a/ui/angular/src/app/job/job.component.html
+++ b/ui/angular/src/app/job/job.component.html
@@ -172,7 +172,7 @@
           </div>
         </div>
         <div class="modal-footer">
-          <button type="button" class="btn btn-primary" (click)="confirmDelete()">Yes</button>
+          <button type="button" id="save" class="btn btn-primary" (click)="confirmDelete()">Yes</button>
           <button type="button" class="btn btn-default" data-dismiss="modal" (click)="hide()">No</button>
         </div>
       </div>
diff --git a/ui/angular/src/app/job/job.component.ts b/ui/angular/src/app/job/job.component.ts
index 9a8356d..c5abd4f 100644
--- a/ui/angular/src/app/job/job.component.ts
+++ b/ui/angular/src/app/job/job.component.ts
@@ -66,6 +66,7 @@
   }
 
   remove(row) {
+    $("#save").removeAttr("disabled");
     this.visible = true;
     setTimeout(() => (this.visibleAnimate = true), 100);
     this.deletedRow = row;
@@ -81,6 +82,7 @@
   confirmDelete() {
     let deleteJob = this.serviceService.config.uri.deleteJob;
     let deleteUrl = deleteJob + "/" + this.deleteId;
+    $("#save").attr("disabled", "true");
     this.http.delete(deleteUrl).subscribe(
       data => {
         let self = this;
diff --git a/ui/angular/src/app/measure/create-measure/ac/ac.component.html b/ui/angular/src/app/measure/create-measure/ac/ac.component.html
index 6565670..4df3b88 100644
--- a/ui/angular/src/app/measure/create-measure/ac/ac.component.html
+++ b/ui/angular/src/app/measure/create-measure/ac/ac.component.html
@@ -560,7 +560,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-default" (click)="hide()">Cancel</button>
-              <button type="button" class="btn btn-primary" (click)="save()">Save</button>
+              <button type="button" id="save" class="btn btn-primary" (click)="save()">Save</button>
             </div>
           </div>
         </div>
diff --git a/ui/angular/src/app/measure/create-measure/ac/ac.component.ts b/ui/angular/src/app/measure/create-measure/ac/ac.component.ts
index ccedb38..6bcfcb7 100644
--- a/ui/angular/src/app/measure/create-measure/ac/ac.component.ts
+++ b/ui/angular/src/app/measure/create-measure/ac/ac.component.ts
@@ -235,6 +235,7 @@
   public hide(): void {
     this.visibleAnimate = false;
     setTimeout(() => (this.visible = false), 300);
+    $("#save").removeAttr("disabled");
   }
 
   public onContainerClicked(event: MouseEvent): void {
@@ -494,6 +495,7 @@
 
   save() {
     var addModels = this.serviceService.config.uri.addModels;
+    $("#save").attr("disabled", "true");
     this.http.post(addModels, this.newMeasure).subscribe(
       data => {
         this.createResult = data;
diff --git a/ui/angular/src/app/measure/create-measure/pr/pr.component.html b/ui/angular/src/app/measure/create-measure/pr/pr.component.html
index 5bd9e13..8f02256 100644
--- a/ui/angular/src/app/measure/create-measure/pr/pr.component.html
+++ b/ui/angular/src/app/measure/create-measure/pr/pr.component.html
@@ -403,7 +403,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-default" (click)="hide()">Cancel</button>
-              <button type="button" class="btn btn-primary" (click)="save()">Save</button>
+              <button type="button" id="save" class="btn btn-primary" (click)="save()">Save</button>
             </div>
           </div>
         </div>
diff --git a/ui/angular/src/app/measure/create-measure/pr/pr.component.ts b/ui/angular/src/app/measure/create-measure/pr/pr.component.ts
index 79bb1b8..f5f0763 100644
--- a/ui/angular/src/app/measure/create-measure/pr/pr.component.ts
+++ b/ui/angular/src/app/measure/create-measure/pr/pr.component.ts
@@ -189,6 +189,7 @@
     this.transenumrule = [];
     this.transnullrule = [];
     this.noderule = [];
+    $("#save").removeAttr("disabled");
   }
 
   public onContainerClicked(event: MouseEvent): void {
@@ -488,6 +489,7 @@
 
   save() {
     var addModels = this.serviceService.config.uri.addModels;
+    $("#save").attr("disabled", "true");
     this.http.post(addModels, this.newMeasure).subscribe(
       data => {
         this.createResult = data;
diff --git a/ui/angular/src/app/measure/create-measure/pub/pub.component.html b/ui/angular/src/app/measure/create-measure/pub/pub.component.html
index 2dd80ac..7fd8950 100644
--- a/ui/angular/src/app/measure/create-measure/pub/pub.component.html
+++ b/ui/angular/src/app/measure/create-measure/pub/pub.component.html
@@ -198,7 +198,7 @@
             </div>
             <div class="modal-footer">
               <button type="button" class="btn btn-default" (click)="hide()">Cancel</button>
-              <button type="button" class="btn btn-primary" (click)="save()">Save</button>
+              <button type="button" id="save" class="btn btn-primary" (click)="save()">Save</button>
             </div>
           </div>
         </div>
diff --git a/ui/angular/src/app/measure/create-measure/pub/pub.component.ts b/ui/angular/src/app/measure/create-measure/pub/pub.component.ts
index 99871eb..20f79f7 100644
--- a/ui/angular/src/app/measure/create-measure/pub/pub.component.ts
+++ b/ui/angular/src/app/measure/create-measure/pub/pub.component.ts
@@ -71,6 +71,7 @@
   public hide(): void {
     this.visibleAnimate = false;
     setTimeout(() => (this.visible = false), 300);
+    $("#save").removeAttr("disabled");
   }
 
   public onContainerClicked(event: MouseEvent): void {
@@ -149,6 +150,7 @@
       owner:this.newMeasure.owner
     }
     var addModels = this.serviceService.config.uri.addModels;
+    $("#save").attr("disabled", "true");
     this.http.post(addModels, measure2Save).subscribe(
       data => {
         this.createResult = data;
diff --git a/ui/angular/src/app/measure/measure.component.html b/ui/angular/src/app/measure/measure.component.html
index 67f3fa8..5342d63 100644
--- a/ui/angular/src/app/measure/measure.component.html
+++ b/ui/angular/src/app/measure/measure.component.html
@@ -129,7 +129,7 @@
         </div>
         <div class="modal-footer">
           <p class="delete-alert">If you delete this measure, your running jobs on this measure will also be deleted, please be careful!</p>
-          <button type="button" class="btn btn-default" (click)="confirmDelete()">Yes</button>
+          <button type="button" id="save" class="btn btn-default" (click)="confirmDelete()">Yes</button>
           <button type="button" class="btn btn-primary" (click)="hide()">No</button>
         </div>
       </div>
diff --git a/ui/angular/src/app/measure/measure.component.ts b/ui/angular/src/app/measure/measure.component.ts
index 6f5acbb..936742a 100644
--- a/ui/angular/src/app/measure/measure.component.ts
+++ b/ui/angular/src/app/measure/measure.component.ts
@@ -65,12 +65,12 @@
   }
 
   remove(row) {
-    console.log(row);
     this.visible = true;
     setTimeout(() => (this.visibleAnimate = true), 100);
     this.deleteId = row.id;
     this.deleteIndex = this.results.indexOf(row);
     this.deletedRow = row;
+    $("#save").removeAttr("disabled");
     if(this.deletedRow["measure.type"]!=="external"){
       var sourcedata = this.deletedRow["data.sources"][0].connectors[0].config;
       this.sourceTable = sourcedata["table.name"];
@@ -86,6 +86,7 @@
   confirmDelete() {
     var deleteModel = this.serviceService.config.uri.deleteModel;
     let deleteUrl = deleteModel + "/" + this.deleteId;
+    $("#save").attr("disabled", "true");
     this.http.delete(deleteUrl).subscribe(
       data => {
         var self = this;
diff --git a/ui/angular/src/app/metric/metric.component.html b/ui/angular/src/app/metric/metric.component.html
index 52023ca..01e0080 100644
--- a/ui/angular/src/app/metric/metric.component.html
+++ b/ui/angular/src/app/metric/metric.component.html
@@ -29,20 +29,21 @@
 	    </span>
       </div>
     </div>
-    <div class="col-sm-5 chartItem"  *ngFor="let outerItems of finalData;let parent=index" style="margin-bottom:30px;margin-right:15px;">
-      <div class="row">      
+    <!-- <div class="col-sm-5 chartItem"  *ngFor="let outerItems of finalData;let parent=index" style="margin-bottom:30px;margin-right:15px;"> -->
+    <div *ngFor="let outerItems of finalData;let parent=index">
+      <!-- <div class="row">      
         <div style="text-align: center;" >
           <h4>{{outerItems.name}}</h4>
         </div>
-      </div>
-      <div class="row">
-        <!-- <div class="col-sm-6 col-md-4 col-xs-12 col-lg-3 chartItem" *ngFor="let items of outerItems.metrics;let i=index;" style="margin-bottom:30px;"> -->
-          <div *ngFor="let items of outerItems.metrics;let i=index;">
+      </div> -->
+      <!-- <div class="row"> -->
+        <div class="col-sm-6 col-md-4 col-xs-12 col-lg-3 chartItem" *ngFor="let items of outerItems.metrics;let i=index;" style="margin-bottom:30px;">
+          <!-- <div *ngFor="let items of outerItems.metrics;let i=index;"> -->
           <div class="row-fluid" style="cursor: pointer;">
             <div id="thumbnail{{parent}}-{{i}}" class="thumb-chart" style="border: 2px solid;" echarts [options]="getOption(parent,i)" (click)="goTo(parent,i)"></div>
           </div>
         </div>
-      </div>
+      <!-- </div> -->
     </div>
   </div>
 </div>
diff --git a/ui/angular/src/assets/img/1.PNG b/ui/angular/src/assets/img/1.PNG
deleted file mode 100644
index e9a3063..0000000
--- a/ui/angular/src/assets/img/1.PNG
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/2.PNG b/ui/angular/src/assets/img/2.PNG
deleted file mode 100644
index af12dc4..0000000
--- a/ui/angular/src/assets/img/2.PNG
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/b3vHigh.jpg b/ui/angular/src/assets/img/b3vHigh.jpg
deleted file mode 100644
index 0d6949d..0000000
--- a/ui/angular/src/assets/img/b3vHigh.jpg
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/bollinger.png b/ui/angular/src/assets/img/bollinger.png
deleted file mode 100644
index efb1f49..0000000
--- a/ui/angular/src/assets/img/bollinger.png
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/construction.gif b/ui/angular/src/assets/img/construction.gif
deleted file mode 100644
index 7d03450..0000000
--- a/ui/angular/src/assets/img/construction.gif
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/mad.png b/ui/angular/src/assets/img/mad.png
deleted file mode 100644
index aa85a76..0000000
--- a/ui/angular/src/assets/img/mad.png
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/sidebar1.png b/ui/angular/src/assets/img/sidebar1.png
deleted file mode 100644
index 6a64412..0000000
--- a/ui/angular/src/assets/img/sidebar1.png
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/sidebar2.png b/ui/angular/src/assets/img/sidebar2.png
deleted file mode 100644
index 425b863..0000000
--- a/ui/angular/src/assets/img/sidebar2.png
+++ /dev/null
Binary files differ
diff --git a/ui/angular/src/assets/img/yoy.png b/ui/angular/src/assets/img/yoy.png
deleted file mode 100644
index 2f071ac..0000000
--- a/ui/angular/src/assets/img/yoy.png
+++ /dev/null
Binary files differ