Skip to content

Commit b2b1b76

Browse files
ali-incefbiville
ali-ince
and
fbiville
authored
Upgrade dependencies (#595)
* Upgrade dependencies * upgrade neo4j container image * Upgrade kafka versions used in tests * Revert to jackson 2.14 Signed-off-by: Ali Ince <[email protected]> --------- Signed-off-by: Ali Ince <[email protected]> Co-authored-by: Florent Biville <[email protected]>
1 parent 9eb8140 commit b2b1b76

File tree

7 files changed

+43
-69
lines changed

7 files changed

+43
-69
lines changed

‎consumer/src/test/kotlin/integrations/kafka/KafkaEventSinkNoTopicAutocreationIT.kt‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@ import org.neo4j.function.ThrowingSupplier
1313
import org.neo4j.test.rule.ImpermanentDbmsRule
1414
import org.testcontainers.containers.KafkaContainer
1515
import org.testcontainers.containers.Network
16-
import streams.KafkaTestUtils
16+
import streams.*
1717
import streams.extensions.execute
18-
import streams.setConfig
19-
import streams.shutdownSilently
20-
import streams.start
2118
import streams.utils.JSONUtils
2219
import streams.utils.StreamsUtils
2320
import java.util.UUID
@@ -26,19 +23,7 @@ import kotlin.test.assertTrue
2623

2724
class KafkaEventSinkNoTopicAutoCreationIT {
2825
companion object {
29-
/**
30-
* Kafka TestContainers uses Confluent OSS images.
31-
* We need to keep in mind which is the right Confluent Platform version for the Kafka version this project uses
32-
*
33-
* Confluent Platform | Apache Kafka
34-
* |
35-
* 4.0.x | 1.0.x
36-
* 4.1.x | 1.1.x
37-
* 5.0.x | 2.0.x
38-
*
39-
* Please see also https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility
40-
*/
41-
private const val confluentPlatformVersion = "4.0.2"
26+
private const val confluentPlatformVersion = KafkaVersion.CURRENT
4227
@JvmStatic
4328
lateinit var kafka: KafkaContainer
4429

‎consumer/src/test/kotlin/integrations/kafka/KafkaEventSinkSuiteIT.kt‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.junit.runner.RunWith
88
import org.junit.runners.Suite
99
import org.testcontainers.containers.KafkaContainer
1010
import org.testcontainers.containers.Network
11+
import streams.KafkaVersion
1112
import streams.MavenUtils
1213
import streams.utils.StreamsUtils
1314

@@ -26,21 +27,7 @@ import streams.utils.StreamsUtils
2627
)
2728
class KafkaEventSinkSuiteIT {
2829
companion object {
29-
/**
30-
* Kafka TestContainers uses Confluent OSS images.
31-
* We need to keep in mind which is the right Confluent Platform version for the Kafka version this project uses
32-
*
33-
* Confluent Platform | Apache Kafka
34-
* |
35-
* 4.0.x | 1.0.x
36-
* 4.1.x | 1.1.x
37-
* 5.0.x | 2.0.x
38-
* 7.4.X | 3.4.x (We are currently using 3.5.1 which is backward compatible)
39-
*
40-
* Please see also https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility
41-
*/
42-
// private const val confluentPlatformVersion = "4.0.2"
43-
private const val confluentPlatformVersion = "5.3.1-1"
30+
private const val confluentPlatformVersion = KafkaVersion.CURRENT
4431
@JvmStatic lateinit var kafka: KafkaContainer
4532
@JvmStatic lateinit var schemaRegistry: SchemaRegistryContainer
4633

‎pom.xml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,22 @@
5151
<properties>
5252
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5353
<java.version>1.8</java.version>
54-
<kotlin.version>1.6.10</kotlin.version>
55-
<kotlin.coroutines.version>1.6.0</kotlin.coroutines.version>
54+
<kotlin.version>1.9.10</kotlin.version>
55+
<kotlin.coroutines.version>1.7.3</kotlin.coroutines.version>
5656
<neo4j.version>4.4.25</neo4j.version>
5757
<kafka.version>2.6.3</kafka.version>
58+
<!-- Keep it at 2.14 as future versions cause problems with neo4j procedure framework -->
5859
<jackson.version>2.14.3</jackson.version>
5960
<kotlin.compiler.incremental>true</kotlin.compiler.incremental>
60-
<neo4j.java.driver.version>4.4.2</neo4j.java.driver.version>
61-
<testcontainers.version>1.18.3</testcontainers.version>
62-
<avro.version>1.11.2</avro.version>
63-
<mokito.version>3.3.0</mokito.version>
61+
<neo4j.java.driver.version>4.4.12</neo4j.java.driver.version>
62+
<testcontainers.version>1.19.1</testcontainers.version>
63+
<avro.version>1.11.3</avro.version>
64+
<mokito.version>5.6.0</mokito.version>
6465
<junit.version>4.13.2</junit.version>
65-
<kafka.avro.serializer.version>7.4.0</kafka.avro.serializer.version>
66-
<junit-jupiter.version>5.7.1</junit-jupiter.version>
66+
<kafka.avro.serializer.version>7.5.1</kafka.avro.serializer.version>
67+
<junit-jupiter.version>5.10.0</junit-jupiter.version>
6768
<hamcrest.version>1.3</hamcrest.version>
68-
<neo4j.configuration-lifecycle.version>ad59084711</neo4j.configuration-lifecycle.version>
69+
<neo4j.configuration-lifecycle.version>1.1.0</neo4j.configuration-lifecycle.version>
6970
</properties>
7071

7172
<organization>

‎producer/src/test/kotlin/streams/integrations/KafkaEventRouterNoTopicAutocreationIT.kt‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import org.testcontainers.containers.Network
1515
import streams.extensions.execute
1616
import streams.kafka.KafkaConfiguration
1717
import streams.KafkaTestUtils
18+
import streams.KafkaVersion
1819
import streams.setConfig
1920
import streams.start
2021
import streams.utils.StreamsUtils
@@ -24,19 +25,7 @@ import kotlin.test.assertEquals
2425
class KafkaEventRouterNoTopicAutocreationIT {
2526

2627
companion object {
27-
/**
28-
* Kafka TestContainers uses Confluent OSS images.
29-
* We need to keep in mind which is the right Confluent Platform version for the Kafka version this project uses
30-
*
31-
* Confluent Platform | Apache Kafka
32-
* |
33-
* 4.0.x | 1.0.x
34-
* 4.1.x | 1.1.x
35-
* 5.0.x | 2.0.x
36-
*
37-
* Please see also https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility
38-
*/
39-
private const val confluentPlatformVersion = "4.0.2"
28+
private const val confluentPlatformVersion = KafkaVersion.CURRENT
4029
@JvmStatic
4130
lateinit var kafka: KafkaContainer
4231

‎producer/src/test/kotlin/streams/integrations/KafkaEventRouterSuiteIT.kt‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import org.neo4j.kernel.api.procedure.GlobalProcedures
99
import org.neo4j.kernel.internal.GraphDatabaseAPI
1010
import org.testcontainers.containers.KafkaContainer
1111
import org.testcontainers.containers.Network
12+
import streams.KafkaVersion
1213
import streams.procedures.StreamsProcedures
1314
import streams.utils.StreamsUtils
1415

@@ -23,20 +24,7 @@ import streams.utils.StreamsUtils
2324
class KafkaEventRouterSuiteIT {
2425

2526
companion object {
26-
/**
27-
* Kafka TestContainers uses Confluent OSS images.
28-
* We need to keep in mind which is the right Confluent Platform version for the Kafka version this project uses
29-
*
30-
* Confluent Platform | Apache Kafka
31-
* |
32-
* 4.0.x | 1.0.x
33-
* 4.1.x | 1.1.x
34-
* 5.0.x | 2.0.x
35-
* 7.4.x | 3.4.x (We are currently using 3.5.1 which is backward compatible)
36-
*
37-
* Please see also https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility
38-
*/
39-
private const val confluentPlatformVersion = "5.3.1-1"
27+
private const val confluentPlatformVersion = KafkaVersion.CURRENT
4028
@JvmStatic
4129
lateinit var kafka: KafkaContainer
4230

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package streams
2+
3+
object KafkaVersion {
4+
/**
5+
* Kafka TestContainers uses Confluent OSS images.
6+
* We need to keep in mind which is the right Confluent Platform version for the Kafka version this project uses
7+
*
8+
* Confluent Platform | Apache Kafka
9+
* |
10+
* 6.0.x | 2.6.x
11+
* 6.1.x | 2.7.x
12+
* 6.2.x | 2.8.x
13+
* 7.0.x | 3.0.x
14+
* 7.1.x | 3.1.x
15+
* 7.2.x | 3.2.x
16+
* 7.3.x | 3.3.x
17+
* 7.4.x | 3.4.x
18+
* 7.5.x | 3.5.x
19+
*
20+
* Please see also https://docs.confluent.io/current/installation/versions-interoperability.html#cp-and-apache-kafka-compatibility
21+
*/
22+
23+
const val CURRENT = "6.0.15"
24+
}

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

Lines changed: 1 addition & 1 deletion
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:4.4.23-enterprise")
60+
constructor(): this("neo4j:4.4.25-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)