diff --git a/0001-change-mvn-scalafmt.patch b/0001-change-mvn-scalafmt.patch new file mode 100644 index 0000000000000000000000000000000000000000..776e01f385dbbe24ebdaa28648d561cd8bdc6f74 --- /dev/null +++ b/0001-change-mvn-scalafmt.patch @@ -0,0 +1,12 @@ +diff -Naur spark-3.2.2/pom.xml spark-3.2.2-change/pom.xml +--- spark-3.2.2/pom.xml 2022-07-11 23:13:02.000000000 +0800 ++++ spark-3.2.2-change/pom.xml 2022-07-30 04:40:32.025984410 +0800 +@@ -3199,7 +3199,7 @@ + + org.antipathy + mvn-scalafmt_${scala.binary.version} +- 1.0.4 ++ 1.0.3 + + ${scalafmt.parameters} + ${scalafmt.skip} 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 deleted file mode 100644 index 7dc7b7b6f2093e7cee43b3da2f2a445cf4ef1373..0000000000000000000000000000000000000000 --- a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b197048d8dcd5c3567fee87330b41b3938356123 Mon Sep 17 00:00:00 2001 -From: hubble_zhu -Date: Wed, 30 Sep 2020 14:53:42 +0800 -Subject: [PATCH] modify maven version for 3.6.3 to 3.5.4 - ---- - pom.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pom.xml b/pom.xml -index 7c60f8f..4b993ee 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -115,7 +115,7 @@ - 1.8 - ${java.version} - ${java.version} -- 3.6.3 -+ 3.5.4 - 1.6.0 - spark - 1.7.30 --- -2.23.0 - diff --git a/spark.spec b/spark.spec index 84c19224791fdca66c9d4c2dde8e2bcc19cb49c4..fa9b791dd461dc4bde8a15f29f3e847315293d11 100644 --- a/spark.spec +++ b/spark.spec @@ -3,13 +3,13 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.0.1 -Release: 1.0 -License: Apache License v2.0 +Version: 3.2.2 +Release: 1 +License: Apache-2.0 URL: http://spark.apache.org/ Source0: https://github.com/apache/spark/archive/v%{version}.tar.gz -Patch0001: 0001-modify-maven-version-for-3.6.3-to-3.5.4.patch +Patch0001: 0001-change-mvn-scalafmt.patch BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven @@ -27,7 +27,7 @@ Apache Spark achieves high performance for both batch and streaming data, using %patch0001 -p1 %build -mvn -DskipTests clean package +mvn -DskipTests -Dmaven.test.skip=true clean package %install mkdir -p %{buildroot}/opt/ @@ -38,6 +38,19 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog +* Fri Aug 12 2022 xiexing - 3.2.2-1 +- update spark version to cve-2022-33891 + +* Fri Mar 25 2022 xiexing - 3.2.0-2 +- fix install problem + +* 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 + * Fri Sep 18 2020 Hubble_Zhu - 1.0 - Init package diff --git a/v3.0.1.tar.gz b/v3.2.2.tar.gz similarity index 61% rename from v3.0.1.tar.gz rename to v3.2.2.tar.gz index f588c1714f4d5cc4716d092bb49d7f3490512477..c8232dafe1e61d8978efb67fc4585b80e414bda4 100644 Binary files a/v3.0.1.tar.gz and b/v3.2.2.tar.gz differ