diff --git a/.github/ISSUE_TEMPLATES/BUG_REPORT.yml b/.github/ISSUE_TEMPLATES/BUG_REPORT.yml index 397eaf3..274ab77 100644 --- a/.github/ISSUE_TEMPLATES/BUG_REPORT.yml +++ b/.github/ISSUE_TEMPLATES/BUG_REPORT.yml @@ -57,7 +57,8 @@ body: label: Version description: What version of our software are you running? options: - - 1.5.1 (Default) + - 1.5.2 (Default) + - 1.5.1 - older (<1.5.1) validations: required: true diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 391d188..a79ac08 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -15,10 +15,9 @@ Please delete options that are not relevant. ## How Has This Been Tested? - +- [ ] E2E +- [ ] Unit Test +- [ ] Integration Test ## Checklist diff --git a/.github/workflows/checkstyle-and-tests.yml b/.github/workflows/checkstyle-and-tests.yml index f4f8390..2b21dfe 100644 --- a/.github/workflows/checkstyle-and-tests.yml +++ b/.github/workflows/checkstyle-and-tests.yml @@ -3,7 +3,7 @@ name: Checkstyle and Tests on: pull_request: branches: - - 'master' + - 'main' types: [opened, synchronize, reopened] jobs: diff --git a/Dockerfile b/Dockerfile index 9e4abff..dcf0c99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ COPY --chown=esuser:esgroup --from=builder /opt/kafka/libs/ /opt/kafka/libs/ 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-*-jar-with-dependencies.jar /opt/kafka/libs/ +COPY --chown=esuser:esgroup target/kafka-connect-*-jar-with-dependencies.jar /opt/connectors/ WORKDIR /opt/kafka diff --git a/pom.xml b/pom.xml index 3627d96..e6b0d39 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ com.ibm.eventstreams.connect kafka-connect-mq-sink jar - 1.5.1 + 1.5.2 kafka-connect-mq-sink IBM Corporation @@ -63,19 +63,19 @@ com.ibm.mq com.ibm.mq.allclient - 9.1.5.0 + 9.3.3.1 junit junit - 4.13.1 + 4.13.2 test org.slf4j slf4j-log4j12 - 1.7.25 + 2.0.7 test @@ -84,7 +84,7 @@ org.testcontainers testcontainers - 1.17.2 + 1.17.6 test diff --git a/src/main/java/com/ibm/eventstreams/connect/mqsink/MQSinkConnector.java b/src/main/java/com/ibm/eventstreams/connect/mqsink/MQSinkConnector.java index e5d487c..763c5e9 100644 --- a/src/main/java/com/ibm/eventstreams/connect/mqsink/MQSinkConnector.java +++ b/src/main/java/com/ibm/eventstreams/connect/mqsink/MQSinkConnector.java @@ -153,7 +153,7 @@ public class MQSinkConnector extends SinkConnector { public static final String CONFIG_DISPLAY_MQ_RETRY_BACKOFF_MS = "Retry backoff (ms)"; - public static String version = "1.5.1"; + public static String version = "1.5.2"; private Map configProps;