Skip to content

[CG] Fix CG alert about underscore version. #10606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liushilongbuaa merged 2 commits into from
Apr 24, 2022
Merged

[CG] Fix CG alert about underscore version. #10606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
677031b
[CG] Fix CG alert about underscore version.
liushilongbuaa Apr 19, 2022
6329ab2
Merge branch '202012' into 202012-underscore
liushilongbuaa Apr 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/thrift_0_13_0/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# Disable php perl and few other packages as they need additional packages to be installed
patch -p1 < ../patch/0001-Remove-unneeded-packages.patch
patch -p1 < ../patch/0002-Remove-minimist-packages.patch
patch -p1 < ../patch/0003-Remove-underscore-packages.patch
DEB_BUILD_OPTIONS=nocheck dpkg-buildpackage -d -rfakeroot -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS) --admindir $(SONIC_DPKG_ADMINDIR)
popd

Expand Down
120 changes: 120 additions & 0 deletions src/thrift_0_13_0/patch/0003-Remove-underscore-packages.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
diff --git a/lib/js/package-lock.json b/lib/js/package-lock.json
index 2d84fb05a..96c555fc0 100644
--- a/lib/js/package-lock.json
+++ b/lib/js/package-lock.json
@@ -2274,8 +2274,7 @@
"mkdirp": "~0.5.1",
"requizzle": "~0.2.1",
"strip-json-comments": "~2.0.1",
- "taffydb": "2.6.2",
- "underscore": "~1.8.3"
+ "taffydb": "2.6.2"
}
},
"jshint": {
@@ -3331,17 +3330,7 @@
"requizzle": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
- "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
- "requires": {
- "underscore": "~1.6.0"
- },
- "dependencies": {
- "underscore": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
- "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
- }
- }
+ "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294="
},
"resolve": {
"version": "1.1.7",
@@ -4078,25 +4067,10 @@
"xtend": "^4.0.1"
}
},
- "underscore": {
- "version": "1.8.3",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
- "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
- },
"underscore-contrib": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
- "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
- "requires": {
- "underscore": "1.6.0"
- },
- "dependencies": {
- "underscore": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
- "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
- }
- }
+ "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc="
},
"underscore.string": {
"version": "3.3.5",
diff --git a/lib/ts/package-lock.json b/lib/ts/package-lock.json
index e79c55d97..3f1f822ce 100644
--- a/lib/ts/package-lock.json
+++ b/lib/ts/package-lock.json
@@ -2630,8 +2630,7 @@
"mkdirp": "~0.5.1",
"requizzle": "~0.2.1",
"strip-json-comments": "~2.0.1",
- "taffydb": "2.6.2",
- "underscore": "~1.8.3"
+ "taffydb": "2.6.2"
}
},
"jshint": {
@@ -3847,17 +3846,7 @@
"requizzle": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
- "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
- "requires": {
- "underscore": "~1.6.0"
- },
- "dependencies": {
- "underscore": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
- "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
- }
- }
+ "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294="
},
"resolve": {
"version": "1.9.0",
@@ -4585,25 +4574,10 @@
"xtend": "^4.0.1"
}
},
- "underscore": {
- "version": "1.8.3",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
- "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
- },
"underscore-contrib": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
- "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
- "requires": {
- "underscore": "1.6.0"
- },
- "dependencies": {
- "underscore": {
- "version": "1.6.0",
- "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
- "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag="
- }
- }
+ "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc="
},
"underscore.string": {
"version": "3.3.5",