Merge pull request #403 from Product-Live/feature/lucene_compatibility

Fix dependancie compatibility for ES 7 indexing and Microsoft Azure external storage

Author: v1r3n

dependencies.gradle

@@ -17,6 +17,7 @@
 ext {
     revActivation = '2.0.1'
     revApacheHttpComponentsClient5 = '5.2.1'
+    revApacheLucene = '8.11.1'
     revAwaitility = '3.1.6'
     revAwsSdk = '1.12.756'
     revBval = '2.0.5'
@@ -61,9 +62,9 @@ ext {
     revKafka = '2.6.0'
     revMicrometer = '1.13.1'
     revPrometheus = '0.9.0'
-    revElasticSearch7 = '7.17.19'
+    revElasticSearch7 = '7.17.11'
     revCodec = '1.15'
-    revAzureStorageBlobSdk = '12.18.0'
+    revAzureStorageBlobSdk = '12.25.1'
     revNatsStreaming = '2.6.5'
     revNats = '2.16.14'
     revStan = '2.2.3'

es7-persistence/build.gradle

@@ -26,6 +26,8 @@ dependencies {
 
     implementation "com.fasterxml.jackson.core:jackson-databind"
     implementation "com.fasterxml.jackson.core:jackson-core"
+    
+    implementation "org.apache.lucene:lucene-core:${revApacheLucene}"
 
     implementation "org.elasticsearch.client:elasticsearch-rest-client:${revElasticSearch7}"
     implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${revElasticSearch7}"

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

@@ -48,7 +48,7 @@ public ElasticSearchProperties elasticSearchProperties() {
     protected static final ElasticsearchContainer container =
             new ElasticsearchContainer(
                     DockerImageName.parse("elasticsearch")
-                            .withTag("7.17.16")); // this should match the client version
+                            .withTag("7.17.11")); // this should match the client version
 
     @Autowired protected ObjectMapper objectMapper;
 

server/build.gradle

@@ -68,6 +68,7 @@ dependencies {
     implementation 'org.apache.logging.log4j:log4j-web'
     implementation "redis.clients:jedis:${revJedis}"
     implementation "org.postgresql:postgresql:${revPostgres}"
+    implementation "org.apache.lucene:lucene-core:${revApacheLucene}"
 
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation ("io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}") {

test-harness/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java

@@ -66,7 +66,7 @@ public abstract class AbstractEndToEndTest {
     private static final ElasticsearchContainer container =
             new ElasticsearchContainer(
                     DockerImageName.parse("elasticsearch")
-                            .withTag("7.17.16")); // this should match the client version
+                            .withTag("7.17.11")); // this should match the client version
 
     private static RestClient restClient;
 

test-util/src/test/java/com/netflix/conductor/test/integration/AbstractEndToEndTest.java

@@ -62,7 +62,7 @@ public abstract class AbstractEndToEndTest {
     private static final ElasticsearchContainer container =
             new ElasticsearchContainer(
                     DockerImageName.parse("elasticsearch")
-                            .withTag("7.17.16")); // this should match the client version
+                            .withTag("7.17.11")); // this should match the client version
 
     private static RestClient restClient;