Skip to content

Commit

Permalink
deps: Upgraded spring-batch-redis
Browse files Browse the repository at this point in the history
  • Loading branch information
jruaux committed Feb 11, 2025
1 parent 8d8b758 commit 83e3128
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 13 deletions.
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
10 changes: 3 additions & 7 deletions core/redis-kafka-connect/redis-kafka-connect.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
9 changes: 5 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@ 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
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
Expand Down

0 comments on commit 83e3128

Please sign in to comment.