From 97267a962a67f399429377f16bdbbf240010c2d1 Mon Sep 17 00:00:00 2001 From: sunyanan Date: Thu, 13 Jul 2023 23:31:23 +0800 Subject: [PATCH] lock triple-beam version to 1.3.0 --- 01-lock-triple-beam-version-to-1.3.0.patch | 26 ++++++++++++++++++++++ hadoop.spec | 7 +++++- 2 files changed, 32 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 441d985..536f0ec 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -11,7 +11,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop Version: 3.3.4 -Release: 2 +Release: 3 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -36,6 +36,8 @@ Source15: node-12.22.1-linux-x64.tar.gz Source16: node-v12.22.1-linux-arm64.tar.gz Source17: settings.xml +Patch0: 01-lock-triple-beam-version-to-1.3.0.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel BuildRequires: cyrus-sasl-devel chrpath systemd protobuf2-compiler protobuf2-devel protobuf2-java protobuf2 @@ -1130,6 +1132,9 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Thu Jul 13 2023 sunyanan - 3.3.4-3 +- lock triple-beam version to 1.3.0 + * Thu Mar 9 2023 xiexing - 3.3.4-2 - fix EBS install problem -- Gitee