diff --git a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch b/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch index 7dc7b7b6f2093e7cee43b3da2f2a445cf4ef1373..e80f132736ba3ad68815e0b78f2def7540e8a207 100644 --- a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch +++ b/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch @@ -20,6 +20,9 @@ index 7c60f8f..4b993ee 100644 1.6.0 spark 1.7.30 +@@ -3202,1 +3202,1 @@ +- 1.0.4 ++ 1.0.3 -- 2.23.0 diff --git a/settings.xml b/settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..bd9ac9f83b783cdb9813dd06d473ebafbf96620c --- /dev/null +++ b/settings.xml @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + big + * + huaweicloud + https://mirrors.huaweicloud.com/repository/maven/ + true + + + + + + + + + + + + diff --git a/spark.spec b/spark.spec index 856a0d77285dde3f16ecb9ae0ab9710fcad2f035..3f4f37c0eba3f65aaee83eed45669c3933627e8b 100644 --- a/spark.spec +++ b/spark.spec @@ -3,11 +3,12 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.0.1 -Release: 2.0 +Version: 3.2.0 +Release: 1 License: Apache License v2.0 URL: http://spark.apache.org/ Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz +Source1: settings.xml Patch0001: 0001-modify-maven-version-for-3.6.3-to-3.5.4.patch @@ -27,7 +28,8 @@ Apache Spark achieves high performance for both batch and streaming data, using %patch0001 -p1 %build -mvn -DskipTests clean package +cp %{SOURCE1} ./settings.xml +mvn -DskipTests clean package -s settings.xml %install mkdir -p %{buildroot}/opt/ @@ -38,6 +40,10 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog +* Tue Mar 15 2022 houyingchao - 3.2.0-1 +- Upgrade to 3.2.0 version +- Fix CVE-2021-38296 + * Fri Feb 25 2022 wangkai - 3.0.1-2.0 - Rebuild for fix log4j1.x cves diff --git a/v3.0.1.tar.gz b/v3.2.0.tar.gz similarity index 61% rename from v3.0.1.tar.gz rename to v3.2.0.tar.gz index f588c1714f4d5cc4716d092bb49d7f3490512477..ec6079677718a2694a54168cabdf3df84c490c8d 100644 Binary files a/v3.0.1.tar.gz and b/v3.2.0.tar.gz differ