feat: Addressing review comments

Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected] feat: updated versions in pom.xml Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected] feat: Addressing review comments Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected] feat: Addressing review comments Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected] Updated BUG Report Template Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected] feat: updated copyright year 2024 Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected] 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 [email protected] feat: updated the License folder Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected] feat: Updated License and Travis for MQ 2.0.2 Contributes to: event-integration/eventstreams-planning#12988 Signed-off-by: Priyanka.K.U [email protected]
ibm-messaging · Aug 7, 2024 · 55fb578 · 55fb578
1 parent 45acaa6
commit 55fb578
Show file tree

Hide file tree

Showing 61 changed files with 578 additions and 380 deletions.
diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.yml b/.github/ISSUE_TEMPLATE/BUG-REPORT.yml
@@ -57,8 +57,9 @@ body:
       label: Version
       description: What version of our software are you running?
       options:
-        - 2.0.0 (Default)
-        - older (<2.0.0)
+        - 2.1.0 (Default)
+        - 1.3.5 
+        - older (<1.3.5)
     validations:
       required: true
   - type: textarea

diff --git a/.travis.yml b/.travis.yml
@@ -3,30 +3,4 @@ language: java
 services:
   - docker
 
-stages:
-  - name: test
-  - name: build-and-deploy
-    if: tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
-
-jobs:
-  include:
-    - stage: test
-      script:
-        - mvn clean test verify
-
-    - stage: build-and-deploy
-      script:
-        - mvn help:evaluate -Dexpression=project.version -q -DforceStdout > version.txt
-        - export VERSION=$(cat version.txt)
-        - mvn package
-
-      deploy:
-        provider: releases
-        api_key:
-          secure: "$GITHUB_TOKEN" # You need to encrypt your API key
-        file_glob: true
-        file: target/*.jar # Specifies the JAR files to deploy
-        skip_cleanup: true
-        on:
-          tags: true # Only deploy on tagged commits
-        name: "Release: $TRAVIS_TAG"
+script: mvn clean verify
diff --git a/Dockerfile b/Dockerfile
@@ -1,16 +1,25 @@
-FROM strimzi/kafka:latest-kafka-2.6.0 as builder
+# This dockerfile expects Connector jars to have been built under a `connectors` directory
+#
+FROM alpine as builder
 
-FROM ibmjava:8-jre
+RUN apk update
+RUN apk --no-cache add curl
+
+RUN curl -L "https://downloads.apache.org/kafka/3.6.2/kafka_2.12-3.6.2.tgz" -o kafka.tgz
+RUN mkdir /opt/kafka \
+    && tar -xf kafka.tgz -C /opt/kafka --strip-components=1
+
+FROM ibmjava:11
 
 RUN addgroup --gid 5000 --system esgroup && \
     adduser --uid 5000 --ingroup esgroup --system esuser
 
 COPY --chown=esuser:esgroup --from=builder /opt/kafka/bin/ /opt/kafka/bin/
 COPY --chown=esuser:esgroup --from=builder /opt/kafka/libs/ /opt/kafka/libs/
-COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/connect-distributed.properties /opt/kafka/config/
-COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/connect-log4j.properties /opt/kafka/config/
+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-mq-source-2.0.0-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/LICENSE b/LICENSE
@@ -0,0 +1,190 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   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.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/LICENSES/CP4I/LA_en b/LICENSES/CP4I/LA_en
diff --git a/LICENSES/CP4I/LI_en b/LICENSES/CP4I/LI_en
diff --git a/LICENSES/CP4I/non_ibm_license b/LICENSES/CP4I/non_ibm_license
diff --git a/LICENSES/CP4I/notices b/LICENSES/CP4I/notices
diff --git a/LICENSES/EVENT_AUTOMATION/LA_en b/LICENSES/EVENT_AUTOMATION/LA_en
diff --git a/LICENSES/EVENT_AUTOMATION/LI_en b/LICENSES/EVENT_AUTOMATION/LI_en
diff --git a/LICENSES/EVENT_AUTOMATION/non_ibm_license b/LICENSES/EVENT_AUTOMATION/non_ibm_license
diff --git a/LICENSES/EVENT_AUTOMATION/notices b/LICENSES/EVENT_AUTOMATION/notices
diff --git a/README.md b/README.md
@@ -388,6 +388,7 @@ In some of these failure scenarios, it will be necessary for an MQ administrator
 ### Connector in a `FAILED` state
 
 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. 
+
 ### Unable to connect to Kafka
 
 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
 
 ## License
 
-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.
+You may obtain a copy of the License at
+
+<http://www.apache.org/licenses/LICENSE-2.0>
 
-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.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.The project is licensed under the Apache 2 license.
diff --git a/config/mq-source.properties b/config/mq-source.properties
@@ -1,4 +1,4 @@
-# Copyright 2017, 2020, 2023 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.