Skip to content

Commit acd6120

Browse files
authored
Merge pull request #527 from conductor-oss/lucene-dependency-fix
CCOR-12529 Create dynamic lucene dependency selection based on index engine
2 parents 9bbf0a4 + 74ed34a commit acd6120

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ Check-out the [Conductor OSS docs](https://github.com/conductor-oss/conductor/tr
104104
# Database Specifications
105105
* The default persistence used is Redis
106106
* The indexing backend is [Elasticsearch](https://www.elastic.co/) (7.x)
107+
* To use [Opensearch](https://opensearch.org/) (2.x), comment out Elasticsearch import so lucene dependencies don't conflict [server/build.gradle](https://github.com/conductor-oss/conductor/blob/main/server/build.gradle#L44-L46)
107108

108109

109110
### Configuration for various database backends

dependencies.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,5 @@ ext {
6767
revNats = '2.16.14'
6868
revStan = '2.2.3'
6969
revFlyway = '10.15.2'
70-
revApacheLucene = '10.2.1'
7170
revConductorClient = '4.0.10'
7271
}

es7-persistence/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626

2727
implementation "com.fasterxml.jackson.core:jackson-databind"
2828
implementation "com.fasterxml.jackson.core:jackson-core"
29-
29+
3030
implementation "org.elasticsearch.client:elasticsearch-rest-client:${revElasticSearch7}"
3131
implementation "org.elasticsearch.client:elasticsearch-rest-high-level-client:${revElasticSearch7}"
3232

server-lite/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ dependencies {
6060
implementation 'org.apache.logging.log4j:log4j-web'
6161
implementation "redis.clients:jedis:${revJedis}"
6262
implementation "org.postgresql:postgresql:${revPostgres}"
63-
implementation "org.apache.lucene:lucene-core:${revApacheLucene}"
6463

6564
implementation 'org.springframework.boot:spring-boot-starter-actuator'
6665
implementation ("io.orkes.queues:orkes-conductor-queues:${revOrkesQueues}") {

server/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ dependencies {
4141
implementation project(':conductor-sqlite-persistence')
4242

4343
//Indexing (note: Elasticsearch 6 is deprecated)
44-
implementation project(':conductor-os-persistence')
4544
implementation project(':conductor-es7-persistence')
46-
45+
// To use Opensearch, comment out above Elasticsearch, uncomment below Opensearch, and rebuild conductor
46+
// implementation project(':conductor-os-persistence')
4747

4848
implementation project(':conductor-redis-lock')
4949
implementation project(':conductor-redis-concurrency-limit')

0 commit comments

Comments
 (0)