From 7a87bd7b0e530397541bd14b8905eaae86aa5503 Mon Sep 17 00:00:00 2001 From: chen-chen110 <1083655235@qq.com> Date: Sat, 2 Sep 2023 16:04:31 +0800 Subject: [PATCH] lock triple-beam version to 1.3.0 --- 01-lock-triple-beam-version-to-1.3.0.patch | 26 ++++++++++++++++++++++ hadoop.spec | 5 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 01-lock-triple-beam-version-to-1.3.0.patch diff --git a/01-lock-triple-beam-version-to-1.3.0.patch b/01-lock-triple-beam-version-to-1.3.0.patch new file mode 100644 index 0000000..64f4d44 --- /dev/null +++ b/01-lock-triple-beam-version-to-1.3.0.patch @@ -0,0 +1,26 @@ +From 2c87b545bf16d9a2433179a56abc17b3efdf1fc4 Mon Sep 17 00:00:00 2001 +From: sunyanan +Date: Thu, 13 Jul 2023 23:26:11 +0800 +Subject: [PATCH] lock triple-beam version to 1.3.0 + +--- + .../hadoop-yarn-applications-catalog-webapp/package.json | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json +index f09442c..1431303 100644 +--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json ++++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-webapp/package.json +@@ -14,6 +14,9 @@ + "bootstrap": "~3.3.7", + "roboto-fontface": "0.10.0" + }, ++ "resolutions": { ++ "triple-beam": "1.3.0" ++ }, + "devDependencies": { + "requirejs": "^2.1.0", + "shelljs": "^0.2.6", +-- +1.8.3.1 + diff --git a/hadoop.spec b/hadoop.spec index b370df4..ec8f091 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -11,7 +11,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop Version: 3.2.1 -Release: 12 +Release: 13 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -1110,6 +1110,9 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Sat Sep 02 2023 chenchen - 3.2.1-13 +- lock triple-beam version to 1.3.0 + * Fri Feb 25 2022 wangkai - 3.2.1-12 - Rebuild for fix log4j1.x cves -- Gitee