net/kafka: update to 3.7.0.

PR:		278374
Reported by:	Dmitry Wagin <dmitry.wagin at ya dot ru>
Approved by:	maintainer

3 files changed, 78 insertions, 65 deletions

diff --git a/net/kafka/Makefile b/net/kafka/Makefile
index 1283c6bfd340..494e22260935 100644
--- a/net/kafka/Makefile
+++ b/net/kafka/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	kafka
-DISTVERSION=	3.6.1
+DISTVERSION=	3.7.0
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_2.13-${PORTVERSION}
@@ -17,18 +17,18 @@ USES=		cpe shebangfix tar:tgz
 CPE_VENDOR=	apache
 
 USE_JAVA=	yes
-JAVA_VERSION=	11+
+JAVA_VERSION=	17+
 JAVA_RUN=	jre
 
 USE_RC_SUBR=	kafka kafka_connect
 
 SHEBANG_FILES=	bin/*.sh
 
-KAFKA_USER?=	kafka
-KAFKA_GROUP?=	kafka
-KAFKA_DBDIR?=	/var/db/${PORTNAME}
+KAFKA_USER?=		kafka
+KAFKA_GROUP?=		kafka
+KAFKA_DBDIR?=		/var/db/${PORTNAME}
 KAFKA_DBDIR_KRAFT?=	${KAFKA_DBDIR}-kraft
-KAFKA_LOGDIR?=	/var/log/${PORTNAME}
+KAFKA_LOGDIR?=		/var/log/${PORTNAME}
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
@@ -37,46 +37,54 @@ NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 SUB_LIST=	JAVA=${JAVA} \
-		KAFKA_USER=${KAFKA_USER} \
+		KAFKA_DBDIR=${KAFKA_DBDIR} \
+		KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT} \
 		KAFKA_GROUP=${KAFKA_GROUP} \
 		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
-		KAFKA_DBDIR=${KAFKA_DBDIR} \
-		KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}
+		KAFKA_USER=${KAFKA_USER}
 USERS=		${KAFKA_USER}
 GROUPS=		${KAFKA_GROUP}
 
-KAFKA_BINS=	connect-distributed.sh connect-mirror-maker.sh \
-		connect-plugin-path.sh connect-standalone.sh kafka-acls.sh \
-		kafka-broker-api-versions.sh kafka-cluster.sh kafka-configs.sh \
-		kafka-console-consumer.sh kafka-console-producer.sh \
-		kafka-consumer-groups.sh kafka-consumer-perf-test.sh \
-		kafka-delegation-tokens.sh kafka-delete-records.sh \
-		kafka-dump-log.sh kafka-e2e-latency.sh kafka-features.sh \
-		kafka-get-offsets.sh kafka-jmx.sh \
-		kafka-leader-election.sh kafka-log-dirs.sh \
-		kafka-metadata-quorum.sh kafka-metadata-shell.sh \
-		kafka-mirror-maker.sh kafka-producer-perf-test.sh \
-		kafka-reassign-partitions.sh kafka-replica-verification.sh \
-		kafka-run-class.sh kafka-server-start.sh kafka-server-stop.sh \
-		kafka-storage.sh kafka-streams-application-reset.sh \
-		kafka-topics.sh kafka-transactions.sh \
-		kafka-verifiable-consumer.sh kafka-verifiable-producer.sh \
-		trogdor.sh zookeeper-security-migration.sh zookeeper-shell.sh
-KAFKA_CONFIGS=	connect-console-sink.properties \
-		connect-console-source.properties \
-		connect-distributed.properties connect-file-sink.properties \
-		connect-file-source.properties connect-log4j.properties \
-		connect-mirror-maker.properties connect-standalone.properties \
-		consumer.properties log4j.properties producer.properties \
-		server.properties tools-log4j.properties trogdor.conf
-KAFKA_CONFIGS_KRAFT=	broker.properties controller.properties server.properties
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION} \
-		KAFKA_USER=${KAFKA_USER} \
+KAFKA_BINS=		connect-distributed.sh connect-mirror-maker.sh \
+			connect-plugin-path.sh connect-standalone.sh \
+			kafka-acls.sh kafka-broker-api-versions.sh \
+			kafka-client-metrics.sh kafka-cluster.sh \
+			kafka-configs.sh kafka-console-consumer.sh \
+			kafka-console-producer.sh kafka-consumer-groups.sh \
+			kafka-consumer-perf-test.sh kafka-delegation-tokens.sh \
+			kafka-delete-records.sh kafka-dump-log.sh \
+			kafka-e2e-latency.sh kafka-features.sh \
+			kafka-get-offsets.sh kafka-jmx.sh \
+			kafka-leader-election.sh kafka-log-dirs.sh \
+			kafka-metadata-quorum.sh kafka-metadata-shell.sh \
+			kafka-mirror-maker.sh kafka-producer-perf-test.sh \
+			kafka-reassign-partitions.sh \
+			kafka-replica-verification.sh kafka-run-class.sh \
+			kafka-server-start.sh kafka-server-stop.sh \
+			kafka-storage.sh kafka-streams-application-reset.sh \
+			kafka-topics.sh kafka-transactions.sh \
+			kafka-verifiable-consumer.sh \
+			kafka-verifiable-producer.sh trogdor.sh \
+			zookeeper-security-migration.sh \
+			zookeeper-shell.sh
+KAFKA_CONFIGS=		connect-console-sink.properties \
+			connect-console-source.properties \
+			connect-distributed.properties \
+			connect-file-sink.properties \
+			connect-file-source.properties connect-log4j.properties \
+			connect-mirror-maker.properties \
+			connect-standalone.properties consumer.properties \
+			log4j.properties producer.properties server.properties \
+			tools-log4j.properties trogdor.conf
+KAFKA_CONFIGS_KRAFT=	broker.properties controller.properties \
+			server.properties
+
+PLIST_SUB=	KAFKA_DBDIR=${KAFKA_DBDIR} \
+		KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT} \
 		KAFKA_GROUP=${KAFKA_GROUP} \
 		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
-		KAFKA_DBDIR=${KAFKA_DBDIR} \
-		KAFKA_DBDIR_KRAFT=${KAFKA_DBDIR_KRAFT}
+		KAFKA_USER=${KAFKA_USER} \
+		PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/kafka/distinfo b/net/kafka/distinfo
index f1860df8bd93..2d482127724b 100644
--- a/net/kafka/distinfo
+++ b/net/kafka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701888581
-SHA256 (kafka_2.13-3.6.1.tgz) = e3db568c7f8fccc7f981ea7b0944268ae9310592c73ee0eb579ebfdbfcf2d3ca
-SIZE (kafka_2.13-3.6.1.tgz) = 113466638
+TIMESTAMP = 1713048680
+SHA256 (kafka_2.13-3.7.0.tgz) = 65f26e5937bbb76dfe78dfb416730dfa7e3378b27e13fd1e204f1a1099bfaf9c
+SIZE (kafka_2.13-3.7.0.tgz) = 119028138
diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
index ece7a5402926..9b70a18c4b25 100644
--- a/net/kafka/pkg-plist
+++ b/net/kafka/pkg-plist
@@ -4,6 +4,7 @@
 %%DATADIR%%/bin/connect-standalone.sh
 %%DATADIR%%/bin/kafka-acls.sh
 %%DATADIR%%/bin/kafka-broker-api-versions.sh
+%%DATADIR%%/bin/kafka-client-metrics.sh
 %%DATADIR%%/bin/kafka-cluster.sh
 %%DATADIR%%/bin/kafka-configs.sh
 %%DATADIR%%/bin/kafka-console-consumer.sh
@@ -63,15 +64,15 @@
 %%DATADIR%%/libs/hk2-api-2.6.1.jar
 %%DATADIR%%/libs/hk2-locator-2.6.1.jar
 %%DATADIR%%/libs/hk2-utils-2.6.1.jar
-%%DATADIR%%/libs/jackson-annotations-2.13.5.jar
-%%DATADIR%%/libs/jackson-core-2.13.5.jar
-%%DATADIR%%/libs/jackson-databind-2.13.5.jar
-%%DATADIR%%/libs/jackson-dataformat-csv-2.13.5.jar
-%%DATADIR%%/libs/jackson-datatype-jdk8-2.13.5.jar
-%%DATADIR%%/libs/jackson-jaxrs-base-2.13.5.jar
-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.13.5.jar
-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.13.5.jar
-%%DATADIR%%/libs/jackson-module-scala_2.13-2.13.5.jar
+%%DATADIR%%/libs/jackson-annotations-2.16.0.jar
+%%DATADIR%%/libs/jackson-core-2.16.0.jar
+%%DATADIR%%/libs/jackson-databind-2.16.0.jar
+%%DATADIR%%/libs/jackson-dataformat-csv-2.16.0.jar
+%%DATADIR%%/libs/jackson-datatype-jdk8-2.16.0.jar
+%%DATADIR%%/libs/jackson-jaxrs-base-2.16.0.jar
+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.16.0.jar
+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.16.0.jar
+%%DATADIR%%/libs/jackson-module-scala_2.13-2.16.0.jar
 %%DATADIR%%/libs/jakarta.activation-api-1.2.2.jar
 %%DATADIR%%/libs/jakarta.annotation-api-1.3.5.jar
 %%DATADIR%%/libs/jakarta.inject-2.6.1.jar
@@ -90,25 +91,26 @@
 %%DATADIR%%/libs/jersey-container-servlet-core-2.39.1.jar
 %%DATADIR%%/libs/jersey-hk2-2.39.1.jar
 %%DATADIR%%/libs/jersey-server-2.39.1.jar
-%%DATADIR%%/libs/jetty-client-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-continuation-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-http-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-io-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-security-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-server-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-servlet-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-servlets-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-util-9.4.52.v20230823.jar
-%%DATADIR%%/libs/jetty-util-ajax-9.4.52.v20230823.jar
+%%DATADIR%%/libs/jetty-client-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-continuation-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-http-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-io-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-security-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-server-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-servlet-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-servlets-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-util-9.4.53.v20231009.jar
+%%DATADIR%%/libs/jetty-util-ajax-9.4.53.v20231009.jar
 %%DATADIR%%/libs/jline-3.22.0.jar
 %%DATADIR%%/libs/jopt-simple-5.0.4.jar
-%%DATADIR%%/libs/jose4j-0.9.3.jar
+%%DATADIR%%/libs/jose4j-0.9.4.jar
 %%DATADIR%%/libs/jsr305-3.0.2.jar
 %%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-group-coordinator-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-metadata-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-raft-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-server-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-server-common-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-shell-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-storage-%%PORTVERSION%%.jar
@@ -133,18 +135,20 @@
 %%DATADIR%%/libs/netty-transport-classes-epoll-4.1.100.Final.jar
 %%DATADIR%%/libs/netty-transport-native-epoll-4.1.100.Final.jar
 %%DATADIR%%/libs/netty-transport-native-unix-common-4.1.100.Final.jar
+%%DATADIR%%/libs/opentelemetry-proto-1.0.0-alpha.jar
 %%DATADIR%%/libs/osgi-resource-locator-1.0.3.jar
 %%DATADIR%%/libs/paranamer-2.8.jar
 %%DATADIR%%/libs/pcollections-4.0.1.jar
 %%DATADIR%%/libs/plexus-utils-3.3.1.jar
+%%DATADIR%%/libs/protobuf-java-3.23.4.jar
 %%DATADIR%%/libs/reflections-0.10.2.jar
 %%DATADIR%%/libs/reload4j-1.2.25.jar
 %%DATADIR%%/libs/rocksdbjni-7.9.2.jar
 %%DATADIR%%/libs/scala-collection-compat_2.13-2.10.0.jar
 %%DATADIR%%/libs/scala-java8-compat_2.13-1.0.2.jar
-%%DATADIR%%/libs/scala-library-2.13.11.jar
+%%DATADIR%%/libs/scala-library-2.13.12.jar
 %%DATADIR%%/libs/scala-logging_2.13-3.9.4.jar
-%%DATADIR%%/libs/scala-reflect-2.13.11.jar
+%%DATADIR%%/libs/scala-reflect-2.13.12.jar
 %%DATADIR%%/libs/slf4j-api-1.7.36.jar
 %%DATADIR%%/libs/slf4j-reload4j-1.7.36.jar
 %%DATADIR%%/libs/snappy-java-1.1.10.5.jar
@@ -152,11 +156,12 @@
 %%DATADIR%%/libs/trogdor-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/zookeeper-3.8.3.jar
 %%DATADIR%%/libs/zookeeper-jute-3.8.3.jar
-%%DATADIR%%/libs/zstd-jni-1.5.5-1.jar
+%%DATADIR%%/libs/zstd-jni-1.5.5-6.jar
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/design.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/docker.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/index.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/documentation/streams/architecture.html