Skip to content

Commit

Permalink
Add dependencies and generate locks
Browse files Browse the repository at this point in the history
  • Loading branch information
LuisLainez committed Nov 29, 2023
1 parent d94052a commit 55bdac3
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions redis-concurrency-limit/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {

implementation project(':conductor-common')
implementation project(':conductor-core')
implementation "redis.clients:jedis:${revJedis}" // Jedis version "revJedis=3.3.0" does not play well with Spring Data Redis
implementation "redis.clients:jedis:3.6.0" // Jedis version "revJedis=3.3.0" does not play well with Spring Data Redis
implementation "org.apache.commons:commons-lang3"

testImplementation "org.apache.groovy:groovy-all:${revGroovy}"
Expand All @@ -17,5 +17,5 @@ dependencies {
testImplementation "org.testcontainers:spock:${revTestContainer}"
testImplementation "org.testcontainers:testcontainers:${revTestContainer}"
testImplementation "com.google.protobuf:protobuf-java:${revProtoBuf}"
testImplementation 'org.springframework.data:spring-data-redis'
testImplementation 'org.springframework.data:spring-data-redis:2.7.16' //This is a need now - will need to upgrade to Spring 3
}
4 changes: 2 additions & 2 deletions redis-concurrency-limit/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
"locked": "3.1.5"
},
"org.springframework.data:spring-data-redis": {
"locked": "3.1.5"
"locked": "2.7.16"
},
"org.testcontainers:spock": {
"locked": "1.18.3"
Expand Down Expand Up @@ -453,7 +453,7 @@
"locked": "3.1.5"
},
"org.springframework.data:spring-data-redis": {
"locked": "3.1.5"
"locked": "2.7.16"
},
"org.testcontainers:spock": {
"locked": "1.18.3"
Expand Down
8 changes: 4 additions & 4 deletions redis-persistence/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"locked": "3.1.5"
},
"redis.clients:jedis": {
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"runtimeClasspath": {
Expand Down Expand Up @@ -215,7 +215,7 @@
"locked": "2.0.9"
},
"redis.clients:jedis": {
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -262,7 +262,7 @@
"locked": "3.1.5"
},
"redis.clients:jedis": {
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"testRuntimeClasspath": {
Expand Down Expand Up @@ -450,7 +450,7 @@
"locked": "3.1.5"
},
"redis.clients:jedis": {
"locked": "3.3.0"
"locked": "3.6.0"
}
}
}
10 changes: 5 additions & 5 deletions server/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"locked": "2.0.4"
},
"redis.clients:jedis": {
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"productionRuntimeClasspath": {
Expand Down Expand Up @@ -547,7 +547,7 @@
"com.netflix.conductor:conductor-redis-concurrency-limit",
"com.netflix.conductor:conductor-redis-persistence"
],
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"runtimeClasspath": {
Expand Down Expand Up @@ -1013,7 +1013,7 @@
"com.netflix.conductor:conductor-redis-concurrency-limit",
"com.netflix.conductor:conductor-redis-persistence"
],
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"testCompileClasspath": {
Expand Down Expand Up @@ -1117,7 +1117,7 @@
"locked": "2.0.4"
},
"redis.clients:jedis": {
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"testRuntimeClasspath": {
Expand Down Expand Up @@ -1595,7 +1595,7 @@
"com.netflix.conductor:conductor-redis-concurrency-limit",
"com.netflix.conductor:conductor-redis-persistence"
],
"locked": "3.3.0"
"locked": "3.6.0"
}
}
}
4 changes: 2 additions & 2 deletions test-harness/dependencies.lock
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
"locked": "1.18.3"
},
"redis.clients:jedis": {
"locked": "3.3.0"
"locked": "3.6.0"
}
},
"testRuntimeClasspath": {
Expand Down Expand Up @@ -779,7 +779,7 @@
"com.netflix.conductor:conductor-redis-persistence",
"com.netflix.conductor:conductor-server"
],
"locked": "3.3.0"
"locked": "3.6.0"
}
}
}

0 comments on commit 55bdac3

Please sign in to comment.