devel/spark: update 3.3.0 → 3.3.4

Release notes:
https://spark.apache.org/releases/spark-release-3-3-1.html
https://spark.apache.org/releases/spark-release-3-3-2.html
https://spark.apache.org/releases/spark-release-3-3-3.html
https://spark.apache.org/releases/spark-release-3-3-4.html

Also fix build - pkg-plist.

PR:		280325 280333
Approved by:	Martin Filla <freebsd@sysctl.cz> (maintainer)
MFH:		2024Q3

3 files changed, 39 insertions, 39 deletions

diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index 2dee0fc19f88..d1b5e9479c10 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -1,9 +1,8 @@
 PORTNAME=	spark
-PORTVERSION=	3.3.0
+PORTVERSION=	3.3.4
 CATEGORIES=	devel java
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
-		LOCAL/se/distfiles/:deps \
-		https://people.freebsd.org/~se/distfiles/:deps
+		LOCAL/vvd:deps
 PKGNAMEPREFIX=	apache-
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz \
 		${PORTNAME}-${PORTVERSION}-deps.tgz:deps
@@ -25,6 +24,7 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		cpe python shebangfix
 CPE_VENDOR=	apache
 USE_JAVA=	yes
+JAVA_VERSION=	8 11 17
 
 USE_RC_SUBR=	spark_master spark_worker
 SHEBANG_FILES=	bin/sparkR
@@ -49,7 +49,6 @@ MAKE_ENV+=	MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=2g" \
 		JAVA_HOME=${JAVA_HOME}
 .endif
 
-
 .if ${ARCH} == "amd64"
 JAVA_ARCH=	x86_64
 .elif ${ARCH} == "i386"
@@ -60,6 +59,7 @@ JAVA_ARCH=	${ARCH}
 
 # Update spark-*-dist.tgz if the hadoop version is changed!
 HADOOP_VERSION=	3.3.4
+# Comment out next line for download m2 and update ${PORTNAME}-${PORTVERSION}-deps.tgz
 OFFLINE=	-o
 
 do-build:
diff --git a/devel/spark/distinfo b/devel/spark/distinfo
index f9b542ef8fae..d7cadea9181a 100644
--- a/devel/spark/distinfo
+++ b/devel/spark/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1664448776
-SHA256 (spark-3.3.0.tgz) = 9b357aa165e3d78820702f0eee3fa32097839d42c9d0f5b19563fd23b796d13c
-SIZE (spark-3.3.0.tgz) = 29907712
-SHA256 (spark-3.3.0-deps.tgz) = f504c09556b3979b0fe9b8efd99103ea37673d81f9978cf88c68f2f336409eee
-SIZE (spark-3.3.0-deps.tgz) = 898673486
+TIMESTAMP = 1721161093
+SHA256 (spark-3.3.4.tgz) = 0b86dd8a61d317523c2e116cd11f65ed6f87ad69bf564819446ed74569c49f4c
+SIZE (spark-3.3.4.tgz) = 29214872
+SHA256 (spark-3.3.4-deps.tgz) = 6978b59996b94db73f50799be2842501467f0b79b018517a74aa27c1e662f6d8
+SIZE (spark-3.3.4-deps.tgz) = 695771185
diff --git a/devel/spark/pkg-plist b/devel/spark/pkg-plist
index 79949896565e..4a045ac5a91c 100644
--- a/devel/spark/pkg-plist
+++ b/devel/spark/pkg-plist
@@ -590,7 +590,7 @@
 %%DATADIR%%/jars/commons-logging-1.1.3.jar
 %%DATADIR%%/jars/commons-math3-3.6.1.jar
 %%DATADIR%%/jars/commons-pool-1.5.4.jar
-%%DATADIR%%/jars/commons-text-1.9.jar
+%%DATADIR%%/jars/commons-text-1.10.0.jar
 %%DATADIR%%/jars/compress-lzf-1.1.jar
 %%DATADIR%%/jars/core-1.1.2.jar
 %%DATADIR%%/jars/curator-client-2.13.0.jar
