git: 91ef273ce62b - main - net/kafka: Use Java 11 or 17.

From: Fernando Apesteguía <fernape_at_FreeBSD.org>
Date: Wed, 12 Oct 2022 11:59:24 UTC
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=91ef273ce62b466b99abfcbcb06922148fbb450d

commit 91ef273ce62b466b99abfcbcb06922148fbb450d
Author:     Pavel Timofeev <timp87@gmail.com>
AuthorDate: 2022-10-12 08:30:18 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
CommitDate: 2022-10-12 11:55:44 +0000

    net/kafka: Use Java 11 or 17.
    
    Java 8 is deprecated in 3.0.0.
    
    PR:             266616
    Reported by:    yonas.yanfa@gmail.com (maintainer)
    Approved by:    timp87@gmail.com (maintainer)
---
 net/kafka/Makefile             |  53 ++++++++++++--------
 net/kafka/distinfo             |   6 +--
 net/kafka/files/pkg-message.in |  12 +++++
 net/kafka/pkg-plist            | 108 +++++++++++++++++++++++------------------
 4 files changed, 109 insertions(+), 70 deletions(-)

diff --git a/net/kafka/Makefile b/net/kafka/Makefile
index 3baafd24b018..071168c1bfd0 100644
--- a/net/kafka/Makefile
+++ b/net/kafka/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	kafka
-DISTVERSION=	3.1.0
+DISTVERSION=	3.3.1
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}_2.13-${PORTVERSION}
@@ -16,19 +16,33 @@ RUN_DEPENDS=	bash:shells/bash
 USES=		cpe shebangfix tar:tgz
 CPE_VENDOR=	apache
 
-SHEBANG_FILES=	bin/*.sh
+USE_JAVA=	yes
+JAVA_VERSION=	11+
+JAVA_RUN=	jre
 
-OPTIONS_DEFINE=	DOCS
+USE_RC_SUBR=	kafka kafka_connect
+
+SHEBANG_FILES=	bin/*.sh
 
 KAFKA_USER?=	kafka
 KAFKA_GROUP?=	kafka
 KAFKA_DBDIR?=	/var/db/${PORTNAME}
 KAFKA_LOGDIR?=	/var/log/${PORTNAME}
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
+NO_ARCH=	yes
+NO_BUILD=	yes
+
+SUB_FILES=	pkg-message
+SUB_LIST=	JAVA=${JAVA} \
+		KAFKA_USER=${KAFKA_USER} \
+		KAFKA_GROUP=${KAFKA_GROUP} \
+		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
+		KAFKA_DBDIR=${KAFKA_DBDIR}
 USERS=		${KAFKA_USER}
 GROUPS=		${KAFKA_GROUP}
 
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 KAFKA_BINS=	connect-distributed.sh connect-mirror-maker.sh \
 		connect-standalone.sh kafka-acls.sh \
 		kafka-broker-api-versions.sh kafka-cluster.sh kafka-configs.sh \
@@ -37,6 +51,7 @@ KAFKA_BINS=	connect-distributed.sh connect-mirror-maker.sh \
 		kafka-delegation-tokens.sh kafka-delete-records.sh \
 		kafka-dump-log.sh kafka-features.sh kafka-get-offsets.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 \
@@ -47,17 +62,11 @@ KAFKA_BINS=	connect-distributed.sh connect-mirror-maker.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
-
-USE_RC_SUBR=	kafka kafka_connect
-SUB_LIST=	JAVA=${JAVA} \
-		KAFKA_USER=${KAFKA_USER} \
-		KAFKA_GROUP=${KAFKA_GROUP} \
-		KAFKA_LOGDIR=${KAFKA_LOGDIR}
+		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_KRAFT=	broker.properties controller.properties server.properties
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		KAFKA_USER=${KAFKA_USER} \
@@ -65,11 +74,7 @@ PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		KAFKA_LOGDIR=${KAFKA_LOGDIR} \
 		KAFKA_DBDIR=${KAFKA_DBDIR}
 
-NO_BUILD=	yes
-NO_ARCH=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	8+
-JAVA_RUN=	yes
+OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} "s|JAVA=\"java\"|JAVA=\"${JAVA}\"|" ${WRKSRC}/bin/kafka-run-class.sh
@@ -77,10 +82,15 @@ post-patch:
 	@${REINPLACE_CMD} "s|\$$base_dir.*/config|${ETCDIR}|" ${WRKSRC}/bin/*.sh
 	@${REINPLACE_CMD} "s|ps ax|ps axww|" ${WRKSRC}/bin/kafka-server-stop.sh
 	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}|" ${WRKSRC}/config/server.properties
