Skip to content

Commit

Permalink
build: Fixed dependency version clashes
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Ruaux committed Feb 9, 2023
1 parent a2879bd commit 90901a1
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
7 changes: 4 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,20 @@ jmhPluginVersion = 0.6.8

airliftVersion = 1.7
awaitilityVersion = 4.2.0
checkerVersion = 3.12.0
db2Version = 11.5.8.0
fakerVersion = 1.0.2
jacocoVersion = 0.8.8
jsqlparserVersion = 4.4
lettucemodVersion = 3.2.1
lettucemodVersion = 3.3.1
lettuceVersion = 6.2.2.RELEASE
micrometerRtsVersion = 0.3.3
micrometerRtsVersion = 0.3.4
mssqlVersion = 11.2.3.jre8
progressbarVersion = 0.9.3
snakeyaml.version = 1.26
testcontainersRedisVersion = 1.6.3
testcontainersVersion = 1.17.6
trinoVersion = 405
trinoVersion = 406

org.gradle.daemon = true
org.gradle.caching = true
Expand Down
2 changes: 1 addition & 1 deletion jreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ announce:
slack:
active: release
channel: '#field-engineering-announcements'
message: '👓 Redis Smart Cache {{projectVersion}} has been released! {{releaseNotesUrl}}'
message: '📈 Redis Smart Cache {{projectVersion}} has been released! {{releaseNotesUrl}}'

distributions:
redis-smart-cache-demo:
Expand Down
9 changes: 8 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,12 @@ projects {
}

enforce {
enabled = false
mergeStrategy = 'append'
rule(enforcer.rules.BanDuplicateClasses) { r ->
r.ignore('org.yaml.snakeyaml.*')
}
rule(enforcer.rules.ForceDependencies) { r ->
r.dependencies.addAll "org.checkerframework:checker-qual:$checkerVersion",
"com.redis:lettucemod:$lettucemodVersion"
}
}

0 comments on commit 90901a1

Please sign in to comment.