From 0a45b43f81ebd5b81c7c545e73db74fdd29a5ebc Mon Sep 17 00:00:00 2001
From: xiexing01 <xiexing4@hisilicon.com>
Date: Wed, 12 Jan 2022 04:09:50 -0500
Subject: [PATCH] update_version

---
 hadoop.spec | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/hadoop.spec b/hadoop.spec
index e65883e..7a10edf 100644
--- a/hadoop.spec
+++ b/hadoop.spec
@@ -10,7 +10,7 @@
 %global __provides_exclude_from ^%{_libdir}/%{name}/.*$
 %define _binaries_in_noarch_packages_terminate_build 0
 Name:   hadoop
-Version: 3.2.1
+Version: 3.3.1
 Release: 5
 Summary: A software platform for processing vast amounts of data
 # The BSD license file is missing
@@ -31,10 +31,10 @@ Source10: %{name}-core-site.xml
 Source11: %{name}-hdfs-site.xml
 Source12: %{name}-mapred-site.xml
 Source13: %{name}-yarn-site.xml
-Patch0:  CVE-2020-9492.patch
-
+#Patch0:  CVE-2020-9492.patch
+Patch0:   0001-hadoop-yarn-nodejs.path
 Patch1: 0001-sys_errlist-undeclared.patch
-Patch2: CVE-2019-17195.patch
+#Patch2: CVE-2019-17195.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel 
@@ -70,8 +70,37 @@ BuildArch: noarch
 Requires(pre): /usr/sbin/useradd
 Obsoletes: %{name}-javadoc < 2.4.1-22%{?dist}
 
+#Requires: apache-zookeeper
+#Requires: leveldb
+#Requires: protobuf2-java
+# These are required to meet the symlinks for the classpath
+Requires: antlr-tool
+Requires: apache-commons-beanutils
 Requires: apache-zookeeper
+Requires: avalon-framework
+Requires: avalon-logkit
+Requires: checkstyle
+Requires: coreutils
+Requires: geronimo-jms
+Requires: glassfish-jaxb
+Requires: glassfish-jsp
+Requires: glassfish-jsp-api
+Requires: istack-commons
+Requires: jakarta-commons-httpclient
+Requires: java-base64
+Requires: javamail
+Requires: jettison
+Requires: jetty8
+Requires: jsr-311
 Requires: leveldb
+Requires: mockito
+Requires: objectweb-asm
+Requires: objenesis
+Requires: paranamer
+Requires: relaxngDatatype
+Requires: servlet3
+Requires: snappy-java
+Requires: which
 Requires: protobuf2-java
 
 %description common
@@ -384,6 +413,8 @@ install -m 0755 %{name}-client-modules/%{name}-client-runtime/target/hadoop-clie
 echo %{_datadir}/java/%{name}/hadoop-client-runtime.jar >> .mfiles-hadoop-client
 install -m 0755 %{name}-client-modules/%{name}-client-runtime/pom.xml %{buildroot}%{_datadir}/maven-poms/%{name}/hadoop-client-runtime.pom
 echo %{_datadir}/maven-poms/%{name}/hadoop-client-runtime.pom >> .mfiles-hadoop-client
+install -m 0755 %{name}-client-modules/%{name}-client/target/hadoop-shaded-guava-1.1.1.jar %{buildroot}%{_datadir}/java/%{name}/hadoop-shaded-guava.jar
+echo %{_datadir}/java/%{name}/hadoop-shaded-guava.jar >> .mfiles-hadoop-client
 # common
 install -m 0755 %{name}-common-project/%{name}-annotations/target/hadoop-annotations-%{version}.jar %{buildroot}%{_datadir}/java/%{name}/hadoop-annotations.jar
 echo %{_datadir}/java/%{name}/hadoop-annotations.jar >> .mfiles
-- 
Gitee