feat: Update package versions and fix vulnerabilities

- updated pom.xml to latest version
- updated xml format to be more consistent
- updated Dockerfile to use latest version of kafka
- New Dockerfile with updated versions of the base image
and the packages installed in the image.
- java distribution and pom package version updates
- Update java distribution to semeru from temurin
- Update com.ibm.mq.allclient to 9.3.2.1 to fix
  SNYK-JAVA-ORGJSON-5488379
- Update mockito-core to 4.11.0 to support java 8
- Update mq and kafka version support in README.md
- Update version from 1.3.3 to 1.3.4

Signed-off-by: Joel Hanson <[email protected]>

Author: Joel-hanson

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -57,8 +57,8 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
-        - 1.3.3 (Default)
-        - older (<1.3.3)
+        - 1.3.4 (Default)
+        - older (<1.3.4)
     validations:
       required: true
   - type: textarea

.github/workflows/checkstyle-and-tests.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: 8
-          distribution: 'temurin'
+          distribution: 'semeru'
       - name: Get java-version
         run: |
           BUILD_VERSION=$( mvn help:evaluate -Dexpression=project.version -q -DforceStdout )

Dockerfile

@@ -1,16 +1,25 @@
-FROM strimzi/kafka:latest-kafka-2.6.0 as builder
+# This dockerfile expects Connector jars to have been built under a `connectors` directory
+#
+FROM alpine as builder
 
-FROM ibmjava:8-jre
+RUN apk update
+RUN apk --no-cache add curl
+
+RUN curl -L "https://downloads.apache.org/kafka/3.4.0/kafka_2.12-3.4.0.tgz" -o kafka.tgz
+RUN mkdir /opt/kafka \
+    && tar -xf kafka.tgz -C /opt/kafka --strip-components=1
+
+FROM ibmjava:11
 
 RUN addgroup --gid 5000 --system esgroup && \
     adduser --uid 5000 --ingroup esgroup --system esuser
 
 COPY --chown=esuser:esgroup --from=builder /opt/kafka/bin/ /opt/kafka/bin/
 COPY --chown=esuser:esgroup --from=builder /opt/kafka/libs/ /opt/kafka/libs/
-COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/connect-distributed.properties /opt/kafka/config/
-COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/connect-log4j.properties /opt/kafka/config/
+COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/ /opt/kafka/config/
 RUN mkdir /opt/kafka/logs && chown esuser:esgroup /opt/kafka/logs
-COPY --chown=esuser:esgroup target/kafka-connect-mq-source-1.3.3-jar-with-dependencies.jar /opt/kafka/libs/
+
+COPY --chown=esuser:esgroup target/kafka-connect-*-jar-with-dependencies.jar /opt/connectors
 
 WORKDIR /opt/kafka
 

README.md

@@ -46,7 +46,7 @@ Build the connector using Maven:
 mvn clean package
 ```
 
-Once built, the output is a single JAR called `target/kafka-connect-mq-source-<version>-jar-with-dependencies.jar` which contains all of the required dependencies.
+Once built, the output is a single JAR called `target/kafka-connect-mq-source-<VERSION>-jar-with-dependencies.jar` which contains all of the required dependencies.
 
 ## Running the connector
 
@@ -59,8 +59,8 @@ To run the connector, you must have:
 
 - The JAR from building the connector
 - A properties file containing the configuration for the connector
-- Apache Kafka 2.0.0 or later, either standalone or included as part of an offering such as IBM Event Streams
-- IBM MQ v8 or later, or the IBM MQ on Cloud service
+- Apache Kafka 2.6.2 or later, either standalone or included as part of an offering such as IBM Event Streams
+- IBM MQ v9 or later, or the IBM MQ on Cloud service
 
 The connector can be run in a Kafka Connect worker in either standalone (single process) or distributed mode. It's a good idea to start in standalone mode.
 
@@ -92,13 +92,15 @@ curl -X POST -H "Content-Type: application/json" http://localhost:8083/connector
 This repository includes an example Dockerfile to run Kafka Connect in distributed mode. It also adds in the MQ source connector as an available connector plugin. It uses the default `connect-distributed.properties` and `connect-log4j.properties` files.
 
 1. `mvn clean package`
-1. `docker build -t kafkaconnect-with-mq-source:1.3.3 .`
-1. `docker run -p 8083:8083 kafkaconnect-with-mq-source:1.3.3`
+1. `docker build -t kafkaconnect-with-mq-source:<TAG> .`
+1. `docker run -p 8083:8083 kafkaconnect-with-mq-source:<TAG>`
+
+Substitute `<TAG>` with the version of the connector or `latest` to use the latest version.
 
 **NOTE:** To provide custom properties files create a folder called `config` containing the `connect-distributed.properties` and `connect-log4j.properties` files and use a Docker volume to make them available when running the container like this:
 
 ``` shell
-docker run -v $(pwd)/config:/opt/kafka/config -p 8083:8083 kafkaconnect-with-mq-source:1.3.3
+docker run -v $(pwd)/config:/opt/kafka/config -p 8083:8083 kafkaconnect-with-mq-source:<TAG>
 ```
 
 To start the MQ connector, you can use `config/mq-source.json` in this repository after replacing all placeholders and use a command like this: