Skip to content

Commit a187590

Browse files
priyankakujhughes24816Joel Hansonjoe-vullo-ibmnicholasmorgan
authored
MQ V2 Sink OSS release (#65)
* feat: travis script to login to docker registry (#25) Contributes to: event-integration/qp-planning#10883 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: try running the travis job without docker login (#26) Contributes to: event-integration/qp-planning#10883 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * Exactly-once message delivery semantics support (#9) * fix: Move config to MQSinkConfig from MQSinkConnector Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * tests: New tests to check the duplicates Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * - Added assertj - refactored duplicate record test + added another for connect crash. * - Changed AuthIt tests to have specific host ports. - Refactored testcontainer out from DuplicateIT into AbstractJMSContextIT * feat: Make topic name and partition variables Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * Updated logging packages * feat: Intitial change for exactly once semantics Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: handle unprovided sidequeue scenario Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Intitial change for exactly once semantics Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: checkstyle changes Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joel.hanson025@gmail.com> * fix: Static variables should be in UPPER_CASE Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Latest changes for mq sink connector Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Update config property names and consume messages as TextMessage Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * Removed a error being sent to standard out. * feat: Test update based on feedback Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Rename JMSWriter to JMSWorker Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: map based only once delivery Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: tests for only-once delivery Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: check if the max tasks is 1 and throw an exception if not Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Update changes based on feedback from PR Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Remove max task check from connector code Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson02@gmail.com> * feat: exception testing for only-once Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * fix: Tests to check JMSRuntimeException and jsonException is only thrown Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * fix: failing tests Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * Updated MQ to remove vulnerability * feat: Rename JMSWriter to JMSWorker Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: map based only once delivery Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: tests for only-once delivery Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: check if the max tasks is 1 and throw an exception if not Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Update changes based on feedback from PR Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Remove max task check from connector code Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson02@gmail.com> * feat: Check max task if the connector is configured with side queue Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson02@gmail.com> * fix: rename writer to worker Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Update config value names to match MQ_EXACTLY_ONCE_STATE_QUEUE Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Update state queue exception handling Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Changes with the new configSupportsExactlyOnce method Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Update version to 2.0.0 (#14) * feat: Update version to 1.6.0 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Update version to 2.0.0 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: New tests for atleast once behaviour with failing conditions. (#18) * feat: New tests for only once to recreate faliure Contributes to: mhub/qp-planning#10748 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: fix licence formatting and new line at the end Contributes to: mhub/qp-planning#10748 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Add missing Legal disclaimer (#19) * feat: Add missing Legal disclaimer Contributes to: mhub/qp-planning#<issue number> Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Add current year to the legal disclaimer Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * feat: Add LICENSES Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: Updated to latest LICENSES Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * refactor: Move all the common test variables to a single class (#20) Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: Joel Hanson <joelhanson025@gmail.com> * fix: Review comment fixes (#21) * fix: rename variable names Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: simplify the jsonprocessingexception failure Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Rename variable names and create method for readablity Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Move SinkRecordBuilder to utils folder Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: Add missing final Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: enable exactlyOnce to be true if tasks.max is not provided Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: spelling for commited -> committed Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: early exits are traced Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: Refactor handleException method Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Update version in BUG_REPORT Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: Rename class SinkRecordBuilder and remove temp variables Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: tidy up in test for clarity Contributes to: event-integration/eventstreams-planning#10774 Signed-off-by: Jonathan Hughes <jonathan.hughes@ibm.com> Co-authored-by: Jonathan Hughes <Jonathan.Hughes@ibm.com> * feat: Update exception handling similar to source connector (#22) * fix: Update connectionException to JMSWorkerConnectionException Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Log stack trace instead of printStackTrace Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * refactor: split out large part of jmswoker into a seperate class (#23) * refactor: split out large part of jmswoker into a seperate class Contributes to: mhub/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * refactor: connect code is refactored have common method Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Move SSLContext related part to seperate class Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: Rename method name to be more meaningful Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Remove unwanted imports and java docs Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * refactor: Exception handling Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * refactor: simplify the put method Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: handle exception from top and clean up Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Formatting code, sorting imports, adding new tests for exceptions (#24) Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * Update kafka binary to a working version (#15) * feat: Formatting and updation of readme for exactly once configuration (#27) * feat: Formatting and updation of read for exactly once configuration - .gitignore update to have the mq logs - Formatted the readme file - Added new documenation for the exactly once semantics - New sample file for the exactly-once connector config Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: Update 3.4.0 to 3.4.1 Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * fix: Update README, add license declaration, remove AbstractConfig (#28) * fix: Update README, add license declaration, remove AbstractConfig Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Change DestinationBuilderIT to MessagePropertyIT Contributes to: event-integration/qp-planning#10774 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: attempt to fix e2es (#29) * feat: attempt to fix e2es Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Jonathan Hughes <jonathan.hughes@ibm.com> * feat: fixed tests Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Jonathan Hughes <jonathan.hughes@ibm.com> * feat: revert from arm64 image from tests Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Jonathan Hughes <jonathan.hughes@ibm.com> * fix: Update required version from 2.6.0 to 0.11.0 (#30) Contributes to: event-integration/qp-planning#0 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Update test to have meaning full variable names (#31) Contributes to: event-integration/qp-planning#0 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Co-authored-by: Joel Hanson <joel.hanson2@ibm.com> Co-authored-by: Nick Morgan <nicholas.morgan@ibm.com> Co-authored-by: Jonathan Hughes <Jonathan.Hughes@ibm.com> * fix: Update packaged licenses (#32) * fix: Update packaged licenses Update packaged licenses Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: Neeraj Laad <neeraj.laad@uk.ibm.com> Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com> * fix: Include license in pom.xml Include license in pom.xml Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com> * fix: Move license folder under META-INF Move license folder under META-INF Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com> * doc: fix license in readme (#33) fix license in readme Contributes to: event-integration/eventstreams-planning#11171 Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com> * Mq sink refactor (#35) * feat: MQ Sink Refactor Contributes to: event-integration/eventstreams-planning#0 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com * feat: Test cases fixed Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com * feat: Test cases updated Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com * feat: updated the import Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com * feat: added copyright header Contributes to: event-integration/eventstreams-planning#12532 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com * chore: remove commented-out code Signed-off-by: Dale Lane <dale.lane@uk.ibm.com> --------- Signed-off-by: Dale Lane <dale.lane@uk.ibm.com> Co-authored-by: Dale Lane <Dale.Lane@uk.ibm.com> * feat: support for writing to MQMD (#36) Contributes to: event-integration/eventstreams-planning#12432 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Update readme with appropriate mqmd info (#37) * feat: Update readme with appropriate mqmd info Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * Apply suggestions from code review Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Co-authored-by: Vignesh Kumar Elumalai <vigneshkumar.elumalai@ibm.com> * feat: rearrange order of docs in readme Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: copyright year change and readme case fix Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * change to note * remove specifically * Apply suggestions from code review --------- Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Co-authored-by: Vignesh Kumar Elumalai <vigneshkumar.elumalai@ibm.com> * feat: Update release to 2.1.0 (#40) Contributes to: event-integration/eventstreams-planning#12434 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: Automate release using travis (#39) Contributes to: event-integration/eventstreams-planning#12621 Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> * feat: updated Copyright year Contributes to: event-integration/eventstreams-planning#13003 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: updated version in pom xml Contributes to: event-integration/eventstreams-planning#13003 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: MQ Sink V2 OSS related changes Contributes to: event-integration/eventstreams-planning#13003 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com --------- Signed-off-by: Joel Hanson <joel.hanson2@ibm.com> Signed-off-by: neeraj-laad <neeraj.laad@uk.ibm.com> Signed-off-by: Dale Lane <dale.lane@uk.ibm.com> Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com Co-authored-by: Jonathan Hughes <Jonathan.Hughes@ibm.com> Co-authored-by: Joel Hanson <Joel.Hanson2@ibm.com> Co-authored-by: Joseph Vullo <Joseph.Vullo@ibm.com> Co-authored-by: Nick Morgan <nicholas.morgan@ibm.com> Co-authored-by: Neeraj Laad <neeraj.laad@uk.ibm.com> Co-authored-by: Priyanka K U <Priyanka.K.U@ibm.com> Co-authored-by: Dale Lane <Dale.Lane@uk.ibm.com> Co-authored-by: Vignesh Kumar Elumalai <vigneshkumar.elumalai@ibm.com>
1 parent 3bd3bdb commit a187590

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+4152
-1322
lines changed

.checkstyle/checkstyle.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,4 +140,8 @@
140140
<!-- Filter out Checkstyle warnings that have been suppressed with the @SuppressWarnings annotation -->
141141
<module name="SuppressWarningsFilter"/>
142142

143+
<!-- new line -->
144+
<module name="NewlineAtEndOfFile">
145+
<property name="lineSeparator" value="lf"/>
146+
</module>
143147
</module>

.checkstyle/intellij-checkstyle.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,4 +136,8 @@
136136
<!-- Filter out Checkstyle warnings that have been suppressed with the @SuppressWarnings annotation -->
137137
<module name="SuppressWarningsFilter"/>
138138

139+
<!-- new line -->
140+
<module name="NewlineAtEndOfFile">
141+
<property name="lineSeparator" value="lf"/>
142+
</module>
139143
</module>

.github/ISSUE_TEMPLATES/BUG_REPORT.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ body:
5757
label: Version
5858
description: What version of our software are you running?
5959
options:
60-
- 1.5.2 (Default)
61-
- 1.5.1
62-
- older (<1.5.1)
60+
- 2.2.0 (Default)
61+
- 1.5.2
62+
- older (<1.5.2)
6363
validations:
6464
required: true
6565
- type: textarea

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@ target/
1515
*.iws
1616

1717
# Visual Studio Code
18-
.vscode/
18+
.vscode/
19+
20+
mqjms.log.*

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Apache License
175175

176176
END OF TERMS AND CONDITIONS
177177

178-
Copyright 2017 IBM Corporation
178+
Copyright 2017, 2024 IBM Corporation
179179

180180
Licensed under the Apache License, Version 2.0 (the "License");
181181
you may not use this file except in compliance with the License.

README.md

Lines changed: 171 additions & 73 deletions
Large diffs are not rendered by default.

config/mq-sink-exactly-once.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"name": "mq-sink-exactly-once",
3+
"config":
4+
{
5+
"connector.class": "com.ibm.eventstreams.connect.mqsink.MQSinkConnector",
6+
"tasks.max": "1",
7+
"topics": "<TOPIC>",
8+
9+
"key.converter": "org.apache.kafka.connect.storage.StringConverter",
10+
"value.converter": "org.apache.kafka.connect.storage.StringConverter",
11+
12+
"mq.queue.manager": "<QUEUE_MANAGER>",
13+
"mq.connection.name.list": "<CONNECTION_NAME_LIST>",
14+
"mq.channel.name": "<CHANNEL_NAME>",
15+
"mq.queue": "<QUEUE>",
16+
"mq.message.builder": "com.ibm.eventstreams.connect.mqsink.builders.DefaultMessageBuilder",
17+
"mq.exactly.once.state.queue": "<EXACTLY_ONCE_STATE_QUEUE>"
18+
}
19+
}

config/mq-sink.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2017, 2020 IBM Corporation
1+
# Copyright 2017, 2020, 2023, 2024 IBM Corporation
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.

pom.xml

Lines changed: 65 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
* Copyright 2017, 2020 IBM Corporation
3+
* Copyright 2017, 2020, 2023, 2024 IBM Corporation
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
2020
<groupId>com.ibm.eventstreams.connect</groupId>
2121
<artifactId>kafka-connect-mq-sink</artifactId>
2222
<packaging>jar</packaging>
23-
<version>1.5.2</version>
23+
<version>2.2.0</version>
2424
<name>kafka-connect-mq-sink</name>
2525
<organization>
2626
<name>IBM Corporation</name>
@@ -30,13 +30,13 @@
3030
<description>
3131
A Kafka Connect connector for copying data from Apache Kafka into IBM MQ.
3232
</description>
33-
<licenses>
34-
<license>
35-
<name>Apache License 2.0</name>
36-
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
37-
<distribution>repo</distribution>
38-
</license>
39-
</licenses>
33+
<licenses>
34+
<license>
35+
<name>Apache License 2.0</name>
36+
<url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
37+
<distribution>repo</distribution>
38+
</license>
39+
</licenses>
4040
<properties>
4141
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4242
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -45,13 +45,13 @@
4545
<dependency>
4646
<groupId>org.apache.kafka</groupId>
4747
<artifactId>connect-api</artifactId>
48-
<version>3.4.0</version>
48+
<version>3.4.1</version>
4949
<scope>provided</scope>
5050
</dependency>
5151
<dependency>
5252
<groupId>org.apache.kafka</groupId>
5353
<artifactId>connect-json</artifactId>
54-
<version>3.4.0</version>
54+
<version>3.4.1</version>
5555
<scope>provided</scope>
5656
</dependency>
5757

@@ -74,7 +74,12 @@
7474
</dependency>
7575
<dependency>
7676
<groupId>org.slf4j</groupId>
77-
<artifactId>slf4j-log4j12</artifactId>
77+
<artifactId>slf4j-api</artifactId>
78+
<version>2.0.7</version>
79+
</dependency>
80+
<dependency>
81+
<groupId>org.slf4j</groupId>
82+
<artifactId>slf4j-simple</artifactId>
7883
<version>2.0.7</version>
7984
<scope>test</scope>
8085
</dependency>
@@ -84,13 +89,49 @@
8489
<dependency>
8590
<groupId>org.testcontainers</groupId>
8691
<artifactId>testcontainers</artifactId>
87-
<version>1.17.6</version>
92+
<version>1.17.2</version>
93+
<scope>test</scope>
94+
</dependency>
95+
96+
<dependency>
97+
<groupId>org.mockito</groupId>
98+
<artifactId>mockito-core</artifactId>
99+
<version>3.1.0</version>
100+
<scope>test</scope>
101+
</dependency>
102+
103+
<dependency>
104+
<groupId>org.assertj</groupId>
105+
<artifactId>assertj-core</artifactId>
106+
<version>3.24.2</version>
88107
<scope>test</scope>
89108
</dependency>
109+
110+
<dependency>
111+
<groupId>com.fasterxml.jackson.core</groupId>
112+
<artifactId>jackson-databind</artifactId>
113+
<version>2.14.3</version>
114+
</dependency>
115+
90116
</dependencies>
91117

92118
<build>
93119
<plugins>
120+
<plugin>
121+
<artifactId>maven-resources-plugin</artifactId>
122+
<version>3.3.1</version>
123+
<configuration>
124+
<outputDirectory>${project.build.outputDirectory}/META-INF</outputDirectory>
125+
<resources>
126+
<resource>
127+
<directory>${project.basedir}</directory>
128+
<includes>
129+
<include>LICENSE</include>
130+
</includes>
131+
</resource>
132+
</resources>
133+
</configuration>
134+
</plugin>
94135
<plugin>
95136
<artifactId>maven-compiler-plugin</artifactId>
96137
<version>3.1</version>
@@ -133,7 +174,7 @@
133174
</executions>
134175
</plugin>
135176

136-
<!-- build the release jar -->
177+
<!-- build the release jar -->
137178
<plugin>
138179
<artifactId>maven-assembly-plugin</artifactId>
139180
<version>3.1.1</version>
@@ -280,6 +321,15 @@
280321
</execution>
281322
</executions>
282323
</plugin>
324+
<plugin>
325+
<groupId>org.apache.maven.plugins</groupId>
326+
<artifactId>maven-surefire-plugin</artifactId>
327+
<version>3.1.0</version>
328+
<configuration>
329+
<reuseForks>false</reuseForks>
330+
<forkCount>1</forkCount>
331+
</configuration>
332+
</plugin>
283333
</plugins>
284334
</build>
285-
</project>
335+
</project>

src/assembly/package.xml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
* Copyright 2018 IBM Corporation
3+
* Copyright 2018, 2023, 2024 IBM Corporation
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
66
* you may not use this file except in compliance with the License.
@@ -23,12 +23,6 @@
2323
<format>jar</format>
2424
</formats>
2525
<includeBaseDirectory>false</includeBaseDirectory>
26-
<files>
27-
<file>
28-
<source>LICENSE</source>
29-
<outputDirectory></outputDirectory>
30-
</file>
31-
</files>
3226
<dependencySets>
3327
<dependencySet>
3428
<outputDirectory></outputDirectory>
@@ -37,6 +31,7 @@
3731
<excludes>
3832
<exclude>**/copyright-exclude</exclude>
3933
<exclude>META-INF/maven/**</exclude>
34+
<exclude>META-INF/LICENSE*</exclude>
4035
</excludes>
4136
</unpackOptions>
4237
<useTransitiveFiltering>true</useTransitiveFiltering>

0 commit comments

Comments
 (0)