Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix elasticsearch dependency error #11

Merged
merged 1 commit into from
Dec 18, 2023
Merged

Fix elasticsearch dependency error #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ ext {
revCassandraUnit = '3.11.2.0'
revCommonsIo = '2.7'
revDynoQueues = '2.0.20'
revElasticSearch6 = '6.8.12'
revElasticSearch6 = '6.8.23'
revEmbeddedRedis = '0.6'
revEurekaClient = '1.10.10'
revGroovy = '4.0.9'
Expand Down
24 changes: 12 additions & 12 deletions es6-persistence/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"locked": "2.20.0"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.springframework.boot:spring-boot-starter": {
"locked": "3.1.4"
Expand Down Expand Up @@ -206,13 +206,13 @@
"locked": "2.20.0"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.openjdk.nashorn:nashorn-core": {
"firstLevelTransitive": [
Expand Down Expand Up @@ -259,13 +259,13 @@
"locked": "3.1.6"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.9.3"
Expand Down Expand Up @@ -444,13 +444,13 @@
"locked": "3.1.6"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.9.3"
Expand Down
2 changes: 1 addition & 1 deletion es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public ElasticSearchProperties elasticSearchProperties() {
new ElasticsearchContainer(
DockerImageName.parse(
"docker.elastic.co/elasticsearch/elasticsearch-oss")
.withTag("6.8.17")) // this should match the client version
.withTag("6.8.23")) // this should match the client version
// Resolve issue with es container not starting on m1/m2 macs
.withEnv(Map.of("bootstrap.system_call_filter", "false"));

Expand Down
18 changes: 9 additions & 9 deletions server/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,19 +474,19 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "8.7.1"
"locked": "6.8.23"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:transport": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "4.0.1"
Expand Down Expand Up @@ -934,19 +934,19 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "8.7.1"
"locked": "6.8.23"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:transport": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "4.0.1"
Expand Down Expand Up @@ -1504,19 +1504,19 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "8.7.1"
"locked": "6.8.23"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.elasticsearch.client:transport": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "4.0.1"
Expand Down
2 changes: 1 addition & 1 deletion test-harness/dependencies.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.12"
"locked": "6.8.23"
},
"org.glassfish.jaxb:jaxb-runtime": {
"firstLevelTransitive": [
Expand Down
Loading