Upgrade to 5.5.2

Dockerfile

@@ -72,8 +72,8 @@ RUN mkdir -p /etc/confluent/docker /usr/logs \
     && useradd --no-log-init --create-home --shell /bin/bash appuser \
     && chown appuser:appuser -R /etc/confluent/ /usr/logs
 
-ADD --chown=appuser:appuser target/cp-base-new-5.5.0-package/share/doc/* /usr/share/doc/cp-base-new/
-ADD --chown=appuser:appuser target/cp-base-new-5.5.0-package/share/java/cp-base-new/* /usr/share/java/cp-base-new/
+ADD --chown=appuser:appuser target/cp-base-new-5.5.2-package/share/doc/* /usr/share/doc/cp-base-new/
+ADD --chown=appuser:appuser target/cp-base-new-5.5.2-package/share/java/cp-base-new/* /usr/share/java/cp-base-new/
 
 COPY --chown=appuser:appuser include/etc/confluent/docker /etc/confluent/docker
 
@@ -85,7 +85,7 @@ COPY license.txt /licenses
 ############################################################
 ############ vvvvv  This Container Below  vvvvv ############
 
-ARG PROJECT_VERSION=5.5.0
+ARG PROJECT_VERSION=5.5.2
 ARG ARTIFACT_ID=cp-kafka
 
 LABEL maintainer="confluentfed@confluent.io"
@@ -99,7 +99,7 @@ ARG BUILD_NUMBER=-1
 LABEL io.confluent.docker.build.number=$BUILD_NUMBER
 LABEL io.confluent.docker.git.repo="confluentinc/kafka-images"
 
-ARG CONFLUENT_VERSION=5.5.0-1
+ARG CONFLUENT_VERSION=5.5.2-1
 ARG CONFLUENT_PACKAGES_REPO
 ARG CONFLUENT_PLATFORM_LABEL
 ARG SCALA_VERSION=2.12
@@ -113,12 +113,12 @@ ENV KAFKA_ADVERTISED_LISTENERS=${KAFKA_ADVERTISED_LISTENERS}
 ENV COMPONENT=kafka
 
 # Copy in the RPMs we want to install
-COPY ./confluent-kafka-${SCALA_VERSION}-${CONFLUENT_VERSION}.rpm /tmp/confluent-kafka-${SCALA_VERSION}-${CONFLUENT_VERSION}.rpm
+COPY ./confluent-kafka-2.12-5.5.2-1.noarch.rpm /tmp/confluent-kafka-2.12-5.5.2-1.noarch.rpm
 
 USER root
 
 RUN echo "===> Installing ${COMPONENT}..." \
-    && dnf install --nogpgcheck -y /tmp/confluent-kafka-${SCALA_VERSION}-${CONFLUENT_VERSION}.rpm \
+    && dnf install --nogpgcheck -y /tmp/confluent-kafka-2.12-5.5.2-1.noarch.rpm \
     && echo "===> clean up ..."  \
     && dnf clean all \
     && rm -rf /tmp/* \

Jenkinsfile

 @Library('DCCSCR@master') _
-dccscrPipeline( version: "5.5.0" )
+dccscrPipeline( version: "5.5.2" )
 

download.yaml

@@ -9,13 +9,8 @@ resources:
     validation:
       type: "sha256"
       value: "5244e51494f5d1dfbb89da492d4250cb07f9246644736d10ed6c45deb1a48500"
-  - url: "https://packages.confluent.io/rpm/5.5/confluent-kafka-2.11-5.5.0-1.noarch.rpm"
-    filename: "confluent-kafka-2.11-5.5.0-1.noarch.rpm"
+  - url: "https://packages.confluent.io/rpm/5.5/confluent-kafka-2.12-5.5.2-1.noarch.rpm"
+    filename: "confluent-kafka-2.12-5.5.2-1.noarch.rpm"
     validation:
       type: "sha256"
-      value: "8184e548185a9633c29a7b30da2b1fe24ffa78351746221ae8c72315e770e98c"
-  - url: "https://packages.confluent.io/rpm/5.5/confluent-kafka-2.12-5.5.0-1.noarch.rpm"
-    filename: "confluent-kafka-2.12-5.5.0-1.noarch.rpm"
-    validation:
-      type: "sha256"
-      value: "1a2f04ee8c34feab45cd8212ba55415048ed0b83e0a977c8efcde14993000bf8"
+      value: "a65232ad4ee53acdc54fbe394c636caa956b7c17302c1631289b110be51ff2b4"

include/etc/confluent/docker/bash-config

+#
+# Copyright 2018 Confluent Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o nounset \
+    -o errexit
+
+# Trace may expose passwords/credentials by printing them to stdout, so turn on with care.
+if [ "${TRACE:-}" == "true" ]; then
+  set -o verbose \
+      -o xtrace
+fi

include/etc/confluent/docker/mesos-setup.sh

+#!/usr/bin/env bash
+
+set +o nounset
+
+if [ -z $SKIP_MESOS_AUTO_SETUP ]; then
+    if [ -n $MESOS_SANDBOX ] && [ -e $MESOS_SANDBOX/.ssl/scheduler.crt ] && [ -e $MESOS_SANDBOX/.ssl/scheduler.key ]; then
+        echo "Entering Mesos auto setup for Java SSL truststore. You should not see this if you are not on mesos ..."
+
+        openssl pkcs12 -export -in $MESOS_SANDBOX/.ssl/scheduler.crt -inkey $MESOS_SANDBOX/.ssl/scheduler.key \
+                       -out /tmp/keypair.p12 -name keypair \
+                       -CAfile $MESOS_SANDBOX/.ssl/ca-bundle.crt -caname root -passout pass:export
+
+        keytool -importkeystore \
+                -deststorepass changeit -destkeypass changeit -destkeystore /tmp/kafka-keystore.jks \
+                -srckeystore /tmp/keypair.p12 -srcstoretype PKCS12 -srcstorepass export \
+                -alias keypair
+
+        keytool -import \
+                -trustcacerts \
+                -alias root \
+                -file $MESOS_SANDBOX/.ssl/ca-bundle.crt \
+                -storepass changeit \
+                -keystore /tmp/kafka-truststore.jks -noprompt
+    fi
+fi
+
+set -o nounset

include/etc/confluent/docker/run

@@ -25,9 +25,6 @@ if [ $# -ne 0 ]; then
   done
 fi
 
-echo "===> ENV Variables ..."
-show_env
-
 echo "===> User"
 id
 

target/cp-base-new-5.5.0-package/share/doc/cp-base-new/licenses.html → target/cp-base-new-5.5.2-package/share/doc/cp-base-new/licenses.html

@@ -33,19 +33,19 @@ th {
 </THEAD>
 <TBODY>
 <TR>
-<TD><A HREF="http://github.com/FasterXML/jackson">jackson-annotations-2.10.2</A></TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="http://github.com/FasterXML/jackson">jackson-annotations-2.10.5</A></TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD><A HREF="https://github.com/FasterXML/jackson-core">jackson-core-2.10.2</A></TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="https://github.com/FasterXML/jackson-core">jackson-core-2.10.5</A></TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD><A HREF="http://github.com/FasterXML/jackson">jackson-databind-2.10.2</A></TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="http://github.com/FasterXML/jackson">jackson-databind-2.10.5</A></TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD><A HREF="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformat-csv-2.10.2</A></TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformat-csv-2.10.5</A></TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD><A HREF="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformat-yaml-2.10.2</A></TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="https://github.com/FasterXML/jackson-dataformats-text">jackson-dataformat-yaml-2.10.5</A></TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>jackson-datatype-jdk8-2.10.2</TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD>jackson-datatype-jdk8-2.10.5</TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD><A HREF="https://github.com/FasterXML/jackson-modules-base">jackson-module-paranamer-2.10.2</A></TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="https://github.com/FasterXML/jackson-modules-base">jackson-module-paranamer-2.10.5</A></TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
 <TD>gson-2.8.5</TD><TD>jar</TD><TD>2.8.5</TD><TD></TD></TR>
 <TR>
@@ -55,23 +55,23 @@ th {
 <TR>
 <TD><A HREF="http://commons.apache.org/proper/commons-cli/">commons-cli-1.4</A></TD><TD>jar</TD><TD>1.4</TD><TD><A HREF="https://www.apache.org/licenses/LICENSE-2.0.txt">link from artifact (included file)</A><br></TD></TR>
 <TR>
-<TD>common-utils-5.5.0</TD><TD>jar</TD><TD>5.5.0</TD><TD></TD></TR>
+<TD>common-utils-5.5.2</TD><TD>jar</TD><TD>5.5.2</TD><TD></TD></TR>
 <TR>
-<TD>utility-belt-5.5.0</TD><TD>jar</TD><TD>5.5.0</TD><TD></TD></TR>
+<TD>utility-belt-5.5.2</TD><TD>jar</TD><TD>5.5.2</TD><TD></TD></TR>
 <TR>
-<TD>netty-buffer-4.1.45.Final</TD><TD>jar</TD><TD>4.1.45.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD>netty-buffer-4.1.48.Final</TD><TD>jar</TD><TD>4.1.48.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>netty-codec-4.1.45.Final</TD><TD>jar</TD><TD>4.1.45.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD>netty-codec-4.1.48.Final</TD><TD>jar</TD><TD>4.1.48.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>netty-handler-4.1.45.Final</TD><TD>jar</TD><TD>4.1.45.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD>netty-handler-4.1.48.Final</TD><TD>jar</TD><TD>4.1.48.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>netty-resolver-4.1.45.Final</TD><TD>jar</TD><TD>4.1.45.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD>netty-resolver-4.1.48.Final</TD><TD>jar</TD><TD>4.1.48.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>netty-transport-4.1.45.Final</TD><TD>jar</TD><TD>4.1.45.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD>netty-transport-4.1.48.Final</TD><TD>jar</TD><TD>4.1.48.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>netty-transport-native-epoll-4.1.45.Final</TD><TD>jar</TD><TD>4.1.45.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD>netty-transport-native-epoll-4.1.48.Final</TD><TD>jar</TD><TD>4.1.48.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>netty-transport-native-unix-common-4.1.45.Final</TD><TD>jar</TD><TD>4.1.45.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD>netty-transport-native-unix-common-4.1.48.Final</TD><TD>jar</TD><TD>4.1.48.Final</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
 <TD><A HREF="http://jopt-simple.github.io/jopt-simple">jopt-simple-5.0.4</A></TD><TD>jar</TD><TD>5.0.4</TD><TD><A HREF="http://www.opensource.org/licenses/mit-license.php">The MIT License</A><br></TD></TR>
 <TR>
@@ -79,23 +79,23 @@ th {
 <TR>
 <TD>audience-annotations-0.5.0</TD><TD>jar</TD><TD>0.5.0</TD><TD><A HREF="licenses/LICENSE-audience-annotations-0.5.0.txt">included file</A></TD></TR>
 <TR>
-<TD>zookeeper-3.5.7</TD><TD>jar</TD><TD>3.5.7</TD><TD><A HREF="licenses/LICENSE-zookeeper-3.5.7.txt">included file</A></TD></TR>
+<TD>zookeeper-3.5.8</TD><TD>jar</TD><TD>3.5.8</TD><TD><A HREF="licenses/LICENSE-zookeeper-3.5.8.txt">included file</A></TD></TR>
 <TR>
-<TD>zookeeper-jute-3.5.7</TD><TD>jar</TD><TD>3.5.7</TD><TD><A HREF="licenses/LICENSE-zookeeper-jute-3.5.7.txt">included file</A></TD></TR>
+<TD>zookeeper-jute-3.5.8</TD><TD>jar</TD><TD>3.5.8</TD><TD><A HREF="licenses/LICENSE-zookeeper-jute-3.5.8.txt">included file</A></TD></TR>
 <TR>
-<TD><A HREF="https://api.bintray.com/maven/jctools/jctools/jctools-core/;publish=1">netty-common-4.1.45.Final</A></TD><TD>jar</TD><TD>2.1.1</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="https://api.bintray.com/maven/jctools/jctools/jctools-core/;publish=1">netty-common-4.1.48.Final</A></TD><TD>jar</TD><TD>3.0.0</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br><A HREF="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</A><br></TD></TR>
 <TR>
 <TD><A HREF="http://www.slf4j.org">slf4j-api-1.7.26</A></TD><TD>jar</TD><TD>1.7.26</TD><TD></TD></TR>
 <TR>
 <TD><A HREF="http://www.slf4j.org">slf4j-simple-1.7.26</A></TD><TD>jar</TD><TD>1.7.26</TD><TD></TD></TR>
 <TR>
-<TD><A HREF="http://www.snakeyaml.org">snakeyaml-1.24</A></TD><TD>jar</TD><TD>1.24</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
+<TD><A HREF="http://www.snakeyaml.org">snakeyaml-1.26</A></TD><TD>jar</TD><TD>1.26</TD><TD><A HREF="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</A><br></TD></TR>
 <TR>
-<TD>jackson-module-scala_2.12-2.10.2</TD><TD>jar</TD><TD>2.10.2</TD><TD><A HREF="licenses/LICENSE-jackson-module-scala_2.12-2.10.2.txt">included file</A></TD></TR>
+<TD>jackson-module-scala_2.12-2.10.5</TD><TD>jar</TD><TD>2.10.5</TD><TD><A HREF="licenses/LICENSE-jackson-module-scala_2.12-2.10.5.txt">included file</A></TD></TR>
 <TR>
-<TD>kafka-clients-5.5.0-ccs</TD><TD>jar</TD><TD></TD><TD><A HREF="licenses/LICENSE-kafka-clients-5.5.0-ccs.txt">included file</A></TD></TR>
+<TD>kafka-clients-5.5.2-ccs</TD><TD>jar</TD><TD></TD><TD><A HREF="licenses/LICENSE-kafka-clients-5.5.2-ccs.txt">included file</A></TD></TR>
 <TR>
-<TD>kafka_2.12-5.5.0-ccs</TD><TD>jar</TD><TD></TD><TD><A HREF="licenses/LICENSE-kafka_2.12-5.5.0-ccs.txt">included file</A></TD></TR>
+<TD>kafka_2.12-5.5.2-ccs</TD><TD>jar</TD><TD></TD><TD><A HREF="licenses/LICENSE-kafka_2.12-5.5.2-ccs.txt">included file</A></TD></TR>
 <TR>
 <TD>lz4-java-1.7.1</TD><TD>jar</TD><TD>1.7.1</TD><TD></TD></TR>
 <TR>