@@ -608,34 +608,34 @@
 %%DATADIR%%/jars/hadoop-client-runtime-3.3.4.jar
 %%DATADIR%%/jars/hadoop-shaded-guava-1.1.1.jar
 %%DATADIR%%/jars/hadoop-yarn-server-web-proxy-3.3.4.jar
-%%DATADIR%%/jars/hive-beeline-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-cli-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-common-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-exec-2.%%PYTHON_VER%%-core.jar
-%%DATADIR%%/jars/hive-jdbc-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-llap-common-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-metastore-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-serde-2.%%PYTHON_VER%%.jar
+%%DATADIR%%/jars/hive-beeline-2.3.9.jar
+%%DATADIR%%/jars/hive-cli-2.3.9.jar
+%%DATADIR%%/jars/hive-common-2.3.9.jar
+%%DATADIR%%/jars/hive-exec-2.3.9-core.jar
+%%DATADIR%%/jars/hive-jdbc-2.3.9.jar
+%%DATADIR%%/jars/hive-llap-common-2.3.9.jar
+%%DATADIR%%/jars/hive-metastore-2.3.9.jar
+%%DATADIR%%/jars/hive-serde-2.3.9.jar
 %%DATADIR%%/jars/hive-service-rpc-3.1.2.jar
-%%DATADIR%%/jars/hive-shims-0.23-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-shims-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-shims-common-2.%%PYTHON_VER%%.jar
-%%DATADIR%%/jars/hive-shims-scheduler-2.%%PYTHON_VER%%.jar
+%%DATADIR%%/jars/hive-shims-0.23-2.3.9.jar
+%%DATADIR%%/jars/hive-shims-2.3.9.jar
+%%DATADIR%%/jars/hive-shims-common-2.3.9.jar
+%%DATADIR%%/jars/hive-shims-scheduler-2.3.9.jar
 %%DATADIR%%/jars/hive-storage-api-2.7.2.jar
-%%DATADIR%%/jars/hive-vector-code-gen-2.%%PYTHON_VER%%.jar
+%%DATADIR%%/jars/hive-vector-code-gen-2.3.9.jar
 %%DATADIR%%/jars/hk2-api-2.6.1.jar
 %%DATADIR%%/jars/hk2-locator-2.6.1.jar
 %%DATADIR%%/jars/hk2-utils-2.6.1.jar
 %%DATADIR%%/jars/httpclient-4.5.13.jar
 %%DATADIR%%/jars/httpcore-4.4.14.jar
 %%DATADIR%%/jars/istack-commons-runtime-3.0.8.jar
-%%DATADIR%%/jars/ivy-2.5.0.jar
-%%DATADIR%%/jars/jackson-annotations-2.13.3.jar
-%%DATADIR%%/jars/jackson-core-2.13.3.jar
+%%DATADIR%%/jars/ivy-2.5.1.jar
+%%DATADIR%%/jars/jackson-annotations-2.13.4.jar
+%%DATADIR%%/jars/jackson-core-2.13.4.jar
 %%DATADIR%%/jars/jackson-core-asl-1.9.13.jar
-%%DATADIR%%/jars/jackson-databind-2.13.3.jar
+%%DATADIR%%/jars/jackson-databind-2.13.4.2.jar
 %%DATADIR%%/jars/jackson-mapper-asl-1.9.13.jar
-%%DATADIR%%/jars/jackson-module-scala_2.12-2.13.3.jar
+%%DATADIR%%/jars/jackson-module-scala_2.12-2.13.4.jar
 %%DATADIR%%/jars/jakarta.annotation-api-1.3.5.jar
 %%DATADIR%%/jars/jakarta.inject-2.6.1.jar
 %%DATADIR%%/jars/jakarta.servlet-api-4.0.3.jar
