Repository: nifi Updated Branches: refs/heads/master 688f906a7 -> 9aa7e65f7
[NIFI-5215] Upgrade AngularJS to v1.7.0. Also, adding package-lock.json to source control [NIFI-5215] add package-lock.json to rat excludes This closes #2721 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9aa7e65f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9aa7e65f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9aa7e65f Branch: refs/heads/master Commit: 9aa7e65f70821665f9913170caf13730b2c9b586 Parents: 688f906 Author: Scott Aslan <[email protected]> Authored: Fri May 18 14:50:23 2018 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue May 29 13:20:49 2018 -0400 ---------------------------------------------------------------------- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 + .../src/main/frontend/package-lock.json | 493 +++++++++++++++++++ .../nifi-web-ui/src/main/frontend/package.json | 32 +- .../WEB-INF/partials/canvas/canvas-header.jsp | 2 +- .../src/main/webapp/css/common-ui.css | 4 + .../src/main/frontend/package.json | 14 + 6 files changed, 536 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/9aa7e65f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml index 9ba9fbf..bd4bed0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml @@ -193,6 +193,7 @@ <!-- jquery ui --> <include>jquery-ui-dist/jquery-ui.min.js</include> <include>jquery-ui-dist/jquery-ui.min.css</include> + <include>jquery-ui-dist/images/**/*</include> <include>jquery-ui-dist/LICENSE.txt</include> <!-- jquery minicolors --> <include>jquery-minicolors/jquery.minicolors.min.js</include> @@ -895,6 +896,7 @@ <excludes combine.children="append"> <exclude>nbactions.xml</exclude> <exclude>src/main/frontend/package.json</exclude> + <exclude>src/main/frontend/package-lock.json</exclude> <exclude>src/main/webapp/js/jquery/jquery.base64.js</exclude> <exclude>src/main/webapp/js/codemirror/</exclude> <exclude>src/main/webapp/fonts/**/*</exclude> http://git-wip-us.apache.org/repos/asf/nifi/blob/9aa7e65f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json new file mode 100644 index 0000000..c066a65 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package-lock.json @@ -0,0 +1,493 @@ +{ + "//": "Licensed to the Apache Software Foundation (ASF) under one or more", + "//": "contributor license agreements. See the NOTICE file distributed with", + "//": "this work for additional information regarding copyright ownership.", + "//": "The ASF licenses this file to You 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.", + "name": "apache-nifi", + "requires": true, + "lockfileVersion": 1, + "dependencies": { + "JSON2": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/JSON2/-/JSON2-0.1.0.tgz";, + "integrity": "sha1-jXSTBApj1YNa919H3suDq2yMB5A=" + }, + "JSV": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/JSV/-/JSV-4.0.2.tgz";, + "integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c=" + }, + "angular": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.0.tgz";, + "integrity": "sha512-3LboCLjrOuC7dWh953O0+dI3dJ7PexYRSCIrfqoN5qoHyja/wak3eWoxPKb2Sl2qwiPbrUV5KJXwgpUQ48McBQ==" + }, + "angular-animate": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.0.tgz";, + "integrity": "sha512-508uYJLhcX85cKqOlp3stzv1WEnlEtKPGC2J1ljn8sxhwUhENWte2lGI8DJev26Lsk5dHpinBSJC/J0f7jj53w==" + }, + "angular-aria": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.7.0.tgz";, + "integrity": "sha512-Va2FxLqXRfNGHd7BO49PrAPVUKo3k8bIpfNDp+TF+e2W14hfiyb0CxLdg+jgUatzIsg/+dCWnuEhCd062XOQvg==" + }, + "angular-material": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/angular-material/-/angular-material-1.1.9.tgz";, + "integrity": "sha512-kxyigi+7823k/31qQ0j6wL5FkCe/mw2bAg1kfEFzIvhUoe5Myr+0YoQyN8D8EGaaOyolXU/VPtxgKSfOCSLEBw==" + }, + "angular-messages": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.7.0.tgz";, + "integrity": "sha512-77NqLV2EQgSirRcb5bUSSbyc1GJexBl5PrbpBlXp6EalAL7N27wgEOcSP59ViIusyjY0kezT7RmO2YGzzA56YQ==" + }, + "angular-mocks": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.0.tgz";, + "integrity": "sha512-tBlj9jIEpbgiYY1VpV6XAi+5JSAO0AXFziVW4TSIFETB23fautoREI7XbOeRgy/QmOhZA4P320gs2XgpbvLd0w==" + }, + "angular-resource": { + "version": "1.5.5", + "resolved": "https://registry.npmjs.org/angular-resource/-/angular-resource-1.5.5.tgz";, + "integrity": "sha1-7NzTDNVEQRlDYGzLhC/93fTtdpI=" + }, + "angular-route": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.7.0.tgz";, + "integrity": "sha512-uljEHpNRt5++GWwvAe+33dTuBuLh7mpxPU3lnwb/DFxvcNpPPcS8jImXzWQc2tPi/S6hGPovhMqjxmJIG8kz0A==" + }, + "angular-sanitize": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.7.0.tgz";, + "integrity": "sha512-AIBJ9Es6symE0aqDeSYRoHlZ/Wsvyk3YnMsLl+I8T5EWz2Ht7+6ffMvrFpnWPNS1jV75JtOeOWpOHpbP3HjRCw==" + }, + "ansi-styles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.0.0.tgz";, + "integrity": "sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=" + }, + "chalk": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.4.0.tgz";, + "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", + "requires": { + "ansi-styles": "1.0.0", + "has-color": "0.1.7", + "strip-ansi": "0.1.1" + } + }, + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz";, + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + }, + "d3": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-4.13.0.tgz";, + "integrity": "sha512-l8c4+0SldjVKLaE2WG++EQlqD7mh/dmQjvi2L2lKPadAVC+TbJC4ci7Uk9bRi+To0+ansgsS0iWfPjD7DBy+FQ==", + "requires": { + "d3-array": "1.2.1", + "d3-axis": "1.0.8", + "d3-brush": "1.0.4", + "d3-chord": "1.0.4", + "d3-collection": "1.0.4", + "d3-color": "1.0.3", + "d3-dispatch": "1.0.3", + "d3-drag": "1.2.1", + "d3-dsv": "1.0.8", + "d3-ease": "1.0.3", + "d3-force": "1.1.0", + "d3-format": "1.2.2", + "d3-geo": "1.9.1", + "d3-hierarchy": "1.1.5", + "d3-interpolate": "1.1.6", + "d3-path": "1.0.5", + "d3-polygon": "1.0.3", + "d3-quadtree": "1.0.3", + "d3-queue": "3.0.7", + "d3-random": "1.1.0", + "d3-request": "1.0.6", + "d3-scale": "1.0.7", + "d3-selection": "1.3.0", + "d3-shape": "1.2.0", + "d3-time": "1.0.8", + "d3-time-format": "2.1.1", + "d3-timer": "1.0.7", + "d3-transition": "1.1.1", + "d3-voronoi": "1.1.2", + "d3-zoom": "1.7.1" + } + }, + "d3-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.1.tgz";, + "integrity": "sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw==" + }, + "d3-axis": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.8.tgz";, + "integrity": "sha1-MacFoLU15ldZ3hQXOjGTMTfxjvo=" + }, + "d3-brush": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.0.4.tgz";, + "integrity": "sha1-AMLyOAGfJPbAoZSibUGhUw/+e8Q=", + "requires": { + "d3-dispatch": "1.0.3", + "d3-drag": "1.2.1", + "d3-interpolate": "1.1.6", + "d3-selection": "1.3.0", + "d3-transition": "1.1.1" + } + }, + "d3-chord": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.4.tgz";, + "integrity": "sha1-fexPC6iG9xP+ERxF92NBT290yiw=", + "requires": { + "d3-array": "1.2.1", + "d3-path": "1.0.5" + } + }, + "d3-collection": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz";, + "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI=" + }, + "d3-color": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz";, + "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs=" + }, + "d3-dispatch": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.3.tgz";, + "integrity": "sha1-RuFJHqqbWMNY/OW+TovtYm54cfg=" + }, + "d3-drag": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz";, + "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==", + "requires": { + "d3-dispatch": "1.0.3", + "d3-selection": "1.3.0" + } + }, + "d3-dsv": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.0.8.tgz";, + "integrity": "sha512-IVCJpQ+YGe3qu6odkPQI0KPqfxkhbP/oM1XhhE/DFiYmcXKfCRub4KXyiuehV1d4drjWVXHUWx4gHqhdZb6n/A==", + "requires": { + "commander": "2.15.1", + "iconv-lite": "0.4.23", + "rw": "1.3.3" + } + }, + "d3-ease": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.3.tgz";, + "integrity": "sha1-aL+8NJM4o4DETYrMT7wzBKotjA4=" + }, + "d3-force": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.1.0.tgz";, + "integrity": "sha512-2HVQz3/VCQs0QeRNZTYb7GxoUCeb6bOzMp/cGcLa87awY9ZsPvXOGeZm0iaGBjXic6I1ysKwMn+g+5jSAdzwcg==", + "requires": { + "d3-collection": "1.0.4", + "d3-dispatch": "1.0.3", + "d3-quadtree": "1.0.3", + "d3-timer": "1.0.7" + } + }, + "d3-format": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.2.tgz";, + "integrity": "sha512-zH9CfF/3C8zUI47nsiKfD0+AGDEuM8LwBIP7pBVpyR4l/sKkZqITmMtxRp04rwBrlshIZ17XeFAaovN3++wzkw==" + }, + "d3-geo": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.9.1.tgz";, + "integrity": "sha512-l9wL/cEQkyZQYXw3xbmLsH3eQ5ij+icNfo4r0GrLa5rOCZR/e/3am45IQ0FvQ5uMsv+77zBRunLc9ufTWSQYFA==", + "requires": { + "d3-array": "1.2.1" + } + }, + "d3-hierarchy": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.5.tgz";, + "integrity": "sha1-ochFxC+Eoga88cAcAQmOpN2qeiY=" + }, + "d3-interpolate": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz";, + "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==", + "requires": { + "d3-color": "1.0.3" + } + }, + "d3-path": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz";, + "integrity": "sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q=" + }, + "d3-polygon": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.3.tgz";, + "integrity": "sha1-FoiOkCZGCTPysXllKtN4Ik04LGI=" + }, + "d3-quadtree": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.3.tgz";, + "integrity": "sha1-rHmH4+I/6AWpkPKOG1DTj8uCJDg=" + }, + "d3-queue": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/d3-queue/-/d3-queue-3.0.7.tgz";, + "integrity": "sha1-yTouVLQXwJWRKdfXP2z31Ckudhg=" + }, + "d3-random": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.0.tgz";, + "integrity": "sha1-ZkLlBsb6OmSFldKyRpeIqNElKdM=" + }, + "d3-request": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/d3-request/-/d3-request-1.0.6.tgz";, + "integrity": "sha512-FJj8ySY6GYuAJHZMaCQ83xEYE4KbkPkmxZ3Hu6zA1xxG2GD+z6P+Lyp+zjdsHf0xEbp2xcluDI50rCS855EQ6w==", + "requires": { + "d3-collection": "1.0.4", + "d3-dispatch": "1.0.3", + "d3-dsv": "1.0.8", + "xmlhttprequest": "1.8.0" + } + }, + "d3-scale": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.7.tgz";, + "integrity": "sha512-KvU92czp2/qse5tUfGms6Kjig0AhHOwkzXG0+PqIJB3ke0WUv088AHMZI0OssO9NCkXt4RP8yju9rpH8aGB7Lw==", + "requires": { + "d3-array": "1.2.1", + "d3-collection": "1.0.4", + "d3-color": "1.0.3", + "d3-format": "1.2.2", + "d3-interpolate": "1.1.6", + "d3-time": "1.0.8", + "d3-time-format": "2.1.1" + } + }, + "d3-selection": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.3.0.tgz";, + "integrity": "sha512-qgpUOg9tl5CirdqESUAu0t9MU/t3O9klYfGfyKsXEmhyxyzLpzpeh08gaxBUTQw1uXIOkr/30Ut2YRjSSxlmHA==" + }, + "d3-selection-multi": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/d3-selection-multi/-/d3-selection-multi-1.0.1.tgz";, + "integrity": "sha1-zWwlQT0EosuXRw54byzYd/PjT1g=", + "requires": { + "d3-selection": "1.3.0", + "d3-transition": "1.1.1" + } + }, + "d3-shape": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.2.0.tgz";, + "integrity": "sha1-RdAVOPBkuv0F6j1tLLdI/YxB93c=", + "requires": { + "d3-path": "1.0.5" + } + }, + "d3-time": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.8.tgz";, + "integrity": "sha512-YRZkNhphZh3KcnBfitvF3c6E0JOFGikHZ4YqD+Lzv83ZHn1/u6yGenRU1m+KAk9J1GnZMnKcrtfvSktlA1DXNQ==" + }, + "d3-time-format": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.1.1.tgz";, + "integrity": "sha512-8kAkymq2WMfzW7e+s/IUNAtN/y3gZXGRrdGfo6R8NKPAA85UBTxZg5E61bR6nLwjPjj4d3zywSQe1CkYLPFyrw==", + "requires": { + "d3-time": "1.0.8" + } + }, + "d3-timer": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.7.tgz";, + "integrity": "sha512-vMZXR88XujmG/L5oB96NNKH5lCWwiLM/S2HyyAQLcjWJCloK5shxta4CwOFYLZoY3AWX73v8Lgv4cCAdWtRmOA==" + }, + "d3-transition": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.1.1.tgz";, + "integrity": "sha512-xeg8oggyQ+y5eb4J13iDgKIjUcEfIOZs2BqV/eEmXm2twx80wTzJ4tB4vaZ5BKfz7XsI/DFmQL5me6O27/5ykQ==", + "requires": { + "d3-color": "1.0.3", + "d3-dispatch": "1.0.3", + "d3-ease": "1.0.3", + "d3-interpolate": "1.1.6", + "d3-selection": "1.3.0", + "d3-timer": "1.0.7" + } + }, + "d3-voronoi": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.2.tgz";, + "integrity": "sha1-Fodmfo8TotFYyAwUgMWinLDYlzw=" + }, + "d3-zoom": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.7.1.tgz";, + "integrity": "sha512-sZHQ55DGq5BZBFGnRshUT8tm2sfhPHFnOlmPbbwTkAoPeVdRTkB4Xsf9GCY0TSHrTD8PeJPZGmP/TpGicwJDJQ==", + "requires": { + "d3-dispatch": "1.0.3", + "d3-drag": "1.2.1", + "d3-interpolate": "1.1.6", + "d3-selection": "1.3.0", + "d3-transition": "1.1.1" + } + }, + "ev-emitter": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ev-emitter/-/ev-emitter-1.1.1.tgz";, + "integrity": "sha512-ipiDYhdQSCZ4hSbX4rMW+XzNKMD1prg/sTvoVmSLkuQ1MVlwjJQQA+sW8tMYR3BLUr9KjodFV4pvzunvRhd33Q==" + }, + "font-awesome": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.6.1.tgz";, + "integrity": "sha1-VHJl+0xFu+2Qq4vE93qXs3uFKhI=" + }, + "has-color": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/has-color/-/has-color-0.1.7.tgz";, + "integrity": "sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=" + }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz";, + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "requires": { + "safer-buffer": "2.1.2" + } + }, + "imagesloaded": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/imagesloaded/-/imagesloaded-4.1.4.tgz";, + "integrity": "sha512-ltiBVcYpc/TYTF5nolkMNsnREHW+ICvfQ3Yla2Sgr71YFwQ86bDwV9hgpFhFtrGPuwEx5+LqOHIrdXBdoWwwsA==", + "requires": { + "ev-emitter": "1.1.1" + } + }, + "jquery": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.1.1.tgz";, + "integrity": "sha1-NHwcIcfgBBFeCk2jLOzgQfrTyKM=" + }, + "jquery-form": { + "version": "3.50.0", + "resolved": "https://registry.npmjs.org/jquery-form/-/jquery-form-3.50.0.tgz";, + "integrity": "sha1-18lptR4JThLaaZHrYf9a8l9ZeY8=", + "requires": { + "jquery": "3.1.1" + } + }, + "jquery-minicolors": { + "version": "2.1.10", + "resolved": "https://registry.npmjs.org/jquery-minicolors/-/jquery-minicolors-2.1.10.tgz";, + "integrity": "sha1-sp7qVB2aMrTiaSMWj7LBYnGGc3k=", + "requires": { + "jquery": "3.1.1" + } + }, + "jquery-ui": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz";, + "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=" + }, + "jquery-ui-dist": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.1.tgz";, + "integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo=" + }, + "jsonlint": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz";, + "integrity": "sha1-VzcEUIX1XrRVxosf9OvAG9UOiDA=", + "requires": { + "JSV": "4.0.2", + "nomnom": "1.8.1" + } + }, + "nomnom": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.8.1.tgz";, + "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=", + "requires": { + "chalk": "0.4.0", + "underscore": "1.6.0" + } + }, + "qtip2": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/qtip2/-/qtip2-3.0.3.tgz";, + "integrity": "sha1-ffCIrkQSwkpAZN5p6CTLPPdiENw=", + "requires": { + "imagesloaded": "4.1.4", + "jquery": "3.1.1" + } + }, + "reset.css": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/reset.css/-/reset.css-2.0.2.tgz";, + "integrity": "sha1-nAEwnIILcujyGevMjhQRlJYE99c=" + }, + "rw": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz";, + "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=" + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz";, + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "slickgrid": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/slickgrid/-/slickgrid-2.3.3.tgz";, + "integrity": "sha1-bPgsMQkiDPs4mgCUKFiDzCoo4Nc=", + "requires": { + "jquery": "3.1.1", + "jquery-ui": "1.12.1" + } + }, + "strip-ansi": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.1.1.tgz";, + "integrity": "sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=" + }, + "underscore": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";, + "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=" + }, + "url-search-params": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/url-search-params/-/url-search-params-0.6.1.tgz";, + "integrity": "sha1-Ott4WLgH1WuB56vzudrkl4wD+Z0=" + }, + "xmlhttprequest": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz";, + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" + } + } +} http://git-wip-us.apache.org/repos/asf/nifi/blob/9aa7e65f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json index be7a299..1aeeb2f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/package.json @@ -1,17 +1,31 @@ { + "//": "Licensed to the Apache Software Foundation (ASF) under one or more", + "//": "contributor license agreements. See the NOTICE file distributed with", + "//": "this work for additional information regarding copyright ownership.", + "//": "The ASF licenses this file to You 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.", "name": "apache-nifi", "description": "Apache NiFi 3rd party client side resources.", "dependencies": { "JSON2": "0.1.0", - "angular": "1.5.11", - "angular-aria": "1.5.11", - "angular-animate": "1.5.11", - "angular-messages": "1.5.11", - "angular-mocks": "1.5.11", + "angular": "1.7.0", + "angular-aria": "1.7.0", + "angular-animate": "1.7.0", + "angular-messages": "1.7.0", + "angular-mocks": "1.7.0", "angular-resource": "1.5.5", - "angular-sanitize": "1.5.11", - "angular-route": "1.5.5", - "angular-material": "1.0.8", + "angular-sanitize": "1.7.0", + "angular-route": "1.7.0", + "angular-material": "1.1.9", "d3": "4.13.0", "d3-selection-multi": "1.0.1", "jquery-minicolors": "2.1.10", @@ -25,8 +39,6 @@ "qtip2": "3.0.3", "slickgrid": "2.3.3" }, - "scripts": { - }, "repository": { "type": "git", "url": "git+https://github.com/apache/nifi.git"; http://git-wip-us.apache.org/repos/asf/nifi/blob/9aa7e65f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp index 7dd481f..a242c53 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp @@ -93,7 +93,7 @@ </div> </div> <md-menu md-position-mode="target-right target" md-offset="-1 44"> - <button md-menu-origin id="global-menu-button" ng-click="$mdOpenMenu()"> + <button md-menu-origin id="global-menu-button" ng-click="$mdMenu.open()"> <div class="fa fa-navicon"></div> </button> <md-menu-content id="global-menu-content"> http://git-wip-us.apache.org/repos/asf/nifi/blob/9aa7e65f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css index a7de12f..9f99c57 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css @@ -109,6 +109,10 @@ body { color: #262626; } +body.md-default-theme, body, html.md-default-theme, html { + background-color: white; +} + button { border-radius: 0; } http://git-wip-us.apache.org/repos/asf/nifi/blob/9aa7e65f/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json index 2899812..f24f0a5 100644 --- a/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json +++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-jolt-transform-json-ui/src/main/frontend/package.json @@ -1,4 +1,18 @@ { + "//": "Licensed to the Apache Software Foundation (ASF) under one or more", + "//": "contributor license agreements. See the NOTICE file distributed with", + "//": "this work for additional information regarding copyright ownership.", + "//": "The ASF licenses this file to You 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.", "name": "nifi-jolt-transform-json-ui", "dependencies": { "angular-ui-codemirror": "^0.3.0",
