From 6c606dcf4b100e1b8271703ff6842a4d45bf2a9b Mon Sep 17 00:00:00 2001
From: Joel Hanson <joelhanson025@gmail.com>
Date: Mon, 25 Sep 2023 15:56:02 +0530
Subject: [PATCH 1/3] Update mq allclient, log4j and junit to latest
 versionclient

Signed-off-by: Joel Hanson <joelhanson025@gmail.com>
Signed-off-by: Joel Hanson <joel.hanson2@ibm.com>
---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3627d96..f25fdfe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,19 +63,19 @@
     <dependency>
       <groupId>com.ibm.mq</groupId>
       <artifactId>com.ibm.mq.allclient</artifactId>
-      <version>9.1.5.0</version>
+      <version>9.3.3.1</version>
     </dependency>
 
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.25</version>
+      <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
 
@@ -84,7 +84,7 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.17.2</version>
+      <version>1.17.6</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

From 8c94f2b5b53cd0c49ef9725481592b9c69de5637 Mon Sep 17 00:00:00 2001
From: Joel Hanson <joelhanson025@gmail.com>
Date: Mon, 25 Sep 2023 16:05:33 +0530
Subject: [PATCH 2/3] Update template to check if the code is tested properly

Signed-off-by: Joel Hanson <joelhanson025@gmail.com>
Signed-off-by: Joel Hanson <joel.hanson2@ibm.com>
---
 .github/PULL_REQUEST_TEMPLATE              | 7 +++----
 .github/workflows/checkstyle-and-tests.yml | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

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?
 
-<!-- Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
-
-- [ ] Test A
-- [ ] Test B -->
+- [ ] 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:

From c11934cb05235ef0971cb9b7ac640f26e3a7928b Mon Sep 17 00:00:00 2001
From: Joel Hanson <joelhanson025@gmail.com>
Date: Tue, 26 Sep 2023 08:54:57 +0530
Subject: [PATCH 3/3] Update version from 1.5.1 to 1.5.2

- Update dockerfile to be same as source connector

Signed-off-by: Joel Hanson <joelhanson025@gmail.com>
Signed-off-by: Joel Hanson <joel.hanson2@ibm.com>
Signed-off-by: Joel Hanson <joelhanson025@gmail.com>
---
 .github/ISSUE_TEMPLATES/BUG_REPORT.yml                         | 3 ++-
 Dockerfile                                                     | 2 +-
 pom.xml                                                        | 2 +-
 .../com/ibm/eventstreams/connect/mqsink/MQSinkConnector.java   | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

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/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 f25fdfe..e6b0d39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
   <groupId>com.ibm.eventstreams.connect</groupId>
   <artifactId>kafka-connect-mq-sink</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.1</version>
+  <version>1.5.2</version>
   <name>kafka-connect-mq-sink</name>
   <organization>
     <name>IBM Corporation</name>
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<String, String> configProps;