MQ V2 Sink OSS release

.checkstyle/checkstyle.xml

@@ -140,4 +140,8 @@
     <!-- Filter out Checkstyle warnings that have been suppressed with the @SuppressWarnings annotation -->
     <module name="SuppressWarningsFilter"/>
 
+    <!-- new line -->
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
 </module>

.checkstyle/intellij-checkstyle.xml

@@ -136,4 +136,8 @@
     <!-- Filter out Checkstyle warnings that have been suppressed with the @SuppressWarnings annotation -->
     <module name="SuppressWarningsFilter"/>
 
+    <!-- new line -->
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
 </module>

.github/ISSUE_TEMPLATES/BUG_REPORT.yml

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

.gitignore

@@ -15,4 +15,6 @@ target/
 *.iws
 
 # Visual Studio Code
-.vscode/
+.vscode/
+
+mqjms.log.*

LICENSE

@@ -175,7 +175,7 @@ Apache License
 
    END OF TERMS AND CONDITIONS
 
-   Copyright 2017 IBM Corporation
+   Copyright 2017, 2024 IBM Corporation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

config/mq-sink-exactly-once.json

@@ -0,0 +1,19 @@
+{
+    "name": "mq-sink-exactly-once",
+    "config":
+    {
+        "connector.class": "com.ibm.eventstreams.connect.mqsink.MQSinkConnector",
+        "tasks.max": "1",
+        "topics": "<TOPIC>",
+
+        "key.converter": "org.apache.kafka.connect.storage.StringConverter",
+        "value.converter": "org.apache.kafka.connect.storage.StringConverter",
+
+        "mq.queue.manager": "<QUEUE_MANAGER>",
+        "mq.connection.name.list": "<CONNECTION_NAME_LIST>",
+        "mq.channel.name": "<CHANNEL_NAME>",
+        "mq.queue": "<QUEUE>",
+        "mq.message.builder": "com.ibm.eventstreams.connect.mqsink.builders.DefaultMessageBuilder",
+        "mq.exactly.once.state.queue": "<EXACTLY_ONCE_STATE_QUEUE>"
+    }
+}

config/mq-sink.properties

@@ -1,4 +1,4 @@
-# Copyright 2017, 2020 IBM Corporation
+# Copyright 2017, 2020, 2023, 2024 IBM Corporation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright 2017, 2020 IBM Corporation
+ * Copyright 2017, 2020, 2023, 2024 IBM Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
   <groupId>com.ibm.eventstreams.connect</groupId>
   <artifactId>kafka-connect-mq-sink</artifactId>
   <packaging>jar</packaging>
-  <version>1.5.2</version>
+  <version>2.2.0</version>
   <name>kafka-connect-mq-sink</name>
   <organization>
     <name>IBM Corporation</name>
@@ -30,13 +30,13 @@
   <description>
       A Kafka Connect connector for copying data from Apache Kafka into IBM MQ.
   </description>
-  <licenses>
-    <license>
-      <name>Apache License 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+    <licenses>
+        <license>
+            <name>Apache License 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -45,13 +45,13 @@
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>connect-api</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.kafka</groupId>
       <artifactId>connect-json</artifactId>
-      <version>3.4.0</version>
+      <version>3.4.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -74,7 +74,12 @@
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
+      <artifactId>slf4j-api</artifactId>
+      <version>2.0.7</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
       <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
@@ -84,13 +89,49 @@
     <dependency>
       <groupId>org.testcontainers</groupId>
       <artifactId>testcontainers</artifactId>
-      <version>1.17.6</version>
+      <version>1.17.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>3.1.0</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.24.2</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.14.3</version>
+    </dependency>
+
   </dependencies>
 
   <build>
     <plugins>
+        <plugin>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.3.1</version>
+          <configuration>
+            <outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
+            <resources>
+              <resource>
+                <directory>${project.basedir}</directory>
+                <includes>
+                  <include>LICENSE</include>
+                </includes>
+              </resource>
+            </resources>
+          </configuration>
+        </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
@@ -133,7 +174,7 @@
         </executions>
       </plugin>
 
-      <!-- build the release jar -->  
+      <!-- build the release jar -->
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>3.1.1</version>
@@ -280,6 +321,15 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.1.0</version>
+        <configuration>
+            <reuseForks>false</reuseForks>
+            <forkCount>1</forkCount>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
-</project>
+</project>

src/assembly/package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- * Copyright 2018 IBM Corporation
+ * Copyright 2018, 2023, 2024 IBM Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,6 @@
     <format>jar</format>
   </formats>
   <includeBaseDirectory>false</includeBaseDirectory>
-  <files>
-    <file>
-      <source>LICENSE</source>
-      <outputDirectory></outputDirectory>
-    </file>
-  </files>
   <dependencySets>
     <dependencySet>
       <outputDirectory></outputDirectory>
@@ -37,6 +31,7 @@
         <excludes>
           <exclude>**/copyright-exclude</exclude>
           <exclude>META-INF/maven/**</exclude>
+          <exclude>META-INF/LICENSE*</exclude>
         </excludes>
       </unpackOptions>
       <useTransitiveFiltering>true</useTransitiveFiltering>