开源软件构建与测试

Changes of Revision 9

_service:tar_scm:hadoop.spec Changed

@@ -51,7 +51,7 @@
 %endif
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: java-1.8.0-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel
+BuildRequires: java-11-openjdk-devel maven hostname maven-local tomcat cmake snappy openssl-devel
 BuildRequires: cyrus-sasl-devel chrpath systemd protobuf2-compiler protobuf2-devel protobuf2-java protobuf2
 BuildRequires: leveldbjni leveldb-java hawtjni-runtime gcc-c++
 BuildRequires: npm chrpath
@@ -59,9 +59,7 @@
 BuildRequires: autoconf automake libtool pkgconfig zlib-devel libstdc++-static
 %endif
 
-Requires: java-1.8.0-openjdk protobuf2-java apache-zookeeper
-BuildRequires:       java-11-openjdk-devel
-Requires:            java-11-openjdk
+Requires: java-11-openjdk protobuf2-java apache-zookeeper
 
 %description
 Apache Hadoop is a framework that allows for the distributed processing of
@@ -272,6 +270,7 @@
 This package contains files needed to run Apache Hadoop YARN in secure mode.
 
 %prep
+export JAVA_HOME=%{_jvmdir}/java-11-openjdk
 %ifarch riscv64
 mkdir -p ${HOME}/%{name}-prep_dir
 # protoc
@@ -381,7 +380,6 @@
 %mvn_file :%{name}-common::tests: %{name}/%{name}-common
 
 %build
-export JAVA_HOME=%{_jvmdir}/java-11-openjdk
 mvn clean  -Dsnappy.lib=/usr/lib64 -Dbundle.snappy -Dcontainer-executor.conf.dir=%{_sysconfdir}/%{name} -Pdist,native -DskipTests -DskipIT -Dmaven.javadoc.skip=true package
 
 %install
@@ -1205,6 +1203,7 @@
 * Tue Jun 25 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.3.6-4
 - Remove riscv64 prebuilded files
 - Build protoc and protoc-gen-grpc-java in prep state for riscv64
+- Upgrade jdk to 11
 
 * Sun May 12 2024 Dingli Zhang <dingli@iscas.ac.cn> - 3.3.6-3
 - Fix build on riscv64