Skip to content

Commit afeae43

Browse files
meistermeiermeistermeier
authored
Upgrade Neo4j images to Neo4j version 5. (#623)
Remove the `kafka.bootstrap.servers` property because it would depend on the build in streams support. As a dependency of the upgrade, the password needs to be at least 8 characters long.
1 parent 1294daa commit afeae43

16 files changed

+19
-21
lines changed

‎kafka-connect-neo4j/config/sink-quickstart.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ errors.log.enable=true
99
errors.log.include.messages=true
1010
neo4j.server.uri=bolt://neo4j:7687
1111
neo4j.authentication.basic.username=neo4j
12-
neo4j.authentication.basic.password=connect
12+
neo4j.authentication.basic.password=kafkaconnect
1313
neo4j.encryption.enabled=false
1414
neo4j.topic.cypher.my-topic=MERGE (p:Person{name: event.name, surname: event.surname}) MERGE (f:Family{name: event.surname}) MERGE (p)-[:BELONGS_TO]->(f)

‎kafka-connect-neo4j/doc/contrib.sink.avro.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"errors.log.include.messages": true,
1111
"neo4j.server.uri": "bolt://neo4j:7687",
1212
"neo4j.authentication.basic.username": "neo4j",
13-
"neo4j.authentication.basic.password": "connect",
13+
"neo4j.authentication.basic.password": "kafkaconnect",
1414
"neo4j.encryption.enabled": false,
1515
"neo4j.topic.cypher.my-topic": "MERGE (p:Person{name: event.name, surname: event.surname, from: 'AVRO'}) MERGE (f:Family{name: event.surname}) MERGE (p)-[:BELONGS_TO]->(f)"
1616
}

‎kafka-connect-neo4j/doc/contrib.sink.string-json.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"errors.log.include.messages": true,
1414
"neo4j.server.uri": "bolt://neo4j:7687",
1515
"neo4j.authentication.basic.username": "neo4j",
16-
"neo4j.authentication.basic.password": "connect",
16+
"neo4j.authentication.basic.password": "kafkaconnect",
1717
"neo4j.encryption.enabled": false,
1818
"neo4j.topic.cypher.my-topic": "MERGE (p:Person{name: event.name, surname: event.surname, from: 'JSON'}) MERGE (f:Family{name: event.surname}) MERGE (p)-[:BELONGS_TO]->(f)"
1919
}

‎kafka-connect-neo4j/doc/contrib.source.avro.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"value.converter": "io.confluent.connect.avro.AvroConverter",
88
"neo4j.server.uri": "bolt://neo4j:7687",
99
"neo4j.authentication.basic.username": "neo4j",
10-
"neo4j.authentication.basic.password": "connect",
10+
"neo4j.authentication.basic.password": "kafkaconnect",
1111
"neo4j.encryption.enabled": false,
1212
"neo4j.streaming.poll.interval.msecs": 5000,
1313
"neo4j.streaming.property": "timestamp",

‎kafka-connect-neo4j/doc/contrib.source.string-json.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"value.converter": "org.apache.kafka.connect.json.JsonConverter",
88
"neo4j.server.uri": "bolt://neo4j:7687",
99
"neo4j.authentication.basic.username": "neo4j",
10-
"neo4j.authentication.basic.password": "connect",
10+
"neo4j.authentication.basic.password": "kafkaconnect",
1111
"neo4j.encryption.enabled": false,
1212
"neo4j.streaming.poll.interval.msecs": 5000,
1313
"neo4j.streaming.property": "timestamp",

‎kafka-connect-neo4j/doc/contrib.source.string.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"value.converter": "org.apache.kafka.connect.storage.StringConverter",
88
"neo4j.server.uri": "bolt://neo4j:7687",
99
"neo4j.authentication.basic.username": "neo4j",
10-
"neo4j.authentication.basic.password": "connect",
10+
"neo4j.authentication.basic.password": "kafkaconnect",
1111
"neo4j.encryption.enabled": false,
1212
"neo4j.streaming.poll.interval.msecs": 5000,
1313
"neo4j.streaming.property": "timestamp",

‎kafka-connect-neo4j/doc/docker-compose.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
version: '2'
33
services:
44
neo4j:
5-
image: neo4j:4.3-enterprise
5+
image: neo4j:5-enterprise
66
hostname: neo4j
77
container_name: neo4j
88
ports:
99
- "7474:7474"
1010
- "7687:7687"
1111
environment:
12-
NEO4J_kafka_bootstrap_servers: broker:9093
13-
NEO4J_AUTH: neo4j/connect
12+
NEO4J_AUTH: neo4j/kafkaconnect
1413
NEO4J_dbms_memory_heap_max__size: 8G
1514
NEO4J_ACCEPT_LICENSE_AGREEMENT: yes
1615

‎kafka-connect-neo4j/docker/contrib.sink.avro.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"errors.log.include.messages": true,
1212
"neo4j.server.uri": "bolt://neo4j:7687",
1313
"neo4j.authentication.basic.username": "neo4j",
14-
"neo4j.authentication.basic.password": "connect",
14+
"neo4j.authentication.basic.password": "kafkaconnect",
1515
"neo4j.encryption.enabled": false,
1616
"neo4j.topic.cypher.my-topic": "MERGE (p:Person{name: event.name, surname: event.surname}) MERGE (f:Family{name: event.surname}) MERGE (p)-[:BELONGS_TO]->(f)"
1717
}

‎kafka-connect-neo4j/docker/contrib.sink.string-json.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"errors.log.include.messages": true,
1515
"neo4j.server.uri": "bolt://neo4j:7687",
1616
"neo4j.authentication.basic.username": "neo4j",
17-
"neo4j.authentication.basic.password": "connect",
17+
"neo4j.authentication.basic.password": "kafkaconnect",
1818
"neo4j.encryption.enabled": false,
1919
"neo4j.topic.cypher.my-topic": "MERGE (p:Person{name: event.name, surname: event.surname}) MERGE (f:Family{name: event.surname}) MERGE (p)-[:BELONGS_TO]->(f)"
2020
}