+.for f in ${KAFKA_KRAFT}
+	@${REINPLACE_CMD} "/log.dirs/s|=.*|=${KAFKA_DBDIR}/kraft/|" ${WRKSRC}/config/kraft/${f}
+.endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${ETCDIR}/kraft
 	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}
+	${MKDIR} ${STAGEDIR}${KAFKA_DBDIR}/kraft
 	${MKDIR} ${STAGEDIR}${KAFKA_LOGDIR}
 	${MKDIR} ${STAGEDIR}${DATADIR}/bin
 .for f in ${KAFKA_BINS}
@@ -94,6 +104,9 @@ do-install:
 .for f in ${KAFKA_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
+.for f in ${KAFKA_KRAFT}
+	${INSTALL_DATA} ${WRKSRC}/config/kraft/${f} ${STAGEDIR}${ETCDIR}/kraft/${f}.sample
+.endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/net/kafka/distinfo b/net/kafka/distinfo
index 6ca10bdc3ba4..d53e511b1ce1 100644
--- a/net/kafka/distinfo
+++ b/net/kafka/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1642864304
-SHA256 (kafka_2.13-3.1.0.tgz) = 3fd643f16d11ccdb81a7b296f305d7fa0ae6c9e39e1a701bac56929e2e4d6710
-SIZE (kafka_2.13-3.1.0.tgz) = 88130011
+TIMESTAMP = 1665443581
+SHA256 (kafka_2.13-3.3.1.tgz) = 18ad8a365fb111de249d3bb8bf3c96cd1af060ec8fb3e3d1fc4a7ae10d9042de
+SIZE (kafka_2.13-3.3.1.tgz) = 105053134
diff --git a/net/kafka/files/pkg-message.in b/net/kafka/files/pkg-message.in
new file mode 100644
index 000000000000..f5f0fe1b65a0
--- /dev/null
+++ b/net/kafka/files/pkg-message.in
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOM
+    Kafka KRaft mode is marked as production ready since v3.3.1.
+    If you want to start using KRaft mode be aware that there are
+    separate configs in %%ETCDIR%%/kraft directory.
+    The data logs will be stored in %%KAFKA_DBDIR%%/kraft directory by default.
+    So set kafka_config="%%ETCDIR%%/kraft/server.properties" in /etc/rc.conf
+    to get started with KRaft mode.
+EOM
+}
+]
diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
index 1431cdc40fe6..206622d584de 100644
--- a/net/kafka/pkg-plist
+++ b/net/kafka/pkg-plist
@@ -3,12 +3,12 @@
 %%DATADIR%%/bin/connect-standalone.sh
 %%DATADIR%%/bin/kafka-acls.sh
 %%DATADIR%%/bin/kafka-broker-api-versions.sh
+%%DATADIR%%/bin/kafka-cluster.sh
 %%DATADIR%%/bin/kafka-configs.sh
 %%DATADIR%%/bin/kafka-console-consumer.sh
 %%DATADIR%%/bin/kafka-console-producer.sh
 %%DATADIR%%/bin/kafka-consumer-groups.sh
 %%DATADIR%%/bin/kafka-consumer-perf-test.sh
-%%DATADIR%%/bin/kafka-cluster.sh
 %%DATADIR%%/bin/kafka-delegation-tokens.sh
 %%DATADIR%%/bin/kafka-delete-records.sh
 %%DATADIR%%/bin/kafka-dump-log.sh
@@ -16,6 +16,8 @@
 %%DATADIR%%/bin/kafka-get-offsets.sh
 %%DATADIR%%/bin/kafka-leader-election.sh
 %%DATADIR%%/bin/kafka-log-dirs.sh
+%%DATADIR%%/bin/kafka-metadata-quorum.sh
+%%DATADIR%%/bin/kafka-metadata-shell.sh
 %%DATADIR%%/bin/kafka-mirror-maker.sh
 %%DATADIR%%/bin/kafka-producer-perf-test.sh
 %%DATADIR%%/bin/kafka-reassign-partitions.sh
