Skip to content

Commit 2978701

Browse files
v1r3nv1r3n
authored
Merge pull request #11 from Young-Zen/fix-elasticsearch-dependency
Fix elasticsearch dependency error
2 parents f2ee41a + 922f528 commit 2978701

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

‎dependencies.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ext {
2424
revCassandraUnit = '3.11.2.0'
2525
revCommonsIo = '2.7'
2626
revDynoQueues = '2.0.20'
27-
revElasticSearch6 = '6.8.12'
27+
revElasticSearch6 = '6.8.23'
2828
revEmbeddedRedis = '0.6'
2929
revEurekaClient = '1.10.10'
3030
revGroovy = '4.0.9'

‎es6-persistence/dependencies.lock‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
"locked": "2.20.0"
3737
},
3838
"org.elasticsearch.client:elasticsearch-rest-client": {
39-
"locked": "6.8.12"
39+
"locked": "6.8.23"
4040
},
4141
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
42-
"locked": "6.8.12"
42+
"locked": "6.8.23"
4343
},
4444
"org.elasticsearch.client:transport": {
45-
"locked": "6.8.12"
45+
"locked": "6.8.23"
4646
},
4747
"org.springframework.boot:spring-boot-starter": {
4848
"locked": "3.1.4"
@@ -206,13 +206,13 @@
206206
"locked": "2.20.0"
207207
},
208208
"org.elasticsearch.client:elasticsearch-rest-client": {
209-
"locked": "6.8.12"
209+
"locked": "6.8.23"
210210
},
211211
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
212-
"locked": "6.8.12"
212+
"locked": "6.8.23"
213213
},
214214
"org.elasticsearch.client:transport": {
215-
"locked": "6.8.12"
215+
"locked": "6.8.23"
216216
},
217217
"org.openjdk.nashorn:nashorn-core": {
218218
"firstLevelTransitive": [
@@ -259,13 +259,13 @@
259259
"locked": "3.1.6"
260260
},
261261
"org.elasticsearch.client:elasticsearch-rest-client": {
262-
"locked": "6.8.12"
262+
"locked": "6.8.23"
263263
},
264264
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
265-
"locked": "6.8.12"
265+
"locked": "6.8.23"
266266
},
267267
"org.elasticsearch.client:transport": {
268-
"locked": "6.8.12"
268+
"locked": "6.8.23"
269269
},
270270
"org.junit.vintage:junit-vintage-engine": {
271271
"locked": "5.9.3"
@@ -444,13 +444,13 @@
444444
"locked": "3.1.6"
445445
},
446446
"org.elasticsearch.client:elasticsearch-rest-client": {
447-
"locked": "6.8.12"
447+
"locked": "6.8.23"
448448
},
449449
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
450-
"locked": "6.8.12"
450+
"locked": "6.8.23"
451451
},
452452
"org.elasticsearch.client:transport": {
453-
"locked": "6.8.12"
453+
"locked": "6.8.23"
454454
},
455455
"org.junit.vintage:junit-vintage-engine": {
456456
"locked": "5.9.3"

‎es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public ElasticSearchProperties elasticSearchProperties() {
5151
new ElasticsearchContainer(
5252
DockerImageName.parse(
5353
"docker.elastic.co/elasticsearch/elasticsearch-oss")
54-
.withTag("6.8.17")) // this should match the client version
54+
.withTag("6.8.23")) // this should match the client version
5555
// Resolve issue with es container not starting on m1/m2 macs
5656
.withEnv(Map.of("bootstrap.system_call_filter", "false"));
5757

‎server/dependencies.lock‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -474,19 +474,19 @@
474474
"firstLevelTransitive": [
475475
"com.netflix.conductor:conductor-es6-persistence"
476476
],
477-
"locked": "8.7.1"
477+
"locked": "6.8.23"
478478
},
479479
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
480480
"firstLevelTransitive": [
481481
"com.netflix.conductor:conductor-es6-persistence"
482482
],
483-
"locked": "6.8.12"
483+
"locked": "6.8.23"
484484
},
485485
"org.elasticsearch.client:transport": {
486486
"firstLevelTransitive": [
487487
"com.netflix.conductor:conductor-es6-persistence"
488488
],
489-
"locked": "6.8.12"
489+
"locked": "6.8.23"
490490
},
491491
"org.glassfish.jaxb:jaxb-runtime": {
492492
"locked": "4.0.1"
@@ -934,19 +934,19 @@
934934
"firstLevelTransitive": [
935935
"com.netflix.conductor:conductor-es6-persistence"
936936
],
937-
"locked": "8.7.1"
937+
"locked": "6.8.23"
938938
},
939939
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
940940
"firstLevelTransitive": [
941941
"com.netflix.conductor:conductor-es6-persistence"
942942
],
943-
"locked": "6.8.12"
943+
"locked": "6.8.23"
944944
},
945945
"org.elasticsearch.client:transport": {
946946
"firstLevelTransitive": [
947947
"com.netflix.conductor:conductor-es6-persistence"
948948
],
949-
"locked": "6.8.12"
949+
"locked": "6.8.23"
950950
},
951951
"org.glassfish.jaxb:jaxb-runtime": {
952952
"locked": "4.0.1"
@@ -1504,19 +1504,19 @@
15041504
"firstLevelTransitive": [
15051505
"com.netflix.conductor:conductor-es6-persistence"
15061506
],
1507-
"locked": "8.7.1"
1507+
"locked": "6.8.23"
15081508
},
15091509
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
15101510
"firstLevelTransitive": [
15111511
"com.netflix.conductor:conductor-es6-persistence"
15121512
],
1513-
"locked": "6.8.12"
1513+
"locked": "6.8.23"
15141514
},
15151515
"org.elasticsearch.client:transport": {
15161516
"firstLevelTransitive": [
15171517
"com.netflix.conductor:conductor-es6-persistence"
15181518
],
1519-
"locked": "6.8.12"
1519+
"locked": "6.8.23"
15201520
},
15211521
"org.glassfish.jaxb:jaxb-runtime": {
15221522
"locked": "4.0.1"

‎test-harness/dependencies.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@
672672
"firstLevelTransitive": [
673673
"com.netflix.conductor:conductor-es6-persistence"
674674
],
675-
"locked": "6.8.12"
675+
"locked": "6.8.23"
676676
},
677677
"org.glassfish.jaxb:jaxb-runtime": {
678678
"firstLevelTransitive": [

0 commit comments

Comments
 (0)