net/kafka: update to 2.1.0

While here, switch to scala 2.12 and redirect output to syslog

PR:		233844
Submitted by:	timp87@gmail.com (maintainer)

4 files changed, 55 insertions, 43 deletions

diff --git a/net/kafka/Makefile b/net/kafka/Makefile
index 1ff647188237..2aef0ac284dd 100644
--- a/net/kafka/Makefile
+++ b/net/kafka/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	kafka
-PORTVERSION=	2.0.0
+PORTVERSION=	2.1.0
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTVERSION}
-DISTNAME=	${PORTNAME}_2.11-${PORTVERSION}
+DISTNAME=	${PORTNAME}_2.12-${PORTVERSION}
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	Distributed streaming platform
@@ -98,6 +98,6 @@ do-install:
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.11-${PORTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
+	${EXTRACT_CMD} -xf ${WRKSRC}/site-docs/${PORTNAME}_2.12-${PORTVERSION}-site-docs.tgz -C ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/kafka/distinfo b/net/kafka/distinfo
index 1bf4df551466..ff6a1e7c508c 100644
--- a/net/kafka/distinfo
+++ b/net/kafka/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1500285144
-SHA256 (kafka_2.11-2.0.0.tgz) = fb64bc48f76c0908c62c95b2f6b92c1ae86d7449bbc5405f150f706ca94a03ea
-SIZE (kafka_2.11-2.0.0.tgz) = 55751827
+SHA256 (kafka_2.12-2.1.0.tgz) = a70b44a682f5082f5c69182d4596e7ded2df38629f09b50a629070ddb1ef4f86
+SIZE (kafka_2.12-2.1.0.tgz) = 55201623
diff --git a/net/kafka/files/kafka.in b/net/kafka/files/kafka.in
index b521ccf13175..eb86697b1c7b 100644
--- a/net/kafka/files/kafka.in
+++ b/net/kafka/files/kafka.in
@@ -23,8 +23,12 @@
 #			Default: None
 # kafka_pid_file:	Full path of the Kafka process PID file
 #			Default: %%KAFKA_RUNDIR%%/kafka.pid
-# kafka_out_file:	Filename to store Kafka's stdout and stderr
-#			Default: kafkaServer.out
+# kafka_syslog_output_enable:		Set to enable syslog output.
+#					Default: YES
+# kafka_syslog_output_priority: 	Set syslog priority if syslog enabled.
+#					Default: info
+# kafkat_syslog_output_facility:	Set syslog facility if syslog enabled.
+#					Default: daemon
 
 . /etc/rc.subr
 
@@ -41,7 +45,17 @@ load_rc_config "${name}"
 : ${kafka_log_dir:=%%KAFKA_LOGDIR%%}
 : ${kafka_java_opts:=}
 : ${kafka_pid_file:=%%KAFKA_RUNDIR%%/kafka.pid}
-: ${kafka_out_file:=kafkaServer.out}
+: ${kafka_syslog_output_enable:="YES"}
+
+if checkyesno kafka_syslog_output_enable; then
+	kafka_syslog_output_flags="-t ${name} -T ${name}"
+	if [ -n "${kafka_syslog_output_priority}" ]; then
+		kafka_syslog_output_flags="${kafka_syslog_output_flags} -s ${kafka_syslog_output_priority}"
+	fi
+	if [ -n "${kafka_syslog_output_facility}" ]; then
+		kafka_syslog_output_flags="${kafka_syslog_output_flags} -l ${kafka_syslog_output_facility}"
+	fi
+fi
 
 JAVA=%%JAVA%%
 
@@ -53,24 +67,17 @@ pidfile=${kafka_pid_file}
 procname=${JAVA}
 required_files="${kafka_config} ${kafka_log4j_profile}"
 
-daemon_head="-f"
-daemon_tail=""
-
-if [ -n "$kafka_out_file" ]; then
-	daemon_head=""
-	daemon_tail=" > ${kafka_log_dir}/${kafka_out_file} 2>&1 < /dev/null"
-	[ -d "$kafka_log_dir" ] || mkdir -p "$kafka_log_dir"
-	[ -f "${kafka_log_dir}/${kafka_out_file}" ] || touch "${kafka_log_dir}/${kafka_out_file}"
-fi
 
 command="/usr/sbin/daemon"
-command_args="${daemon_head} -p ${pidfile} ${JAVA} ${kafka_main} kafka.Kafka ${kafka_config} ${daemon_tail}"
+command_args="-f ${kafka_syslog_output_flags} -p ${pidfile} ${JAVA} ${kafka_main} kafka.Kafka ${kafka_config}"
 
 start_precmd="kafka_init"
 
+
 kafka_init()
 {
-	chown ${kafka_user}:${kafka_group} ${pidfile%/*} ${kafka_log_dir} ${kafka_log_dir}/${kafka_out_file} ${kafka_config} ${kafka_log4j_profile}
+	[ -d "$kafka_log_dir" ] || mkdir -p "$kafka_log_dir"
+	chown ${kafka_user}:${kafka_group} ${pidfile%/*} ${kafka_log_dir} ${kafka_config} ${kafka_log4j_profile}
 }
 
 run_rc_command "$1"
diff --git a/net/kafka/pkg-plist b/net/kafka/pkg-plist
index ffbb124ef626..3b172ae570ec 100644
--- a/net/kafka/pkg-plist
+++ b/net/kafka/pkg-plist
@@ -30,6 +30,7 @@
 %%DATADIR%%/libs/argparse4j-0.7.0.jar
 %%DATADIR%%/libs/audience-annotations-0.5.0.jar
 %%DATADIR%%/libs/commons-lang3-3.5.jar
+%%DATADIR%%/libs/compileScala.mapping
 %%DATADIR%%/libs/connect-api-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-basic-auth-extension-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/connect-file-%%PORTVERSION%%.jar
@@ -40,18 +41,19 @@
 %%DATADIR%%/libs/hk2-api-2.5.0-b42.jar
 %%DATADIR%%/libs/hk2-locator-2.5.0-b42.jar
 %%DATADIR%%/libs/hk2-utils-2.5.0-b42.jar
-%%DATADIR%%/libs/jackson-annotations-2.9.6.jar
-%%DATADIR%%/libs/jackson-core-2.9.6.jar
-%%DATADIR%%/libs/jackson-databind-2.9.6.jar
-%%DATADIR%%/libs/jackson-jaxrs-base-2.9.6.jar
-%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.9.6.jar
-%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.9.6.jar
+%%DATADIR%%/libs/jackson-annotations-2.9.7.jar
+%%DATADIR%%/libs/jackson-core-2.9.7.jar
+%%DATADIR%%/libs/jackson-databind-2.9.7.jar
+%%DATADIR%%/libs/jackson-jaxrs-base-2.9.7.jar
+%%DATADIR%%/libs/jackson-jaxrs-json-provider-2.9.7.jar
+%%DATADIR%%/libs/jackson-module-jaxb-annotations-2.9.7.jar
 %%DATADIR%%/libs/javassist-3.22.0-CR2.jar
 %%DATADIR%%/libs/javax.annotation-api-1.2.jar
 %%DATADIR%%/libs/javax.inject-1.jar
 %%DATADIR%%/libs/javax.inject-2.5.0-b42.jar
 %%DATADIR%%/libs/javax.servlet-api-3.1.0.jar
 %%DATADIR%%/libs/javax.ws.rs-api-2.1.jar
+%%DATADIR%%/libs/javax.ws.rs-api-2.1.1.jar
 %%DATADIR%%/libs/jaxb-api-2.3.0.jar
 %%DATADIR%%/libs/jersey-client-2.27.jar
 %%DATADIR%%/libs/jersey-common-2.27.jar
@@ -60,41 +62,42 @@
 %%DATADIR%%/libs/jersey-hk2-2.27.jar
 %%DATADIR%%/libs/jersey-media-jaxb-2.27.jar
 %%DATADIR%%/libs/jersey-server-2.27.jar
-%%DATADIR%%/libs/jetty-client-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-continuation-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-http-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-io-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-security-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-server-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-servlet-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-servlets-9.4.11.v20180605.jar
-%%DATADIR%%/libs/jetty-util-9.4.11.v20180605.jar
+%%DATADIR%%/libs/jetty-client-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-continuation-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-http-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-io-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-security-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-server-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-servlet-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-servlets-9.4.12.v20180830.jar
+%%DATADIR%%/libs/jetty-util-9.4.12.v20180830.jar
 %%DATADIR%%/libs/jopt-simple-5.0.4.jar
 %%DATADIR%%/libs/kafka-clients-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-log4j-appender-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-examples-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/kafka-streams-scala_2.11-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka-streams-scala_2.12-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-streams-test-utils-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/kafka-tools-%%PORTVERSION%%.jar
-%%DATADIR%%/libs/kafka_2.11-%%PORTVERSION%%.jar
+%%DATADIR%%/libs/kafka_2.12-%%PORTVERSION%%.jar
 %%DATADIR%%/libs/log4j-1.2.17.jar
-%%DATADIR%%/libs/lz4-java-1.4.1.jar
-%%DATADIR%%/libs/maven-artifact-3.5.3.jar
+%%DATADIR%%/libs/lz4-java-1.5.0.jar
+%%DATADIR%%/libs/maven-artifact-3.5.4.jar
 %%DATADIR%%/libs/metrics-core-2.2.0.jar
 %%DATADIR%%/libs/osgi-resource-locator-1.0.1.jar
 %%DATADIR%%/libs/plexus-utils-3.1.0.jar
 %%DATADIR%%/libs/reflections-0.9.11.jar
-%%DATADIR%%/libs/rocksdbjni-5.7.3.jar
-%%DATADIR%%/libs/scala-library-2.11.12.jar
-%%DATADIR%%/libs/scala-logging_2.11-3.9.0.jar
-%%DATADIR%%/libs/scala-reflect-2.11.12.jar
+%%DATADIR%%/libs/rocksdbjni-5.14.2.jar
+%%DATADIR%%/libs/scala-library-2.12.7.jar
+%%DATADIR%%/libs/scala-logging_2.12-3.9.0.jar
+%%DATADIR%%/libs/scala-reflect-2.12.7.jar
 %%DATADIR%%/libs/slf4j-api-1.7.25.jar
 %%DATADIR%%/libs/slf4j-log4j12-1.7.25.jar
-%%DATADIR%%/libs/snappy-java-1.1.7.1.jar
+%%DATADIR%%/libs/snappy-java-1.1.7.2.jar
 %%DATADIR%%/libs/validation-api-1.1.0.Final.jar
 %%DATADIR%%/libs/zkclient-0.10.jar
 %%DATADIR%%/libs/zookeeper-3.4.13.jar
+%%DATADIR%%/libs/zstd-jni-1.3.5-4.jar
 %%ETCDIR%%/trogdor.conf.sample
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/api.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/configuration.html
@@ -135,6 +138,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_errors.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_messages.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/protocol_types.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/sink_connector_config.html
+%%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/source_connector_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/streams_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/generated/topic_config.html
 %%PORTDOCS%%%%DOCSDIR%%/site-docs/images/consumer-groups.png