Skip to content

Commit 55fb578

Browse files
Priyanka K UPriyanka K U
Priyanka K U
authored and
Priyanka K U
committed
feat: Addressing review comments
Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: updated versions in pom.xml Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: Addressing review comments Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: Addressing review comments Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com Updated BUG Report Template Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: updated copyright year 2024 Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: addressed the review comments and updated the version to 2.1.0 Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: updated the License folder Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com feat: Updated License and Travis for MQ 2.0.2 Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U Priyanka.k.u@ibm.com
1 parent 45acaa6 commit 55fb578

File tree

61 files changed

+578
-380
lines changed

Some content is hidden

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

61 files changed

+578
-380
lines changed

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ body:
5757
label: Version
5858
description: What version of our software are you running?
5959
options:
60-
- 2.0.0 (Default)
61-
- older (<2.0.0)
60+
- 2.1.0 (Default)
61+
- 1.3.5
62+
- older (<1.3.5)
6263
validations:
6364
required: true
6465
- type: textarea

.travis.yml

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,4 @@ language: java
33
services:
44
- docker
55

6-
stages:
7-
- name: test
8-
- name: build-and-deploy
9-
if: tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
10-
11-
jobs:
12-
include:
13-
- stage: test
14-
script:
15-
- mvn clean test verify
16-
17-
- stage: build-and-deploy
18-
script:
19-
- mvn help:evaluate -Dexpression=project.version -q -DforceStdout > version.txt
20-
- export VERSION=$(cat version.txt)
21-
- mvn package
22-
23-
deploy:
24-
provider: releases
25-
api_key:
26-
secure: "$GITHUB_TOKEN" # You need to encrypt your API key
27-
file_glob: true
28-
file: target/*.jar # Specifies the JAR files to deploy
29-
skip_cleanup: true
30-
on:
31-
tags: true # Only deploy on tagged commits
32-
name: "Release: $TRAVIS_TAG"
6+
script: mvn clean verify

Dockerfile

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,25 @@
1-
FROM strimzi/kafka:latest-kafka-2.6.0 as builder
1+
# This dockerfile expects Connector jars to have been built under a `connectors` directory
2+
#
3+
FROM alpine as builder
24

3-
FROM ibmjava:8-jre
5+
RUN apk update
6+
RUN apk --no-cache add curl
7+
8+
RUN curl -L "https://downloads.apache.org/kafka/3.6.2/kafka_2.12-3.6.2.tgz" -o kafka.tgz
9+
RUN mkdir /opt/kafka \
10+
&& tar -xf kafka.tgz -C /opt/kafka --strip-components=1
11+
12+
FROM ibmjava:11
413

514
RUN addgroup --gid 5000 --system esgroup && \
615
adduser --uid 5000 --ingroup esgroup --system esuser
716

817
COPY --chown=esuser:esgroup --from=builder /opt/kafka/bin/ /opt/kafka/bin/
918
COPY --chown=esuser:esgroup --from=builder /opt/kafka/libs/ /opt/kafka/libs/
10-
COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/connect-distributed.properties /opt/kafka/config/
11-
COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/connect-log4j.properties /opt/kafka/config/
19+
COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/ /opt/kafka/config/
1220
RUN mkdir /opt/kafka/logs && chown esuser:esgroup /opt/kafka/logs
13-
COPY --chown=esuser:esgroup target/kafka-connect-mq-source-2.0.0-jar-with-dependencies.jar /opt/kafka/libs/
21+
22+
COPY --chown=esuser:esgroup target/kafka-connect-*-jar-with-dependencies.jar /opt/connectors/
1423

1524
WORKDIR /opt/kafka
1625

LICENSE

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
Copyright 2017, 2024 IBM Corporation
179+
180+
Licensed under the Apache License, Version 2.0 (the "License");
181+
you may not use this file except in compliance with the License.
182+
You may obtain a copy of the License at
183+
184+
http://www.apache.org/licenses/LICENSE-2.0
185+
186+
Unless required by applicable law or agreed to in writing, software
187+
distributed under the License is distributed on an "AS IS" BASIS,
188+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
189+
See the License for the specific language governing permissions and
190+
limitations under the License.

LICENSES/CP4I/LA_en

-179 KB
Binary file not shown.

LICENSES/CP4I/LI_en

-47.2 KB
Binary file not shown.

LICENSES/CP4I/non_ibm_license

-2.33 MB
Binary file not shown.

LICENSES/CP4I/notices

-2.06 MB
Binary file not shown.

LICENSES/EVENT_AUTOMATION/LA_en

-97.5 KB
Binary file not shown.

LICENSES/EVENT_AUTOMATION/LI_en

-10.8 KB
Binary file not shown.
-71.8 KB
Binary file not shown.

LICENSES/EVENT_AUTOMATION/notices

-858 KB
Binary file not shown.

README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@ In some of these failure scenarios, it will be necessary for an MQ administrator
388388
### Connector in a `FAILED` state
389389

390390
If the connector experiences a non retriable error then a ConnectException will cause the connector to go in to a `FAILED` state. This will require a manual restart using the Kafka Connect REST API to restart the connector.
391+
391392
### Unable to connect to Kafka
392393

393394
You may receive an `org.apache.kafka.common.errors.SslAuthenticationException: SSL handshake failed` error when trying to run the MQ source connector using SSL to connect to your Kafka cluster. In the case that the error is caused by the following exception: `Caused by: java.security.cert.CertificateException: No subject alternative DNS name matching XXXXX found.`, Java may be replacing the IP address of your cluster with the corresponding hostname in your `/etc/hosts` file. For example, to push Docker images to a custom Docker repository, you may add an entry in this file which corresponds to the IP of your repository e.g. `123.456.78.90 mycluster.icp`. To fix this, you can comment out this line in your `/etc/hosts` file.
@@ -406,6 +407,16 @@ For issues relating specifically to this connector, please use the [GitHub issue
406407

407408
## License
408409

409-
Copyright 2017, 2020 IBM Corporation
410+
Copyright 2017, 2020, 2023, 2024 IBM Corporation
411+
412+
Licensed under the Apache License, Version 2.0 (the "License");
413+
you may not use this file except in compliance with the License.
414+
You may obtain a copy of the License at
415+
416+
<http://www.apache.org/licenses/LICENSE-2.0>
410417

411-
The IBM MQ source connector v2 is available under the IBM Event Automation license and IBM Cloud Pak for Integration license. Please see https://ibm.github.io/event-automation/support/licensing/ for further information.
418+
Unless required by applicable law or agreed to in writing, software
419+
distributed under the License is distributed on an "AS IS" BASIS,
420+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
421+
See the License for the specific language governing permissions and
422+
limitations under the License.The project is licensed under the Apache 2 license.

config/mq-source.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2017, 2020, 2023 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.

0 commit comments

Comments
 (0)