[NIFI-3501] Upgrade D3 to 3.5.17 and allow npm to pull it down at build time. This closes #1519
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/364efa96 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/364efa96 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/364efa96 Branch: refs/heads/master Commit: 364efa96cc640f44af9ff7e74d554d7a01407ccd Parents: 5df6622 Author: Scott Aslan <[email protected]> Authored: Tue Feb 21 10:06:20 2017 -0500 Committer: Matt Gilman <[email protected]> Committed: Tue Feb 21 10:17:34 2017 -0500 ---------------------------------------------------------------------- LICENSE | 30 -------------------- nifi-assembly/LICENSE | 2 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 3 ++ .../nifi-web-ui/src/main/frontend/package.json | 3 +- .../src/main/resources/META-INF/LICENSE | 2 +- .../src/main/webapp/WEB-INF/pages/canvas.jsp | 2 +- .../main/webapp/WEB-INF/pages/provenance.jsp | 2 +- .../src/main/webapp/WEB-INF/pages/summary.jsp | 2 +- .../src/main/webapp/WEB-INF/pages/users.jsp | 2 +- .../nifi-web-ui/src/main/webapp/js/d3/LICENSE | 26 ----------------- .../nifi-web-ui/src/main/webapp/js/d3/d3.min.js | 5 ---- 12 files changed, 12 insertions(+), 69 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index 7fe42f8..e6f09b4 100644 --- a/LICENSE +++ b/LICENSE @@ -231,36 +231,6 @@ The source is available under an MIT LICENSE. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -This product bundles 'Javascript D3 Library' which is available under a -"3-clause BSD" license. - - Copyright (c) 2010-2014, Michael Bostock - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * 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. - - * The name Michael Bostock may not 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 MICHAEL BOSTOCK 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. - This product bundles 'CodeMirror' which is available under an MIT style license. Copyright (C) 2014 by Marijn Haverbeke <[email protected]> and others http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-assembly/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE index 256add6..a6f1a03 100644 --- a/nifi-assembly/LICENSE +++ b/nifi-assembly/LICENSE @@ -234,7 +234,7 @@ The source is available under an MIT LICENSE. This product bundles 'Javascript D3 Library' which is available under a "3-clause BSD" license. - Copyright (c) 2010-2014, Michael Bostock + Copyright (c) 2010-2016, Michael Bostock All rights reserved. Redistribution and use in source and binary forms, with or without http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE index a6a9936..f4b4b09 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE @@ -263,7 +263,7 @@ licenses. This product bundles 'Javascript D3 Library' which is available under a "3-clause BSD" license. - Copyright (c) 2010-2014, Michael Bostock + Copyright (c) 2010-2016, Michael Bostock All rights reserved. Redistribution and use in source and binary forms, with or without http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/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 d0c70f0..9108fe7 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 @@ -148,6 +148,9 @@ <directory>${frontend.working.dir}/node_modules</directory> <filtering>false</filtering> <includes> + <!-- D3 --> + <include>d3/d3.min.js*</include> + <include>d3/LICENSE</include> <!-- angular --> <include>angular/angular.min.js*</include> <include>angular/LICENSE.md</include> http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/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 298ef9f..ca432a5 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 @@ -13,7 +13,8 @@ "slickgrid": "2.3.3", "jsonlint": "1.6.2", "JSON2": "0.1.0", - "reset.css": "2.0.2" + "reset.css": "2.0.2", + "d3": "3.5.17" }, "description": "Apache NiFi 3rd party client side resources.", "repository": { http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE index 8eba3dd..903b555 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE @@ -211,7 +211,7 @@ licenses. This product bundles 'Javascript D3 Library' which is available under a "3-clause BSD" license. - Copyright (c) 2010-2014, Michael Bostock + Copyright (c) 2010-2016, Michael Bostock All rights reserved. Redistribution and use in source and binary forms, with or without http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp index 3ecead7..48db66e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp @@ -41,7 +41,7 @@ <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> <script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script> - <script type="text/javascript" src="js/d3/d3.min.js"></script> + <script type="text/javascript" src="assets/d3/d3.min.js"></script> <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp index 1b053b5..b4eb6a0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp @@ -33,7 +33,7 @@ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> - <script type="text/javascript" src="js/d3/d3.min.js"></script> + <script type="text/javascript" src="assets/d3/d3.min.js"></script> <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp index 81394d0..1746e6b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp @@ -39,7 +39,7 @@ <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> <script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script> - <script type="text/javascript" src="js/d3/d3.min.js"></script> + <script type="text/javascript" src="assets/d3/d3.min.js"></script> <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp index 19a6146..42d0791 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp @@ -32,7 +32,7 @@ <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> - <script type="text/javascript" src="js/d3/d3.min.js"></script> + <script type="text/javascript" src="assets/d3/d3.min.js"></script> <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> http://git-wip-us.apache.org/repos/asf/nifi/blob/364efa96/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/d3/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/d3/LICENSE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/d3/LICENSE deleted file mode 100644 index 8301346..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/d3/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -Copyright (c) 2010-2014, Michael Bostock -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -* Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -* 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. - -* The name Michael Bostock may not 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 MICHAEL BOSTOCK 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.
