diff --git a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
index de42a8e..78371a6 100644
--- a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
+++ b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
@@ -1,31 +1,248 @@
------------------------------------------------------------------------
+===
+   AsterixDB includes source code with separate copyright notices and
+   license terms. Your use of this source code is subject to the terms
+   and condition of the following licenses.
+===
+   Portions of the AsterixDB WebUI
+       located at:
+         webui/static/js/jquery.min.js,
+         webui/static/js/jquery.autosize-min.js,
+       and
+         queryui/js/jquery-1.12.4.min.js
 
-ASTERIXDB COMPONENTS:
+   are available under an MIT-style license:
+---
+   Copyright jQuery Foundation and other contributors, https://jquery.org/
 
-AsterixDB includes a number of subcomponents with separate copyright
-notices and license terms. Your use of the source code for these
-subcomponents is subject to the terms and condition of the following
-licenses.
+   This software consists of voluntary contributions made by many
+   individuals. For exact contribution history, see the revision history
+   available at https://github.com/jquery/jquery
 
+   The following license applies to all parts of this software except as
+   documented below:
 
------------------------------------------------------------------------
- The MIT License
------------------------------------------------------------------------
+   ====
 
- - jQuery (webui/static/js/jquery.min.js)
- - Bootstrap (webui/static/js/bootstrap.min.js),
-   (webui/static/js/bootstrap.min.css),
-   (webui/static/js/bootstrap-responsive.min.css)
- - Smoothie Charts (webui/static/js/smoothie.js)
+   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 text of The MIT License is below for convenience. Refer to the website of each project for exact details.
+   The above copyright notice and this permission notice shall be
+   included in all copies or substantial portions of the Software.
 
-The MIT License (MIT)
+   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.
 
-Copyright (c) <year> <copyright holders>
+   ====
 
-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:
+   All files located in the node_modules and external directories are
+   externally maintained libraries used by this software which have their
+   own licenses; we recommend you read them, as their terms may differ from
+   the terms above.
+---
+   Portions of the AsterixDB WebUI
+       located at:
+         webui/static/js/bootstrap.min.js,
+         webui/static/css/bootstrap-responsive.min.css,
+       and
+         webui/static/css/bootstrap.min.css
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+   are available under the following license:
+---
+   Copyright 2012 Twitter, Inc.
+   http://www.apache.org/licenses/LICENSE-2.0.txt
+---
+   Portions of the AsterixDB WebUI
+       located at:
+         webui/static/js/smoothie.js,
+       and
+         feed/smoothie.js
 
