diff --git a/build.gradle b/build.gradle index cb2554e..04b6c1e 100644 --- a/build.gradle +++ b/build.gradle @@ -135,6 +135,14 @@ subprojects { p -> } } } + + configurations.all { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + if (details.requested.name == 'lettuce-core' ) { + details.useVersion lettuceVersion + } + } + } } boolean hasTestsAt(File testDir) { diff --git a/core/redis-kafka-connect/redis-kafka-connect.gradle b/core/redis-kafka-connect/redis-kafka-connect.gradle index 23ec0a2..93f870a 100644 --- a/core/redis-kafka-connect/redis-kafka-connect.gradle +++ b/core/redis-kafka-connect/redis-kafka-connect.gradle @@ -21,7 +21,7 @@ dependencies { implementation 'org.apache.commons:commons-pool2' implementation 'org.slf4j:slf4j-api' compileOnly 'org.apache.kafka:connect-api' - compileOnly 'org.apache.kafka:connect-json' + compileOnly 'org.apache.kafka:connect-json' testImplementation 'org.apache.kafka:connect-api' testImplementation 'org.apache.kafka:connect-json' testImplementation 'org.awaitility:awaitility' @@ -42,17 +42,13 @@ eclipse { jar.finalizedBy shadowJar -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar -import java.time.LocalDateTime -import java.time.format.DateTimeFormatter - -tasks.named('shadowJar', ShadowJar) { +tasks.named('shadowJar', com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) { enableRelocation true relocationPrefix "com.redis.kafka.connect.shaded" } def archiveFilename = "redis-redis-kafka-connect" -def releaseDate = DateTimeFormatter.ISO_LOCAL_DATE.format(LocalDateTime.now()) +def releaseDate = java.time.format.DateTimeFormatter.ISO_LOCAL_DATE.format(java.time.LocalDateTime.now()) tasks.register('prepareConfluentArchive', Copy) { group = "Confluent" diff --git a/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSinkIntegrationTests.java b/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSinkIntegrationTests.java index afec459..974ba62 100644 --- a/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSinkIntegrationTests.java +++ b/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSinkIntegrationTests.java @@ -298,7 +298,7 @@ void putJSON() throws JsonProcessingException { } put(topic, RedisType.JSON, records); for (Person person : persons) { - String json = redisConnection.sync().jsonGet(topic + ":" + person.getId()); + String json = redisConnection.sync().jsonGet(topic + ":" + person.getId()).get(0).toString(); assertEquals(person, mapper.readValue(json, Person.class)); } } diff --git a/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSourceIntegrationTests.java b/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSourceIntegrationTests.java index 90944be..d66e9bd 100644 --- a/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSourceIntegrationTests.java +++ b/core/redis-kafka-connect/src/test/java/com/redis/kafka/connect/AbstractSourceIntegrationTests.java @@ -460,7 +460,7 @@ private Compare values(Struct struct) { case KeyValue.TYPE_HASH: return compare(commands.hgetall(key), struct.getMap(ToStructFunction.FIELD_HASH)); case KeyValue.TYPE_JSON: - return compare(commands.jsonGet(key, "."), struct.getString(ToStructFunction.FIELD_JSON)); + return compare(commands.jsonGet(key).get(0).toString(), struct.getString(ToStructFunction.FIELD_JSON)); case KeyValue.TYPE_LIST: return compare(commands.lrange(key, 0, -1), struct.getArray(ToStructFunction.FIELD_LIST)); case KeyValue.TYPE_SET: diff --git a/gradle.properties b/gradle.properties index 71bdafd..e64ec69 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ targetCompatibility = 17 reproducibleBuild = true asciidoctorVersion = 3.3.2 -bootPluginVersion = 3.3.5 +bootPluginVersion = 3.4.2 dependencyPluginVersion = 1.1.6 gitPluginVersion = 3.0.0 jacocoPluginVersion = 0.8.12 @@ -29,9 +29,10 @@ kordampBuildVersion = 3.4.0 kordampPluginVersion = 0.54.0 shadowPluginVersion = 8.1.8 -lettucemodVersion = 4.1.0 -springBatchRedisVersion = 4.5.1-SNAPSHOT -testcontainersRedisVersion = 2.2.2 +lettucemodVersion = 4.2.0 +lettuceVersion = 6.5.2.RELEASE +springBatchRedisVersion = 4.6.2 +testcontainersRedisVersion = 2.2.3 org.gradle.daemon = false org.gradle.caching = false