@@ -649,12 +649,12 @@
 %%DATADIR%%/jars/jaxb-runtime-2.3.2.jar
 %%DATADIR%%/jars/jcl-over-slf4j-1.7.32.jar
 %%DATADIR%%/jars/jdo-api-3.0.1.jar
-%%DATADIR%%/jars/jersey-client-2.34.jar
-%%DATADIR%%/jars/jersey-common-2.34.jar
-%%DATADIR%%/jars/jersey-container-servlet-2.34.jar
-%%DATADIR%%/jars/jersey-container-servlet-core-2.34.jar
-%%DATADIR%%/jars/jersey-hk2-2.34.jar
-%%DATADIR%%/jars/jersey-server-2.34.jar
+%%DATADIR%%/jars/jersey-client-2.36.jar
+%%DATADIR%%/jars/jersey-common-2.36.jar
+%%DATADIR%%/jars/jersey-container-servlet-2.36.jar
+%%DATADIR%%/jars/jersey-container-servlet-core-2.36.jar
+%%DATADIR%%/jars/jersey-hk2-2.36.jar
+%%DATADIR%%/jars/jersey-server-2.36.jar
 %%DATADIR%%/jars/jline-2.14.6.jar
 %%DATADIR%%/jars/joda-time-2.10.13.jar
 %%DATADIR%%/jars/jodd-core-3.5.2.jar
@@ -700,9 +700,9 @@
 %%DATADIR%%/jars/netty-transport-native-unix-common-4.1.74.Final.jar
 %%DATADIR%%/jars/objenesis-3.2.jar
 %%DATADIR%%/jars/opencsv-2.3.jar
-%%DATADIR%%/jars/orc-core-1.7.4.jar
-%%DATADIR%%/jars/orc-mapreduce-1.7.4.jar
-%%DATADIR%%/jars/orc-shims-1.7.4.jar
+%%DATADIR%%/jars/orc-core-1.7.10.jar
+%%DATADIR%%/jars/orc-mapreduce-1.7.10.jar
+%%DATADIR%%/jars/orc-shims-1.7.10.jar
 %%DATADIR%%/jars/oro-2.0.8.jar
 %%DATADIR%%/jars/osgi-resource-locator-1.0.3.jar
 %%DATADIR%%/jars/paranamer-2.8.jar
@@ -757,7 +757,7 @@
 %%DATADIR%%/jars/univocity-parsers-2.9.1.jar
 %%DATADIR%%/jars/velocity-1.5.jar
 %%DATADIR%%/jars/xbean-asm9-shaded-4.20.jar
-%%DATADIR%%/jars/xz-1.8.jar
+%%DATADIR%%/jars/xz-1.9.jar
 %%DATADIR%%/jars/zookeeper-3.6.2.jar
 %%DATADIR%%/jars/zookeeper-jute-3.6.2.jar
 %%DATADIR%%/jars/zstd-jni-1.5.2-1.jar
@@ -768,7 +768,6 @@
 %%DATADIR%%/python/docs/Makefile
 %%DATADIR%%/python/docs/make.bat
 %%DATADIR%%/python/docs/make2.bat
-%%DATADIR%%/python/docs/source/_static/copybutton.js
 %%DATADIR%%/python/docs/source/_static/css/pyspark.css
 %%DATADIR%%/python/docs/source/_templates/autosummary/class.rst
 %%DATADIR%%/python/docs/source/_templates/autosummary/class_with_docs.rst
@@ -976,6 +975,7 @@
 %%DATADIR%%/python/pyspark/pandas/missing/__init__.py
 %%DATADIR%%/python/pyspark/pandas/missing/common.py
 %%DATADIR%%/python/pyspark/pandas/missing/frame.py
+%%DATADIR%%/python/pyspark/pandas/missing/general_functions.py
 %%DATADIR%%/python/pyspark/pandas/missing/groupby.py
 %%DATADIR%%/python/pyspark/pandas/missing/indexes.py
 %%DATADIR%%/python/pyspark/pandas/missing/series.py