NIFI-8756 Upgraded AngularJS to 1.8.2 and JQuery to 3.6.0
- Upgraded Angular Material from 1.1.10 to 1.1.26
- Upgraded Moment from 2.24.0 to 2.29.1
- Upgraded JSON Lint from 1.6.2 to 1.6.3
- Upgraded Slickgrid from 2.4.27 to 2.4.38
- Upgraded frontend-maven-plugin from 1.4 to 1.12.0
- Upgraded frontend-maven-plugin NodeJS from 12.7.0 to 12.22.2
Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>
This closes #5197.
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 c52420d..93bbf6e 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
@@ -23,7 +23,7 @@
<artifactId>nifi-web-ui</artifactId>
<packaging>war</packaging>
<properties>
- <node.version>v12.7.0</node.version>
+ <node.version>v12.22.2</node.version>
<maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip>
<staging.dir>${project.build.directory}/tmp</staging.dir>
@@ -379,7 +379,7 @@
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.12.0</version>
<configuration>
<installDirectory>${frontend.working.dir}</installDirectory>
</configuration>
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
index a59b046..8e4374a 100644
--- 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
@@ -28,49 +28,49 @@
"integrity": "sha1-0Hf2glVx+CEy+d/67Vh7QCn+/1c="
},
"angular": {
- "version": "1.8.0",
- "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.0.tgz",
- "integrity": "sha512-VdaMx+Qk0Skla7B5gw77a8hzlcOakwF8mjlW13DpIWIDlfqwAbSSLfd8N/qZnzEmQF4jC4iofInd3gE7vL8ZZg=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular/-/angular-1.8.2.tgz",
+ "integrity": "sha512-IauMOej2xEe7/7Ennahkbb5qd/HFADiNuLSESz9Q27inmi32zB0lnAsFeLEWcox3Gd1F6YhNd1CP7/9IukJ0Gw=="
},
"angular-animate": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.7.9.tgz",
- "integrity": "sha512-fV+AISy/HTzurQH2ngsJg+lLIvfu0ahc1h4AYKauaXVw97rZc2k4iUA1bMstiEyClsdayQX568kjQc1NK+oYhw=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular-animate/-/angular-animate-1.8.2.tgz",
+ "integrity": "sha512-Jbr9+grNMs9Kj57xuBU3Ju3NOPAjS1+g2UAwwDv7su1lt0/PLDy+9zEwDiu8C8xJceoTbmBNKiWGPJGBdCQLlA=="
},
"angular-aria": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.7.9.tgz",
- "integrity": "sha512-luI3Jemd1AbOQW0krdzfEG3fM0IFtLY0bSSqIDEx3POE0XjKIC1MkrO8Csyq9PPgueLphyAPofzUwZ8YeZ88SA=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular-aria/-/angular-aria-1.8.2.tgz",
+ "integrity": "sha512-xWT1Lm+Xug2GM6nGNMioBP4hXt3sj2eGaExa4cVCZUYSVWezgyuD1RiLgzJzwTkBGYplHQUzQaz3yDY8jVI6yQ=="
},
"angular-material": {
- "version": "1.1.10",
- "resolved": "https://registry.npmjs.org/angular-material/-/angular-material-1.1.10.tgz",
- "integrity": "sha512-LfBt5a1AVPbtsFzbmAyyZj90Gtc1U94OGtfMEauGzwsfqTnbH/y/9dtndH84N9S65wXkBoBe3VG6kfyoQSeCVw=="
+ "version": "1.1.26",
+ "resolved": "https://registry.npmjs.org/angular-material/-/angular-material-1.1.26.tgz",
+ "integrity": "sha512-DBLsoOP1D1E14EQsECZYabt3Jh1PpvsG8k1aZgaP/Ml57n4stpClzLhCsuTNbtB/pqq9CL8XtpCfB6fhVRWqIQ=="
},
"angular-messages": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.7.9.tgz",
- "integrity": "sha512-OdJihuO6AW+m1/r9OdW5riCwacn3dL1agQvgu6Cww3a7OARXXN0vxOpsZCNk4yg4CuD7Et3tiz4DymhvZkydvw=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular-messages/-/angular-messages-1.8.2.tgz",
+ "integrity": "sha512-M1qNh/30cLJi4yJJ+3YB8saPonRcavz5Dquqz0T/aUySKJhIkUoeCkmF+BcLH4SJ5PBp04yy4CZUUeNRVi7jZA=="
},
"angular-mocks": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.9.tgz",
- "integrity": "sha512-LQRqqiV3sZ7NTHBnNmLT0bXtE5e81t97+hkJ56oU0k3dqKv1s6F+nBWRlOVzqHWPGFOiPS8ZJVdrS8DFzHyNIA=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.8.2.tgz",
+ "integrity": "sha512-I5L3P0l21HPdVsP4A4qWmENt4ePjjbkDFdAzOaM7QiibFySbt14DptPbt2IjeG4vFBr4vSLbhIz8Fk03DISl8Q=="
},
"angular-resource": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular-resource/-/angular-resource-1.7.9.tgz",
- "integrity": "sha512-rXXhCE2qT31Pn4Sl+2XL+ntv4zxnA2OzY+clCl8/pOp/s/gIzxpQlEtXipo3QK8Qur3glbIkeF/bJw+gjVAdUw=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular-resource/-/angular-resource-1.8.2.tgz",
+ "integrity": "sha512-CbTu8ypkVZMBLm+Wd+jI9xR7QEVCeUgN8WXsr9Yi9l0s/8ZQa5kEIuYX3F/75Ej8Xs1Jp9DoKjAyvACI6Q8IJA=="
},
"angular-route": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.7.9.tgz",
- "integrity": "sha512-vRoj5hzdQtWbODhWJqDzD1iNOEfCKshO6GFBuPVV7RHlPjzIc4R2dHCc7Qiv/8F3LDxJDohc6vSnTDMLHuaqeA=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular-route/-/angular-route-1.8.2.tgz",
+ "integrity": "sha512-49LJYxuaQ/ZDiu9dD2xo1LkazqObkGjw0a7dUF7UKCT8EELgBsMd6QrI6aEVGtI62ppkiFkxqmiV8fcwYdXpug=="
},
"angular-sanitize": {
- "version": "1.7.9",
- "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.7.9.tgz",
- "integrity": "sha512-nB/xe7JQWF9nLvhHommAICQ3eWrfRETo0EVGFESi952CDzDa+GAJ/2BFBNw44QqQPxj1Xua/uYKrbLsOGWZdbQ=="
+ "version": "1.8.2",
+ "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.8.2.tgz",
+ "integrity": "sha512-OB6Goa+QN3byf5asQ7XRl7DKZejm/F/ZOqa9z1skqYVOWA2hoBxoCmt9E7+i7T/TbxZP5zYzKxNZVVJNu860Hg=="
},
"ansi-styles": {
"version": "1.0.0",
@@ -388,9 +388,9 @@
}
},
"jquery": {
- "version": "3.5.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
- "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
+ "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
},
"jquery-form": {
"version": "3.50.0",
@@ -419,12 +419,12 @@
"integrity": "sha1-XAgV08xvkP9fqvWyaKbiO0ypBPo="
},
"jsonlint": {
- "version": "1.6.2",
- "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.2.tgz",
- "integrity": "sha1-VzcEUIX1XrRVxosf9OvAG9UOiDA=",
+ "version": "1.6.3",
+ "resolved": "https://registry.npmjs.org/jsonlint/-/jsonlint-1.6.3.tgz",
+ "integrity": "sha512-jMVTMzP+7gU/IyC6hvKyWpUU8tmTkK5b3BPNuMI9U8Sit+YAWLlZwB6Y6YrdCxfg2kNz05p3XY3Bmm4m26Nv3A==",
"requires": {
- "JSV": ">= 4.0.x",
- "nomnom": ">= 1.5.x"
+ "JSV": "^4.0.x",
+ "nomnom": "^1.5.x"
}
},
"lodash-core": {
@@ -433,9 +433,9 @@
"integrity": "sha512-FpSbOooU9HcASpL7oJ/ZQGxR7oGzeqlVe1M/iAhnUMTk7eMJBkszS5tUPZCnRtNGPWe8ChswdByFTzW58iGQEQ=="
},
"moment": {
- "version": "2.24.0",
- "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
- "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+ "version": "2.29.1",
+ "resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
+ "integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
},
"nomnom": {
"version": "1.8.1",
@@ -471,9 +471,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"slickgrid": {
- "version": "2.4.27",
- "resolved": "https://registry.npmjs.org/slickgrid/-/slickgrid-2.4.27.tgz",
- "integrity": "sha512-YnQXR0oww1ZpUtbsD/IdX+ydsxo8/fSEH5uMewQj2OooCoF/rsN8lrOqHFqqE8/Ob1NqXiVWMrWcO2Oqyyo/Ag==",
+ "version": "2.4.38",
+ "resolved": "https://registry.npmjs.org/slickgrid/-/slickgrid-2.4.38.tgz",
+ "integrity": "sha512-BFbRXOkpbF44vCr6MxEpO/A7ruiPSINN7WoKaDkLza62CX14kq7Me6v77Q/bDsZsOeRsHudpRZufmt1GQixq5g==",
"requires": {
"jquery": ">=1.8.0",
"jquery-ui": ">=1.8.0"
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 4928aab..489d4e5 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
@@ -17,29 +17,29 @@
"description": "Apache NiFi 3rd party client side resources.",
"dependencies": {
"JSON2": "0.1.0",
- "angular": "1.8.0",
- "angular-aria": "1.7.9",
- "angular-animate": "1.7.9",
- "angular-messages": "1.7.9",
- "angular-mocks": "1.7.9",
- "angular-resource": "1.7.9",
- "angular-sanitize": "1.7.9",
- "angular-route": "1.7.9",
- "angular-material": "1.1.10",
+ "angular": "1.8.2",
+ "angular-aria": "1.8.2",
+ "angular-animate": "1.8.2",
+ "angular-messages": "1.8.2",
+ "angular-mocks": "1.8.2",
+ "angular-resource": "1.8.2",
+ "angular-sanitize": "1.8.2",
+ "angular-route": "1.8.2",
+ "angular-material": "1.1.26",
"d3": "4.13.0",
"d3-selection-multi": "1.0.1",
"jquery-minicolors": "2.1.10",
"jquery-ui-dist": "1.12.1",
"font-awesome": "4.7.0",
- "jquery": "3.5.1",
+ "jquery": "3.6.0",
"reset.css": "2.0.2",
"jquery-form": "3.50.0",
"lodash-core": "4.17.19",
- "moment": "2.24.0",
+ "moment": "2.29.1",
"url-search-params": "0.6.1",
- "jsonlint": "1.6.2",
+ "jsonlint": "1.6.3",
"qtip2": "3.0.3",
- "slickgrid": "2.4.27"
+ "slickgrid": "2.4.38"
},
"repository": {
"type": "git",
