Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Commit

Permalink
Merge pull request #783 from Netflix/fix_jedis_dependencies
Browse files Browse the repository at this point in the history
Fix versions of jedis transitive deps
  • Loading branch information
apanicker-nflx authored Sep 27, 2018
2 parents 8281b45 + 28996e6 commit 2c419cf
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
4 changes: 2 additions & 2 deletions redis-persistence/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ dependencies {
compile "redis.clients:jedis:${revJedis}"
compile "com.google.inject:guice:${revGuice}"
compile "com.netflix.dyno:dyno-core:${revDynoCore}"
compile "com.netflix.dyno:dyno-jedis:${revDynoJedis}"
compile "com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}"
compile ("com.netflix.dyno:dyno-jedis:${revDynoJedis}")
compile ("com.netflix.dyno-queues:dyno-queues-redis:${revDynoQueues}")

//In memory redis for unit testing
testCompile "org.rarefiedredis.redis:redis-java:${revRarefiedRedis}"
Expand Down
54 changes: 27 additions & 27 deletions redis-persistence/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -102,7 +102,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"compileClasspath": {
Expand Down Expand Up @@ -164,11 +164,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -208,7 +208,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"default": {
Expand Down Expand Up @@ -270,11 +270,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -314,7 +314,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"runtime": {
Expand Down Expand Up @@ -376,11 +376,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -420,7 +420,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"runtimeClasspath": {
Expand Down Expand Up @@ -482,11 +482,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -526,7 +526,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"testCompile": {
Expand Down Expand Up @@ -588,11 +588,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -644,7 +644,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -706,11 +706,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -762,7 +762,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"testRuntime": {
Expand Down Expand Up @@ -824,11 +824,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -880,7 +880,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
},
"testRuntimeClasspath": {
Expand Down Expand Up @@ -942,11 +942,11 @@
},
"com.netflix.dyno:dyno-core": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.dyno:dyno-jedis": {
"locked": "1.6.4",
"requested": "1.5.9"
"requested": "1.6.4"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -998,7 +998,7 @@
},
"redis.clients:jedis": {
"locked": "2.9.0",
"requested": "2.8.1"
"requested": "2.9.0"
}
}
}
6 changes: 3 additions & 3 deletions versionsOfDependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ ext {
revArchaius = '0.7.5'
revCommonsLang3 = '3.0'
revCommonsIo = '2.4'
revDynoCore = '1.5.9'
revDynoJedis = '1.5.9'
revDynoCore = '1.6.4'
revDynoJedis = '1.6.4'
revDynoQueues = '2.0.0-rc3'
revElasticSearch2 = '2.4.6'
revElasticSearch5 = '5.6.8'
Expand All @@ -23,7 +23,7 @@ ext {
revJaxrsJackson = '2.7.5'
revJacksonCore = '2.7.5'
revJacksonDatabind = '2.7.5'
revJedis = '2.8.1'
revJedis = '2.9.0'
revJerseyBundle = '1.19.1'
revJerseyClient = '1.19.4'
revJerseyGuice = '1.19.4'
Expand Down

0 comments on commit 2c419cf

Please sign in to comment.