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

Commit

Permalink
Update version - Keep ES6 version
Browse files Browse the repository at this point in the history
  • Loading branch information
@meggarr
meggarr committed Oct 2, 2023
1 parent c6c06a1 commit df1b08a
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ext {
revCassandraUnit = '3.11.2.0'
revCommonsIo = '2.7'
revDynoQueues = '2.0.20'
revElasticSearch6 = '6.8.23'
revElasticSearch6 = '6.8.12'
revEmbeddedRedis = '0.6'
revEurekaClient = '1.10.10'
revGroovy = '3.0.19'
Expand Down
24 changes: 12 additions & 12 deletions es6-persistence/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@
"locked": "2.17.2"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.springframework.boot:spring-boot-starter": {
"locked": "2.7.16"
Expand Down Expand Up @@ -206,13 +206,13 @@
"locked": "2.17.2"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"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.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand Down Expand Up @@ -444,13 +444,13 @@
"locked": "3.1.6"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.junit.vintage:junit-vintage-engine": {
"locked": "5.8.2"
Expand Down
2 changes: 1 addition & 1 deletion es6-persistence/src/test/java/com/netflix/conductor/es6/dao/index/ElasticSearchTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public ElasticSearchProperties elasticSearchProperties() {
protected static final ElasticsearchContainer container =
new ElasticsearchContainer(
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
.withTag("6.8.23")); // this should match the client version
.withTag("6.8.12")); // this should match the client version

@Autowired protected ObjectMapper objectMapper;

Expand Down
18 changes: 9 additions & 9 deletions server/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,19 +459,19 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
Expand Down Expand Up @@ -907,19 +907,19 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
Expand Down Expand Up @@ -1462,19 +1462,19 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.glassfish.jaxb:jaxb-runtime": {
"locked": "2.3.3"
Expand Down
10 changes: 5 additions & 5 deletions test-harness/dependencies.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@
"locked": "3.0.19"
},
"org.elasticsearch.client:elasticsearch-rest-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.glassfish.jersey.core:jersey-common": {
"locked": "2.22.2"
Expand Down Expand Up @@ -647,19 +647,19 @@
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:elasticsearch-rest-high-level-client": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.elasticsearch.client:transport": {
"firstLevelTransitive": [
"com.netflix.conductor:conductor-es6-persistence"
],
"locked": "6.8.23"
"locked": "6.8.12"
},
"org.glassfish.jaxb:jaxb-runtime": {
"firstLevelTransitive": [
Expand Down
2 changes: 1 addition & 1 deletion test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public abstract class AbstractEndToEndTest {
private static final ElasticsearchContainer container =
new ElasticsearchContainer(
DockerImageName.parse("docker.elastic.co/elasticsearch/elasticsearch-oss")
.withTag("6.8.23")); // this should match the client version
.withTag("6.8.12")); // this should match the client version

private static RestClient restClient;

Expand Down

0 comments on commit df1b08a

Please sign in to comment.