Skip to content

Commit bdf0fde

Browse files
AGRG-IPA-070AGRG-IPA-070
authored
Merge pull request #21 from ipa-digitools/dev
Dev
2 parents b133f85 + 77bcbd8 commit bdf0fde

File tree

8 files changed

+38
-33
lines changed

8 files changed

+38
-33
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
.idea
22
target
33
!target/*jar-with-dependencies.jar
4+
/target

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM openjdk:8u181-jdk-slim
1+
FROM openjdk:8u312-jdk-slim
22

33
ENV SERVER_INSTALL_FOLDER=/app/kafka-mqtt-connector/
4-
ENV JAR_FILE_NAME=simple_kafka_mqtt_connector-0.0.1-SNAPSHOT-jar-with-dependencies.jar
4+
ENV JAR_FILE_NAME=simple_kafka_mqtt_connector-0.1.0-jar-with-dependencies.jar
55

66
# Application propertis
7-
ENV KAFKA_HOST=localhostss
7+
ENV KAFKA_HOST=localhosts
88
ENV KAFKA_PORT=9092
99
ENV KAFKA_CLIENT_ID=testing-kafka-producer-1
1010

‎docker-compose/fullstack/docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '2'
33
services:
44

55
simple-kafka-mqtt-connector:
6-
image: arthurgrigo/simple-kafka-mqtt-connector:0.0.1-SNAPSHOT
6+
image: arthurgrigo/simple-kafka-mqtt-connector:0.1.0
77
restart: always
88
hostname: simple-kafka-mqtt-connector
99
container_name: simple-kafka-mqtt-connector
@@ -13,7 +13,7 @@ services:
1313
- kafka_mqtt_network
1414

1515
mosquitto:
16-
image: eclipse-mosquitto:1.5.5
16+
image: eclipse-mosquitto:2.0.14
1717
restart: always
1818
hostname: mosquitto
1919
container_name: mosquitto
@@ -38,7 +38,7 @@ services:
3838
- kafka_mqtt_network
3939

4040
kafka:
41-
image: wurstmeister/kafka:2.11-2.0.0
41+
image: wurstmeister/kafka:2.13-2.8.1
4242
restart: always
4343
hostname: kafka
4444
container_name: kafka

‎docker-compose/standalone/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: '2'
33
services:
44

55
simple-kafka-mqtt-connector:
6-
image: arthurgrigo/simple-kafka-mqtt-connector:0.0.1-SNAPSHOT
6+
image: arthurgrigo/simple-kafka-mqtt-connector:0.1.0
77
restart: always
88
hostname: simple-kafka-mqtt-connector
99
container_name: simple-kafka-mqtt-connector

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>de.fhg.ipa.null70</groupId>
88
<artifactId>simple_kafka_mqtt_connector</artifactId>
9-
<version>0.0.1-SNAPSHOT</version>
9+
<version>0.1.0</version>
1010
<packaging>jar</packaging>
1111

1212
<description>
@@ -79,26 +79,26 @@
7979
<dependency>
8080
<groupId>org.eclipse.paho</groupId>
8181
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
82-
<version>1.2.1</version>
82+
<version>1.2.5</version>
8383
</dependency>
8484

8585
<!-- Apache Kafka Clients-->
8686
<dependency>
8787
<groupId>org.apache.kafka</groupId>
8888
<artifactId>kafka-clients</artifactId>
89-
<version>2.2.0</version>
89+
<version>2.8.1</version>
9090
</dependency>
9191
<!-- Apache Kafka Streams-->
9292
<dependency>
9393
<groupId>org.apache.kafka</groupId>
9494
<artifactId>kafka-streams</artifactId>
95-
<version>2.2.0</version>
96-
</dependency>
95+
<version>2.8.1</version>
96+
</dependency>
9797
<!-- Apache Log4J2 binding for SLF4J -->
9898
<dependency>
9999
<groupId>org.apache.logging.log4j</groupId>
100100
<artifactId>log4j-slf4j-impl</artifactId>
101-
<version>2.11.0</version>
101+
<version>2.17.0</version>
102102
</dependency>
103103

104104
<!-- JUnit5 Jupiter -->

‎simple_kafka_mqtt_connector.iml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
<orderEntry type="library" name="Maven: commons-configuration:commons-configuration:1.10" level="project" />
1515
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
1616
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
17-
<orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.1" level="project" />
18-
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.2.0" level="project" />
19-
<orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.3.8-1" level="project" />
20-
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.5.0" level="project" />
21-
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.7.2" level="project" />
22-
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.25" level="project" />
23-
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-streams:2.2.0" level="project" />
24-
<orderEntry type="library" name="Maven: org.apache.kafka:connect-json:2.2.0" level="project" />
25-
<orderEntry type="library" name="Maven: org.apache.kafka:connect-api:2.2.0" level="project" />
26-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8" level="project" />
27-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0" level="project" />
28-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.9.8" level="project" />
29-
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8" level="project" />
30-
<orderEntry type="library" name="Maven: org.rocksdb:rocksdbjni:5.15.10" level="project" />
31-
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.11.0" level="project" />
32-
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.11.0" level="project" />
33-
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-core:2.11.0" level="project" />
17+
<orderEntry type="library" name="Maven: org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5" level="project" />
18+
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-clients:2.8.1" level="project" />
19+
<orderEntry type="library" name="Maven: com.github.luben:zstd-jni:1.4.9-1" level="project" />
20+
<orderEntry type="library" name="Maven: org.lz4:lz4-java:1.7.1" level="project" />
21+
<orderEntry type="library" name="Maven: org.xerial.snappy:snappy-java:1.1.8.1" level="project" />
22+
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
23+
<orderEntry type="library" name="Maven: org.apache.kafka:kafka-streams:2.8.1" level="project" />
24+
<orderEntry type="library" name="Maven: org.apache.kafka:connect-json:2.8.1" level="project" />
25+
<orderEntry type="library" name="Maven: org.apache.kafka:connect-api:2.8.1" level="project" />
26+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.10.5.1" level="project" />
27+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.10.5" level="project" />
28+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.10.5" level="project" />
29+
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.10.5" level="project" />
30+
<orderEntry type="library" name="Maven: org.rocksdb:rocksdbjni:5.18.4" level="project" />
31+
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.17.0" level="project" />
32+
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.17.0" level="project" />
33+
<orderEntry type="library" scope="RUNTIME" name="Maven: org.apache.logging.log4j:log4j-core:2.17.0" level="project" />
3434
<orderEntry type="library" scope="TEST" name="Maven: org.junit.jupiter:junit-jupiter-api:5.3.1" level="project" />
3535
<orderEntry type="library" scope="TEST" name="Maven: org.apiguardian:apiguardian-api:1.0.0" level="project" />
3636
<orderEntry type="library" scope="TEST" name="Maven: org.opentest4j:opentest4j:1.1.1" level="project" />

‎src/main/resources/application.properties‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
kafka.host=localhost
1+
kafka.host=192.168.56.102
2+
#kafka.host=localhost
3+
24
kafka.port=9092
35
kafka.client.id=testing-kafka-producer-1
46

5-
mqtt.host=localhost
7+
mqtt.host=192.168.56.102
8+
#mqtt.host=localhost
69
mqtt.port=1883
710
mqtt.client.id=mqtt-client-1
811
mqtt.qos=2
912

10-
topic.mapping=robotgroup001/robot001>>>test;robotgroup001/robot002>>>test02;robotgroup001/robot003>>>test03
13+
topic.mapping=robotgroup001/robot001>>>test;robotgroup001/robot002>>>test02;robotgroup001/robot003>>>test03
14+

‎target/simple_kafka_mqtt_connector-0.0.1-SNAPSHOT-jar-with-dependencies.jar‎

-27.8 MB
Binary file not shown.

0 commit comments

Comments
 (0)