diff --git a/hive.spec b/hive.spec index 442b6d2e309ffe9bdaabe3937154add90f75d8a7..dd100e0bea67a28bc315e11f14f22f4e60520c1f 100644 --- a/hive.spec +++ b/hive.spec @@ -2,7 +2,7 @@ Name: hive Version: 3.1.3 -Release: 4 +Release: 5 Summary: The Apache Hadoop data warehouse License: Apache-2.0 and Python-2.0 and MPL-2.0 and BSD and ICU @@ -15,10 +15,11 @@ Source3: guava-27.0-jre.jar Source4: mysql-connector-java.jar Source5: https://github.com/os72/protoc-jar/archive/refs/tags/v3.5.1.1.tar.gz Source6: https://github.com/os72/protoc-jar-maven-plugin/archive/refs/tags/v3.5.1.1.zip +Source7: tools.jar -BuildRequires: cmake java-1.8.0-openjdk-devel maven xmvn xmvn-install gradle-local maven-local protobuf2-devel protobuf2-compiler +BuildRequires: cmake java-11-openjdk-devel maven xmvn xmvn-install gradle-local maven-local protobuf2-devel protobuf2-compiler -Requires: java-1.8.0-openjdk +Requires: java-11-openjdk BuildArch: noarch Patch1000: 1000-Add-protoc-java-support-for-riscv64.patch @@ -54,7 +55,7 @@ echo `pwd` > absolute_prefix.log sed -i 's/\//\\\//g' absolute_prefix.log absolute_prefix=`head -n 1 absolute_prefix.log` sed -i 's/absolute-prefix/'"$absolute_prefix"'/g' .xmvn-reactor - +cp %{SOURCE7} %{builddir} find -name "*.jar" -delete # missing shebang @@ -66,6 +67,12 @@ export MAVEN_OPTS="-Xms2048M -Xmx8000M" %endif # for javadoc encoding export LC_ALL=en_US.UTF-8 +export JAVA_HOME=%{_jvmdir}/java-11-openjdk +export PATH=$JAVA_HOME/bin:$PATH +export CLASSPATH=%{builddir}:$CLASSPATH + +mvn versions:set-property -Dproperty=maven.compiler.source -DnewVersion=11 +mvn versions:set-property -Dproperty=maven.compiler.target -DnewVersion=11 mvn package -DskipTests -Pdist -Dtar @@ -143,6 +150,9 @@ ln -s %{_javadir}/%{name}/%{name}-shims.jar %{buildroot}%{_datadir}/hadoop/mapre %changelog +* Mon Nov 18 2024 Zhilei Qiu +- Upgrade jdk build version to 11 + * Tue Jun 25 2024 Dingli Zhang - 3.1.3-4 - Remove riscv64 prebuilded files - Build protoc-jar and protoc-jar-maven-plugin in prep state for riscv64 diff --git a/tools.jar b/tools.jar new file mode 100644 index 0000000000000000000000000000000000000000..1ac15f28447263d2a5cffbdb93f064e235f01554 Binary files /dev/null and b/tools.jar differ diff --git a/xmvn-reactor b/xmvn-reactor index 23120f6da3ddf3551d327d47e48e628329fc3f00..b3e3fc266026bd59fbbf8f3d3ddc9449f2bcf834 100644 --- a/xmvn-reactor +++ b/xmvn-reactor @@ -597,5 +597,14 @@ 1.6 + + jdk.tools + jdk.tools + 1.8 + + + jar + +