Skip to content

Commit 45acaa6

Browse files
Priyanka K UPriyanka K U
Priyanka K U
authored and
Priyanka K U
committed
Merge remote-tracking branch 'event-integration/kafka-connect-mq-source/main' into mqv2-ossrelease
2 parents 99fc0ff + c44624d commit 45acaa6

File tree

63 files changed

+5902
-1719
lines changed

Some content is hidden

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

63 files changed

+5902
-1719
lines changed

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

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

.gitignore

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

1717
# Visual Studio Code
18-
.vscode/
18+
.vscode/
19+
20+
mqjms.log.*
21+
/src/main/resources/simplelogger.properties
22+
.envrc

.travis.yml

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

6-
script: mvn clean verify
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"

Dockerfile

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

5-
RUN apk update
6-
RUN apk --no-cache add curl
7-
8-
RUN curl -L "https://downloads.apache.org/kafka/3.4.1/kafka_2.12-3.4.1.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
3+
FROM ibmjava:8-jre
134

145
RUN addgroup --gid 5000 --system esgroup && \
156
adduser --uid 5000 --ingroup esgroup --system esuser
167

178
COPY --chown=esuser:esgroup --from=builder /opt/kafka/bin/ /opt/kafka/bin/
189
COPY --chown=esuser:esgroup --from=builder /opt/kafka/libs/ /opt/kafka/libs/
19-
COPY --chown=esuser:esgroup --from=builder /opt/kafka/config/ /opt/kafka/config/
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/
2012
RUN mkdir /opt/kafka/logs && chown esuser:esgroup /opt/kafka/logs
21-
22-
COPY --chown=esuser:esgroup target/kafka-connect-*-jar-with-dependencies.jar /opt/connectors/
13+
COPY --chown=esuser:esgroup target/kafka-connect-mq-source-2.0.0-jar-with-dependencies.jar /opt/kafka/libs/
2314

2415
WORKDIR /opt/kafka
2516

2617
EXPOSE 8083
2718

2819
USER esuser
2920

30-
ENTRYPOINT ["./bin/connect-distributed.sh", "config/connect-distributed.properties"]
21+
ENTRYPOINT ["./bin/connect-distributed.sh", "config/connect-distributed.properties"]

LICENSE

Lines changed: 0 additions & 190 deletions
This file was deleted.

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.

0 commit comments

Comments
 (0)