This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new 647a9a6 NIFI-7423 Upgraded jquery dependency version.
647a9a6 is described below
commit 647a9a60b73794106d70941e1ab62f7f25040350
Author: mtien <mtien.apa...@gmail.com>
AuthorDate: Wed May 6 12:42:52 2020 -0700
NIFI-7423 Upgraded jquery dependency version.
NIFI-7423 Upgraded jquery dependency version to latest 3.5.1.
This closes #4258
---
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 1 +
.../nifi-web-ui/src/main/frontend/package-lock.json | 16 ++++++++--------
.../nifi-web/nifi-web-ui/src/main/frontend/package.json | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
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 5d7832a..2d9d7d6 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
@@ -262,6 +262,7 @@
<filtering>false</filtering>
<includes>
<include>package.json</include>
+ <include>package-lock.json</include>
</includes>
</resource>
</resources>
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 8b1ff49..0e5e1d1 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
@@ -388,16 +388,16 @@
}
},
"jquery": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz";,
- "integrity":
"sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz";,
+ "integrity":
"sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
},
"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.4.1"
+ "jquery": "3.5.1"
}
},
"jquery-minicolors": {
@@ -405,7 +405,7 @@
"resolved":
"https://registry.npmjs.org/jquery-minicolors/-/jquery-minicolors-2.1.10.tgz";,
"integrity": "sha1-sp7qVB2aMrTiaSMWj7LBYnGGc3k=",
"requires": {
- "jquery": "3.4.1"
+ "jquery": "3.5.1"
}
},
"jquery-ui": {
@@ -452,7 +452,7 @@
"integrity": "sha1-ffCIrkQSwkpAZN5p6CTLPPdiENw=",
"requires": {
"imagesloaded": "4.1.4",
- "jquery": "3.4.1"
+ "jquery": "3.5.1"
}
},
"reset.css": {
@@ -475,7 +475,7 @@
"resolved":
"https://registry.npmjs.org/slickgrid/-/slickgrid-2.3.23.tgz";,
"integrity":
"sha512-QQ4eC+plbLpT5e7RWXQbMmORXBc08dYCjJp0khDtoOxyAKXLXEivWklUoQsYYZkTydRwOKnHNR6t4I38BsYwqQ==",
"requires": {
- "jquery": "3.4.1",
+ "jquery": "3.5.1",
"jquery-ui": "1.12.1"
}
},
@@ -500,4 +500,4 @@
"integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw="
}
}
-}
\ No newline at end of file
+}
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 94f3f85..63d3953 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
@@ -31,7 +31,7 @@
"jquery-minicolors": "2.1.10",
"jquery-ui-dist": "1.12.1",
"font-awesome": "4.7.0",
- "jquery": "3.4.1",
+ "jquery": "3.5.1",
"reset.css": "2.0.2",
"jquery-form": "3.50.0",
"lodash-core": "4.17.11",
