diff --git a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch b/0001-modify-maven-version-for-3.8.4-to-3.6.3.patch similarity index 33% rename from 0001-modify-maven-version-for-3.6.3-to-3.5.4.patch rename to 0001-modify-maven-version-for-3.8.4-to-3.6.3.patch index e80f132736ba3ad68815e0b78f2def7540e8a207..a74b7d0b98128abad6fa42a06e258f0c874e807e 100644 --- a/0001-modify-maven-version-for-3.6.3-to-3.5.4.patch +++ b/0001-modify-maven-version-for-3.8.4-to-3.6.3.patch @@ -1,28 +1,21 @@ -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 @@ +diff -Naur spark-3.3.0/pom.xml spark-3.3.0-change/pom.xml +--- spark-3.3.0/pom.xml 2022-06-10 01:55:37.000000000 +0800 ++++ spark-3.3.0-change/pom.xml 2022-07-28 17:00:53.477569224 +0800 +@@ -109,7 +109,7 @@ 1.8 ${java.version} ${java.version} -- 3.6.3 -+ 3.5.4 +- 3.8.4 ++ 3.6.3 1.6.0 spark - 1.7.30 -@@ -3202,1 +3202,1 @@ + 1.7.32 +@@ -3355,7 +3355,7 @@ + + org.antipathy + mvn-scalafmt_${scala.binary.version} - 1.0.4 + 1.0.3 --- -2.23.0 - + + ${scalafmt.parameters} + ${scalafmt.skip} diff --git a/spark.spec b/spark.spec index f5acaa23b9b34769b9b512ca307a24c50ea6fb19..847d314badabf4d3de3d9ba3574495fed619cf13 100644 --- a/spark.spec +++ b/spark.spec @@ -3,14 +3,14 @@ Summary: A unified analytics engine for large-scale data processing. Name: spark -Version: 3.2.0 -Release: 1.2 -License: Apache License v2.0 +Version: 3.3.0 +Release: 1 +License: Apache 2.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-modify-maven-version-for-3.8.4-to-3.6.3.patch BuildRequires: java-1.8.0-openjdk-devel BuildRequires: maven @@ -29,7 +29,7 @@ Apache Spark achieves high performance for both batch and streaming data, using %build cp %{SOURCE1} ./settings.xml -mvn -DskipTests clean package -s settings.xml +mvn -DskipTests -Dmaven.test.skip=true clean package -s settings.xml %install mkdir -p %{buildroot}/opt/ @@ -40,6 +40,12 @@ cp -rf ../%{name}-%{version} %{buildroot}/opt/apache-%{name}-%{version} %changelog +* Fri Jul 29 2022 xiexing - 3.3.0-1 +-update spark version + +* Fri Mar 25 2022 xiexing - 3.2.0-2 +- fix install problem + * Fri Nov 12 2021 Wuzeyiii - 1.2 - Update spark version diff --git a/v3.0.1.tar.gz b/v3.0.1.tar.gz deleted file mode 100644 index f588c1714f4d5cc4716d092bb49d7f3490512477..0000000000000000000000000000000000000000 Binary files a/v3.0.1.tar.gz and /dev/null differ diff --git a/v3.2.0.tar.gz b/v3.3.0.tar.gz similarity index 72% rename from v3.2.0.tar.gz rename to v3.3.0.tar.gz index ec6079677718a2694a54168cabdf3df84c490c8d..a58bcd5b572628ce15e27394ee53c14e103dfa07 100644 Binary files a/v3.2.0.tar.gz and b/v3.3.0.tar.gz differ