@@ -37,6 +39,7 @@
 %%DATADIR%%/libs/argparse4j-0.7.0.jar
 %%DATADIR%%/libs/audience-annotations-0.5.0.jar
 %%DATADIR%%/libs/commons-cli-1.4.jar
+%%DATADIR%%/libs/commons-lang3-3.12.0.jar
 %%DATADIR%%/libs/commons-lang3-3.8.1.jar
 %%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-basic-auth-extension-%%PORTVERSION%%.jar
@@ -49,21 +52,21 @@
 %%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.12.3.jar
-%%DATADIR%%/libs/jackson-core-2.12.3.jar
-%%DATADIR%%/libs/jackson-databind-2.12.3.jar
-%%DATADIR%%/libs/jackson-dataformat-csv-2.12.3.jar
-%%DATADIR%%/libs/jackson-datatype-jdk8-2.12.3.jar
-%%DATADIR%%/libs/jackson-jaxrs-base-2.12.3.jar
-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.12.3.jar
-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.12.3.jar
-%%DATADIR%%/libs/jackson-module-scala_2.13-2.12.3.jar
-%%DATADIR%%/libs/jakarta.activation-api-1.2.1.jar
+%%DATADIR%%/libs/jackson-annotations-2.13.3.jar
+%%DATADIR%%/libs/jackson-core-2.13.3.jar
+%%DATADIR%%/libs/jackson-databind-2.13.3.jar
+%%DATADIR%%/libs/jackson-dataformat-csv-2.13.3.jar
+%%DATADIR%%/libs/jackson-datatype-jdk8-2.13.3.jar
+%%DATADIR%%/libs/jackson-jaxrs-base-2.13.3.jar
+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.13.3.jar
+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.13.3.jar
+%%DATADIR%%/libs/jackson-module-scala_2.13-2.13.3.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
 %%DATADIR%%/libs/jakarta.validation-api-2.0.2.jar
 %%DATADIR%%/libs/jakarta.ws.rs-api-2.1.6.jar
-%%DATADIR%%/libs/jakarta.xml.bind-api-2.3.2.jar
+%%DATADIR%%/libs/jakarta.xml.bind-api-2.3.3.jar
 %%DATADIR%%/libs/javassist-3.27.0-GA.jar
 %%DATADIR%%/libs/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/libs/javax.ws.rs-api-2.1.1.jar
@@ -74,63 +77,65 @@
 %%DATADIR%%/libs/jersey-container-servlet-core-2.34.jar
 %%DATADIR%%/libs/jersey-hk2-2.34.jar
 %%DATADIR%%/libs/jersey-server-2.34.jar
-%%DATADIR%%/libs/jetty-client-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-continuation-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-http-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-io-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-security-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-server-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-servlet-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-servlets-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-util-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jetty-util-ajax-9.4.43.v20210629.jar
-%%DATADIR%%/libs/jline-3.12.1.jar
+%%DATADIR%%/libs/jetty-client-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-continuation-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-http-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-io-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-security-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-server-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-servlet-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-servlets-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-util-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jetty-util-ajax-9.4.48.v20220622.jar
+%%DATADIR%%/libs/jline-3.21.0.jar
 %%DATADIR%%/libs/jopt-simple-5.0.4.jar
-%%DATADIR%%/libs/jose4j-0.7.8.jar
+%%DATADIR%%/libs/jose4j-0.7.9.jar
 %%DATADIR%%/libs/kafka-clients-%%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-common-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-shell-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-storage-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-storage-api-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/kafka-shell-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-examples-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-scala_2.13-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-test-utils-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-tools-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka_2.13-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/log4j-1.2.17.jar
 %%DATADIR%%/libs/lz4-java-1.8.0.jar
-%%DATADIR%%/libs/maven-artifact-3.8.1.jar
+%%DATADIR%%/libs/maven-artifact-3.8.4.jar
 %%DATADIR%%/libs/metrics-core-2.2.0.jar
 %%DATADIR%%/libs/metrics-core-4.1.12.1.jar
-%%DATADIR%%/libs/netty-buffer-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-codec-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-common-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-handler-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-resolver-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-transport-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-transport-native-epoll-4.1.68.Final.jar
-%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.68.Final.jar
+%%DATADIR%%/libs/netty-buffer-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-codec-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-common-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-handler-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-resolver-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-classes-epoll-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-native-epoll-4.1.78.Final.jar
+%%DATADIR%%/libs/netty-transport-native-unix-common-4.1.78.Final.jar
 %%DATADIR%%/libs/osgi-resource-locator-1.0.3.jar
 %%DATADIR%%/libs/paranamer-2.8.jar
