lock triple-beam version to 1.3.0

(cherry picked from commit 97267a962a67f399429377f16bdbbf240010c2d1)
This commit is contained in:
sunyanan 2023-07-13 23:31:23 +08:00 committed by Weijian Wen
parent 7f4217de4f
commit eed4721e01
2 changed files with 33 additions and 3 deletions

View File

@ -0,0 +1,26 @@
From 2c87b545bf16d9a2433179a56abc17b3efdf1fc4 Mon Sep 17 00:00:00 2001
From: sunyanan <sunyanan@xfusion.com>
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

View File

@ -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
@ -243,7 +245,7 @@ This package contains files needed to run Apache Hadoop YARN in secure mode.
%prep
%autosetup -p1 -n %{name}-%{version}-src
cp %{SOURCE17} ./
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -s settings.xml
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar -s settings.xml
mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar -s settings.xml
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-api -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-api.jar -s settings.xml
mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb-benchmark -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb-benchmark.jar -s settings.xml
@ -260,7 +262,7 @@ mv /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz /
tar -xzvf /home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C /home/abuild/repository/com/github/eirslett/yarn/1.22.5/
npm config set registry https://repo.huaweicloud.com/repository/npm/
npm cache clean -f
/home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g
/home/abuild/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set registry https://repo.huaweicloud.com/repository/npm/ -g
%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-hdfs-project/hadoop-hdfs
%pom_add_dep org.iq80.leveldb:leveldb-api:0.7 hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy
@ -1130,6 +1132,8 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg
%changelog
* Thu Jul 13 2023 sunyanan <sunyanan@xfusion.com> - 3.3.4-3
- lock triple-beam version to 1.3.0
* Thu Mar 9 2023 xiexing <xiexing4@hisilicon.com> - 3.3.4-2
- fix EBS install problem