Skip to content

GitLab

C
conductor
Commit 1dd2a103 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Changed version of dyno-queues-redis due to decommissioned dependencies in bintray

parent 50679afe
Show whitespace changes
Inline Side-by-side
Showing with 256 additions and 0 deletions
Makefile
View file @ 1dd2a103
...@@ -11,6 +11,7 @@ conductor: conductor-config log4j-config conductor-service ...@@ -11,6 +11,7 @@ conductor: conductor-config log4j-config conductor-service
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-system_protoc.patch patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-system_protoc.patch
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-temporary_protoc-gen-grpc-java.patch patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-temporary_protoc-gen-grpc-java.patch
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-no-grpc-healthcheck.patch patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-no-grpc-healthcheck.patch
patch -Np1 -d conductor-mender-v2.2.0-1 < conductor-mender-v2.2.0-1-dependencies_fix.patch
dd if=/dev/zero of=swap bs=1048576 count=1024 dd if=/dev/zero of=swap bs=1048576 count=1024
chmod 600 swap chmod 600 swap
......
conductor-mender-v2.2.0-1-dependencies_fix.patch 0 → 100644
View file @ 1dd2a103
diff -uNr conductor-mender-v2.2.0-1/redis-persistence/dependencies.lock conductor-mender-v2.2.0-1-dependencies_fix/redis-persistence/dependencies.lock
--- conductor-mender-v2.2.0-1/redis-persistence/dependencies.lock 2019-03-04 21:50:40.000000000 +1030
+++ conductor-mender-v2.2.0-1-dependencies_fix/redis-persistence/dependencies.lock 2021-09-27 12:00:57.830379484 +0930
@@ -67,8 +67,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -189,8 +189,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -311,8 +311,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -443,8 +443,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -565,8 +565,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -687,8 +687,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -817,8 +817,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -947,8 +947,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
@@ -1077,8 +1077,8 @@
"project": true
},
"com.netflix.dyno-queues:dyno-queues-redis": {
- "locked": "2.0.0-rc4",
- "requested": "2.0.0-rc4"
+ "locked": "2.0.0-rc5",
+ "requested": "2.0.0-rc5"
},
"com.netflix.servo:servo-core": {
"firstLevelTransitive": [
diff -uNr conductor-mender-v2.2.0-1/server/dependencies.lock conductor-mender-v2.2.0-1-dependencies_fix/server/dependencies.lock
--- conductor-mender-v2.2.0-1/server/dependencies.lock 2019-03-04 21:50:40.000000000 +1030
+++ conductor-mender-v2.2.0-1-dependencies_fix/server/dependencies.lock 2021-09-27 12:00:32.991311986 +0930
@@ -126,7 +126,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -475,7 +475,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -824,7 +824,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -1173,7 +1173,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -1592,7 +1592,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -1941,7 +1941,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -2290,7 +2290,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -2639,7 +2639,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -2996,7 +2996,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -3353,7 +3353,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
@@ -3710,7 +3710,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.runtime:health-api": {
"firstLevelTransitive": [
diff -uNr conductor-mender-v2.2.0-1/test-harness/dependencies.lock conductor-mender-v2.2.0-1-dependencies_fix/test-harness/dependencies.lock
--- conductor-mender-v2.2.0-1/test-harness/dependencies.lock 2019-03-04 21:50:40.000000000 +1030
+++ conductor-mender-v2.2.0-1-dependencies_fix/test-harness/dependencies.lock 2021-09-27 12:01:16.209429428 +0930
@@ -193,7 +193,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.eureka:eureka-client": {
"firstLevelTransitive": [
@@ -644,7 +644,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.eureka:eureka-client": {
"firstLevelTransitive": [
@@ -1095,7 +1095,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.eureka:eureka-client": {
"firstLevelTransitive": [
@@ -1546,7 +1546,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-redis-persistence"
],
- "locked": "2.0.0-rc4"
+ "locked": "2.0.0-rc5"
},
"com.netflix.eureka:eureka-client": {
"firstLevelTransitive": [
diff -uNr conductor-mender-v2.2.0-1/versionsOfDependencies.gradle conductor-mender-v2.2.0-1-dependencies_fix/versionsOfDependencies.gradle
--- conductor-mender-v2.2.0-1/versionsOfDependencies.gradle 2019-03-04 21:50:40.000000000 +1030
+++ conductor-mender-v2.2.0-1-dependencies_fix/versionsOfDependencies.gradle 2021-09-27 12:00:06.312239493 +0930
@@ -7,7 +7,7 @@
revArchaius = '0.7.5'
revCommonsLang3 = '3.0'
revCommonsIo = '2.4'
- revDynoQueues = '2.0.0-rc4'
+ revDynoQueues = '2.0.0-rc5'
revElasticSearch5 = '5.6.8'
revElasticSearch5Client = '5.6.8'
revEurekaClient = '1.8.7'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment