From 7cc07b13ec20e7ebd4ff39242a565eeb0e8b278e Mon Sep 17 00:00:00 2001 From: xiaochuannan Date: Tue, 5 Nov 2024 11:26:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=85=88=E4=BD=BF=E7=94=A8=E6=9E=84?= =?UTF-8?q?=E5=BB=BA=E7=8E=AF=E5=A2=83=E7=BB=9F=E4=B8=80maven=E3=80=81npm?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=80=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8D=95?= =?UTF-8?q?=E7=8B=AC=E5=9C=A8=E6=9C=AC=E9=A1=B9=E7=9B=AE=E4=B8=AD=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 1165c716528edda02bc84d30b32cacd224779ba2) --- hadoop.spec | 45 ++++++++++++++++++++++----------------------- settings.xml | 22 ---------------------- 2 files changed, 22 insertions(+), 45 deletions(-) delete mode 100644 settings.xml diff --git a/hadoop.spec b/hadoop.spec index 21581d5..bda7d2a 100644 --- a/hadoop.spec +++ b/hadoop.spec @@ -11,7 +11,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 Name: hadoop Version: 3.3.6 -Release: 3 +Release: 4 Summary: A software platform for processing vast amounts of data # The BSD license file is missing # https://issues.apache.org/jira/browse/HADOOP-9849 @@ -34,7 +34,6 @@ Source13: %{name}-yarn-site.xml Source14: yarn-v1.22.5.tar.gz 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 Patch1: 02-Enhance-access-control-for-RunJar.patch @@ -256,27 +255,23 @@ This package contains files needed to run Apache Hadoop YARN in secure mode. %prep %autosetup -p1 -n %{name}-%{version}-src -cp %{SOURCE17} ./ -sed -i "s,@HOME@,${HOME},g" 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 -mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar -s settings.xml -mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar -s settings.xml - -mkdir -p ${HOME}/repository/com/github/eirslett/node/12.22.1/ -cp %{SOURCE15} ${HOME}/repository/com/github/eirslett/node/12.22.1/ -cp %{SOURCE16} ${HOME}/repository/com/github/eirslett/node/12.22.1/ -mv ${HOME}/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz -mkdir -p ${HOME}/repository/com/github/eirslett/yarn/1.22.5/ -cp %{SOURCE14} ${HOME}/repository/com/github/eirslett/yarn/1.22.5/ -mv ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -tar -xzvf ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/repository/com/github/eirslett/yarn/1.22.5/ -npm config set registry https://repo.huaweicloud.com/repository/npm/ +mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni-all -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni-all.jar +mvn install:install-file -DgroupId=org.fusesource.leveldbjni -DartifactId=leveldbjni -Dversion=1.8 -Dpackaging=jar -Dfile=/usr/lib/java/leveldbjni/leveldbjni.jar +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 +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 +mvn install:install-file -DgroupId=org.iq80.leveldb -DartifactId=leveldb -Dversion=0.7 -Dpackaging=jar -Dfile=/usr/share/java/leveldb-java/leveldb.jar +mvn install:install-file -DgroupId=orn.fusesource.hawtjni -DartifactId=hawtjni-runtime -Dversion=1.16 -Dpackaging=jar -Dfile=/usr/lib/java/hawtjni/hawtjni-runtime.jar + +mkdir -p ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE15} ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/ +cp %{SOURCE16} ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/ +mv ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/node-v12.22.1-linux-arm64.tar.gz ${HOME}/.m2/repository/com/github/eirslett/node/12.22.1/node-12.22.1-linux-arm64.tar.gz +mkdir -p ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/ +cp %{SOURCE14} ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/ +mv ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5.tar.gz ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz +tar -xzvf ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-1.22.5.tar.gz -C ${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/ npm cache clean -f -${HOME}/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}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set ignore-engines true +${HOME}/.m2/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config set ignore-engines true %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 @@ -326,7 +321,7 @@ ${HOME}/repository/com/github/eirslett/yarn/1.22.5/yarn-v1.22.5/bin/yarn config %mvn_file :%{name}-common::tests: %{name}/%{name}-common %build -mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package -s settings.xml +mvn clean -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package %install # Copy all jar files except those generated by the build @@ -1146,6 +1141,10 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/container-executor.cfg %changelog +* Tue Nov 5 2024 xiaochn - 3.3.6-4 +- Remove settings.xml and use ${HOME}/.m2/repository as maven repo +- Remove npm repo in spec file and use unified configuration of the build environment + * Thu Sep 26 2024 Deyuan Fan - 3.3.6-3 - fix CVE-2024-23454 diff --git a/settings.xml b/settings.xml deleted file mode 100644 index a41ffcd..0000000 --- a/settings.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - @HOME@/repository/ - - - - - - - - - huaweicloud - * - https://repo.huaweicloud.com/repository/maven/ - - - - - -- Gitee