‎kafka-connect-neo4j/docker/contrib.source.avro.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"value.converter.schema.registry.url": "http://schema_registry:8081",
1010
"neo4j.server.uri": "bolt://neo4j:7687",
1111
"neo4j.authentication.basic.username": "neo4j",
12-
"neo4j.authentication.basic.password": "connect",
12+
"neo4j.authentication.basic.password": "kafkaconnect",
1313
"neo4j.encryption.enabled": false,
1414
"neo4j.streaming.poll.interval.msecs": 5000,
1515
"neo4j.streaming.property": "timestamp",

‎kafka-connect-neo4j/docker/contrib.source.string-json.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"value.converter": "org.apache.kafka.connect.json.JsonConverter",
88
"neo4j.server.uri": "bolt://neo4j:7687",
99
"neo4j.authentication.basic.username": "neo4j",
10-
"neo4j.authentication.basic.password": "connect",
10+
"neo4j.authentication.basic.password": "kafkaconnect",
1111
"neo4j.encryption.enabled": false,
1212
"neo4j.streaming.poll.interval.msecs": 5000,
1313
"neo4j.streaming.property": "timestamp",

‎kafka-connect-neo4j/docker/contrib.source.string.neo4j.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"value.converter": "org.apache.kafka.connect.storage.StringConverter",
88
"neo4j.server.uri": "bolt://neo4j:7687",
99
"neo4j.authentication.basic.username": "neo4j",
10-
"neo4j.authentication.basic.password": "connect",
10+
"neo4j.authentication.basic.password": "kafkaconnect",
1111
"neo4j.encryption.enabled": false,
1212
"neo4j.streaming.poll.interval.msecs": 5000,
1313
"neo4j.streaming.property": "timestamp",

‎kafka-connect-neo4j/docker/docker-compose.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ version: '2'
33

44
services:
55
neo4j:
6-
image: neo4j:4.3-enterprise
6+
image: neo4j:5-enterprise
77
hostname: neo4j
88
container_name: neo4j
99
ports:
1010
- "7474:7474"
1111
- "7687:7687"
1212
environment:
13-
NEO4J_kafka_bootstrap_servers: broker:9093
14-
NEO4J_AUTH: neo4j/connect
13+
NEO4J_AUTH: neo4j/kafkaconnect
1514
NEO4J_dbms_memory_heap_max__size: 8G
1615
NEO4J_ACCEPT_LICENSE_AGREEMENT: 'yes'
1716

‎kafka-connect-neo4j/docker/readme.adoc

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ You can set the following configuration values via Confluent Connect UI, or via
1212
|{environment}.server.uri|String|The Bolt URI (default bolt://localhost:7687)
1313
|{environment}.authentication.type|enum[NONE, BASIC, KERBEROS]| The authentication type (default BASIC)
1414
|{environment}.batch.size|Int|The max number of events processed by the Cypher query (default 1000)
15-
|{environment}.batch.timeout.msecs|Long|The execution timeout for the cypher query (default 30000)
15+
|{environment}.batch.timeout.msecs|Long|The execution timeout for the Cypher query (default 30000)
1616
|{environment}.authentication.basic.username|String| The authentication username
1717
|{environment}.authentication.basic.password|String| The authentication password
1818
|{environment}.authentication.basic.realm|String| The authentication realm
@@ -37,7 +37,7 @@ Start the compose file
3737
docker-compose up -d
3838
----
3939

40-
You can access your Neo4j instance under: http://localhost:7474, log in with `neo4j` as username and `connect` as password (see the docker-compose file to change it).
40+
You can access your Neo4j instance under: http://localhost:7474, log in with `neo4j` as username and `kafkaconnect` as password (see the docker-compose file to change it).
4141

4242
===== Plugin installation
4343

‎kafka-connect-neo4j/src/main/resources/kafka-connect-neo4j.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ neo4j.server.uri=Type: String;\nDescription: The Bolt URI (default bolt://localh
1919
neo4j.authentication.type=Type: enum[NONE, BASIC, KERBEROS];\nDescription: The authentication type (default BASIC)
2020
neo4j.batch.size=Type: Int;\nDescription: The max number of events processed by the Cypher query for the Sink. \
2121
The max number of messages pushed for each poll cycle in case of the Source. (default 1000)
22-
neo4j.batch.timeout.msecs=Type: Long;\nDescription: The execution timeout for the cypher query (default: 0, that is without timeout)
22+
neo4j.batch.timeout.msecs=Type: Long;\nDescription: The execution timeout for the Cypher query (default: 0, that is without timeout)
2323
neo4j.authentication.basic.username=Type: String;\nDescription: The authentication username
2424
neo4j.authentication.basic.password=Type: String;\nDescription: The authentication password
2525
neo4j.authentication.basic.realm=Type: String;\nDescription: The authentication realm

‎test-support/src/main/kotlin/streams/Neo4jContainerExtension.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ private class DatabasesWaitStrategy(private val auth: AuthToken): AbstractWaitSt
5757
}
5858

5959
class Neo4jContainerExtension(dockerImage: String): Neo4jContainer<Neo4jContainerExtension>(dockerImage) {
60-
constructor(): this("neo4j:5.1-enterprise")
60+
constructor(): this("neo4j:5-enterprise")
6161
private val logger = LoggerFactory.getLogger(Neo4jContainerExtension::class.java)
6262
var driver: Driver? = null
6363
var session: Session? = null

0 commit comments

Comments
 (0)