-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.
+   are available under the following license:
+---
+   Copyright (c) 2010-2013, Joe Walnes
+
+   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.
+---
+   Portions of the AsterixDB QueryUI
+       located at:
+         queryui/js/json-formatter.min.js,
+       and
+         queryui/css/json-formatter.min.css
+
+   are available under the following license:
+---
+   Copyright 2014 Mohsen Azimi
+
+   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
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   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.
+---
+   Portions of the AsterixDB QueryUI
+       located at:
+         queryui/js/bootstrap.min.js,
+         queryui/css/bootstrap.min.css,
+       and
+         queryui/css/bootstrap-theme.min.css
+
+   are available under the following license:
+---
+   The MIT License (MIT)
+
+   Copyright (c) 2011-2015 Twitter, Inc
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+
+   queryui/css/bootstrap.min.css also contains normalize.css v3.0.3
+   (http://github.com/necolas/normalize.css), having the following copyright:
+
+   Copyright © Nicolas Gallagher and Jonathan Neal
+
+   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.
+---
+
+   Portions of the AsterixDB QueryUI
+       located at:
+         queryui/js/angular.min.js
+
+   are available under The MIT License:
+---
+   Copyright (c) 2010-2016 Google, Inc. http://angularjs.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 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.
+---
+   Portions of the AsterixDB QueryUI
+       located at:
+         queryui/js/codemirror.js,
+         queryui/js/javascript.js,
+       and
+         queryui/css/codemirror.css
+
+   are available under The MIT License:
+---
+   Copyright (C) 2016 by Marijn Haverbeke <marijnh@gmail.com> and others
+
+   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.
+---
+   Portions of the AsterixDB QueryUI
+       located at:
+         queryui/js/ui-codemirror.js
+
+   are available under The MIT License:
+---
+   Copyright (c) 2012 the AngularUI Team, http://angular-ui.github.com
+
+   Permission is hereby granted, free of charge, to any person obtaining a copy
+   of this software and associated documentation files (the "Software"), to deal
+   in the Software without restriction, including without limitation the rights
+   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   copies of the Software, and to permit persons to whom the Software is
+   furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   THE SOFTWARE.
+---
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 24571da..dfc4f7b 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -23,6 +23,7 @@
   <artifactId>apache-asterixdb</artifactId>
   <version>0.8.9-SNAPSHOT</version>
   <packaging>pom</packaging>
+  <url>https://asterixdb.apache.org/</url>
 
   <parent>
     <groupId>org.apache</groupId>
@@ -74,6 +75,16 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <excludes>
+            <exclude>**/DEPENDENCIES</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <version>2.16</version>
         <configuration>
@@ -199,10 +210,12 @@
               <goal>process</goal>
             </goals>
             <configuration>
-              <appendedResourcesDirectory>${appendedResourcesDirectory}</appendedResourcesDirectory>
               <resourceBundles>
                 <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
               </resourceBundles>
+              <properties>
+                <projectName>Apache AsterixDB - ${project.name}</projectName>
+              </properties>
             </configuration>
           </execution>
         </executions>
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE
index b4b85af..15cf255 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/appended-resources/META-INF/LICENSE
@@ -1,7 +1,10 @@
+   Portions of the Hyracks admin console
+       in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly
+       located at:
+         static/javascript/flot/
 
-For portions of the Hyracks admin console at
-static/javascript/flot/
-
+   are available under The MIT License:
+---
    Copyright (c) 2007-2014 IOLA and Ole Laursen
 
    Permission is hereby granted, free of charge, to any person
@@ -24,10 +27,14 @@
    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.
+---
+   Portions of the Hyracks admin console
+       in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly
+       located at:
+         static/javascript/jsplumb/
 
-As well as the Hyracks adminconsole resources at:
-static/javascript/jsplumb/
-
+   are available under The MIT License:
+---
    Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -48,12 +55,16 @@
    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.
+---
+   Portions of the Hyracks admin console
+       in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly
+       located at:
+         static/javascript/jquery,
+       and
+         static/javascript/jquery-ui
 
-and also the Hyracks adminconsole resources at:
-static/javascript/jquery
-and
-static/stylesheet/jquery-ui
-
+   are available under The MIT License:
+---
    Copyright jQuery Foundation and other contributors, https://jquery.org/
 
    This software consists of voluntary contributions made by many
@@ -90,20 +101,27 @@
    externally maintained libraries used by this software which have their
    own licenses; we recommend you read them, as their terms may differ from
    the terms above.
+---
+   Portions of the Hyracks admin console
+       in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly
+       located at:
+         static/javascript/jquery/plugins/jquery.getParams.js
 
-and also the Hyracks adminconsole resource at:
-static/javascript/jquery/plugins/jquery.getParams.js
-
-
+   are available under The MIT License:
+---
    Copyright (c) 2006 Mathias Bank (http://www.mathias-bank.de)
    Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
    and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
 
    Thanks to Hinnerk Ruemenapf - http://hinnerk.ruemenapf.de/ for bug reporting and fixing.
+---
+   Portions of the Hyracks admin console
+       in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly
+       located at:
+         static/javascript/jquery/plugins/jquery.timer.js
 
-and also the Hyracks adminconsole resource at:
-static/javascript/jquery/plugins/jquery.timer.js
-
+   are available under The MIT License:
+---
    jquery.timer.js
 
    Copyright (c) 2011 Jason Chavannes <jason.chavannes@gmail.com>
@@ -129,14 +147,16 @@
    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.
+---
+   Portions of the Hyracks admin console
+       in: repo/hyracks-control-cc-0.8.9-SNAPSHOT.jar, within this assembly
+       located at:
+         static/stylesheet/json.human.css,
+       and
+         static/javascript/adminconsole/json.human.js
 
-and also the Hyracks adminconsole resource at:
-static/stylesheet/json.human.css
-
-   json.human.css
-
-   MIT License:
-
+   are available under The MIT License:
+---
    Copyright (c) 2015, Mariano Guerra
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -156,31 +176,4 @@
    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
    THE SOFTWARE.
-
-and also the Hyracks adminconsole resource at:
-static/javascript/adminconsole/json.human.js
-
-   json.human.js
-
-   MIT License:
-
-   Copyright (c) 2015, Mariano Guerra
-
-   Permission is hereby granted, free of charge, to any person obtaining a copy
-   of this software and associated documentation files (the "Software"), to deal
-   in the Software without restriction, including without limitation the rights
-   to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-   copies of the Software, and to permit persons to whom the Software is
-   furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-   AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-   THE SOFTWARE.
-
+---
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 4473802..6c153c6 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -24,6 +24,7 @@
   <version>0.2.18-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>hyracks-ecosystem-full-stack</name>
+  <url>https://asterixdb.apache.org/</url>
 
   <parent>
     <groupId>org.apache</groupId>
@@ -149,6 +150,16 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>3.0.0</version>
+        <configuration>
+          <excludes>
+            <exclude>**/DEPENDENCIES</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>2.10</version>
         <configuration>
@@ -331,9 +342,12 @@
               <goal>process</goal>
             </goals>
             <configuration>
-              <resourceBundles combine.children="append">
+              <resourceBundles>
                 <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
               </resourceBundles>
+              <properties>
+                <projectName>Apache Hyracks - ${project.name}</projectName>
+              </properties>
             </configuration>
           </execution>
         </executions>