commit aa808f1b7b3c738243d9a594151ca69e7d3bfc96
author Michael Blow <mblow@apache.org> Mon Mar 11 13:12:32 2019 -0400
committer Michael Blow <mblow@apache.org> Mon Mar 11 13:12:32 2019 -0400
tree f53989153c79e35b347e3a87ff34e62fc29e4655
parent 8ff6a2ee6e3c4a3cdff74cd50358cec448938166
parent ffe8fe6b8f8fae35ac2619626ed242f4c813d506

Merge commit 'ffe8fe6' from 'stabilization-f69489' into 'master'

Change-Id: I4783b5ee835f3c571bb39c2d7a1de0e3758dfd56

asterixdb/LICENSE

diff --git a/asterixdb/LICENSE b/asterixdb/LICENSE
index 442228a..574589f 100644
--- a/asterixdb/LICENSE
+++ b/asterixdb/LICENSE
@@ -207,9 +207,8 @@
    Portions of the AsterixDB WebUI
        located at:
          asterix-app/src/main/resources/webui/static/js/jquery.min.js,
-         asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js,
        and
-         asterix-app/src/main/resources/queryui/js/jquery-1.12.4.min.js
+         asterix-app/src/main/resources/webui/static/js/jquery.autosize-min.js
 
    are available under an MIT-style license:
 ---

asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE

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 7e6690d..0620804 100644
--- a/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
+++ b/asterixdb/asterix-app/src/main/appended-resources/META-INF/LICENSE
@@ -6,6 +6,7 @@
    Portions of the AsterixDB WebUI
        located at:
          webui/static/js/jquery.min.js,
+       and
          webui/static/js/jquery.autosize-min.js
 
    are available under an MIT-style license:
@@ -470,3 +471,4 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 ---
+=======

asterixdb/src/main/licenses/templates/source_licenses.ftl

diff --git a/asterixdb/src/main/licenses/templates/source_licenses.ftl b/asterixdb/src/main/licenses/templates/source_licenses.ftl
index cc3e767..ed88e9b 100644
--- a/asterixdb/src/main/licenses/templates/source_licenses.ftl
+++ b/asterixdb/src/main/licenses/templates/source_licenses.ftl
@@ -50,7 +50,7 @@
     <#assign licenseComponent="AsterixDB WebUI"/>
     <#assign licenseLocation="${asterixAppLocation!}"/>
     <#assign licenseFilePrefix="${asterixAppResourcesPrefix!}"/>
-    <@license files=["webui/static/js/jquery.min.js", "webui/static/js/jquery.autosize-min.js", "queryui/js/jquery-1.12.4.min.js"]
+    <@license files=["webui/static/js/jquery.min.js", "webui/static/js/jquery.autosize-min.js"]
               licenseName="an MIT-style license">
    Copyright jQuery Foundation and other contributors, https://jquery.org/