-%%DATADIR%%/libs/plexus-utils-3.2.1.jar
+%%DATADIR%%/libs/plexus-utils-3.3.0.jar
 %%DATADIR%%/libs/reflections-0.9.12.jar
-%%DATADIR%%/libs/rocksdbjni-6.22.1.1.jar
-%%DATADIR%%/libs/scala-collection-compat_2.13-2.4.4.jar
-%%DATADIR%%/libs/scala-java8-compat_2.13-1.0.0.jar
-%%DATADIR%%/libs/scala-library-2.13.6.jar
-%%DATADIR%%/libs/scala-logging_2.13-3.9.3.jar
-%%DATADIR%%/libs/scala-reflect-2.13.6.jar
-%%DATADIR%%/libs/trogdor-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/slf4j-api-1.7.30.jar
-%%DATADIR%%/libs/slf4j-log4j12-1.7.30.jar
+%%DATADIR%%/libs/reload4j-1.2.19.jar
+%%DATADIR%%/libs/rocksdbjni-6.29.4.1.jar
+%%DATADIR%%/libs/scala-collection-compat_2.13-2.6.0.jar
+%%DATADIR%%/libs/scala-java8-compat_2.13-1.0.2.jar
+%%DATADIR%%/libs/scala-library-2.13.8.jar
+%%DATADIR%%/libs/scala-logging_2.13-3.9.4.jar
+%%DATADIR%%/libs/scala-reflect-2.13.8.jar
+%%DATADIR%%/libs/slf4j-api-1.7.36.jar
+%%DATADIR%%/libs/slf4j-reload4j-1.7.36.jar
 %%DATADIR%%/libs/snappy-java-1.1.8.4.jar
+%%DATADIR%%/libs/swagger-annotations-2.2.0.jar
+%%DATADIR%%/libs/trogdor-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/zookeeper-3.6.3.jar
 %%DATADIR%%/libs/zookeeper-jute-3.6.3.jar
-%%DATADIR%%/libs/zstd-jni-1.5.0-4.jar
+%%DATADIR%%/libs/zstd-jni-1.5.2-1.jar
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/connect.html
@@ -162,6 +167,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_metrics.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_predicates.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_rest.yaml
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/connect_transforms.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/consumer_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/consumer_metrics.html
@@ -177,6 +183,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/streams_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/topic_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/consumer-groups.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/creating-streams-iframe-placeholder.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/NYT.jpg
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/architecture--white.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/architecture.png
@@ -188,6 +195,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/tutorials--white.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/tutorials.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/icons/zalando.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/intro_to_streams-iframe-placeholder.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka-apis.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_log.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/kafka_multidc.png
@@ -226,6 +234,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-time-windows-tumbling.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/streams-welcome.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/tracking_high_level.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/transforming_part_1-iframe-placeholder.png
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/images/transforming_part_2-iframe-placeholder.png
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/implementation.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/introduction.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/js/templateData.js
@@ -262,8 +272,8 @@
 @sample %%ETCDIR%%/connect-distributed.properties.sample
 @sample %%ETCDIR%%/connect-file-sink.properties.sample
 @sample %%ETCDIR%%/connect-file-source.properties.sample
-@sample %%ETCDIR%%/connect-mirror-maker.properties.sample
 @sample %%ETCDIR%%/connect-log4j.properties.sample
+@sample %%ETCDIR%%/connect-mirror-maker.properties.sample
 @sample %%ETCDIR%%/connect-standalone.properties.sample
 @sample %%ETCDIR%%/consumer.properties.sample
 @sample %%ETCDIR%%/log4j.properties.sample
@@ -271,5 +281,9 @@
 @sample %%ETCDIR%%/server.properties.sample
 @sample %%ETCDIR%%/tools-log4j.properties.sample
 @sample %%ETCDIR%%/trogdor.conf.sample
+@sample %%ETCDIR%%/kraft/broker.properties.sample
+@sample %%ETCDIR%%/kraft/controller.properties.sample
+@sample %%ETCDIR%%/kraft/server.properties.sample
 @dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%
+@dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_DBDIR%%/kraft
 @dir(%%KAFKA_USER%%,%%KAFKA_GROUP%%,755) %%KAFKA_LOGDIR%%