diff --git a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch b/0001-change-mvn-scalafmt.patch similarity index 47% rename from 0001-modify-maven-version-for-3.6.3-to-3.5.4.patch rename to 0001-change-mvn-scalafmt.patch index e80f132736ba3ad68815e0b78f2def7540e8a207..32047775e173c79c16756858b7343b53c4eafac5 100644 --- a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch +++ b/0001-change-mvn-scalafmt.patch @@ -1,16 +1,6 @@ -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 +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-09-03 22:49:31.279865749 +0800 @@ -115,7 +115,7 @@ 1.8 ${java.version} @@ -20,9 +10,12 @@ index 7c60f8f..4b993ee 100644 1.6.0 spark 1.7.30 -@@ -3202,1 +3202,1 @@ +@@ -3199,7 +3199,7 @@ + + org.antipathy + mvn-scalafmt_${scala.binary.version} - 1.0.4 + 1.0.3 --- -2.23.0 - + + ${scalafmt.parameters} + ${scalafmt.skip} diff --git a/settings.xml b/settings.xml deleted file mode 100644 index bd9ac9f83b783cdb9813dd06d473ebafbf96620c..0000000000000000000000000000000000000000 --- a/settings.xml +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - big - * - huaweicloud - https://mirrors.huaweicloud.com/repository/maven/ - true - - - - - - - - - - - - diff --git a/spark.spec b/spark.spec index f53bb116ef300c4053a4c1a6f39a972fc19180ab..f63919b987577e9f371dfd7390b7dd35edf1cb7a 100644 --- a/spark.spec +++ b/spark.spec @@ -3,14 +3,13 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.2.0 -Release: 2 +Version: 3.2.2 +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 +Patch0001: 0001-change-mvn-scalafmt.patch BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven @@ -28,8 +27,7 @@ Apache Spark achieves high performance for both batch and streaming data, using %patch0001 -p1 %build -cp %{SOURCE1} ./settings.xml -mvn -DskipTests -Dmaven.test.skip=true clean package -s settings.xml +mvn -DskipTests -Dmaven.test.skip=true clean package %install mkdir -p %{buildroot}/opt/ @@ -40,6 +38,9 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog +* Sun Sep 4 2022 xiexing - 3.2.2-1 +- update spark version + * Fri Mar 25 2022 xiexing - 3.2.0-2 - fix install problem diff --git a/v3.2.0.tar.gz b/v3.2.2.tar.gz similarity index 73% rename from v3.2.0.tar.gz rename to v3.2.2.tar.gz index ec6079677718a2694a54168cabdf3df84c490c8d..c8232dafe1e61d8978efb67fc4585b80e414bda4 100644 Binary files a/v3.2.0.tar.gz and b/v3.2.2.tar.gz differ