Skip to content

Commit ec6edb5

Browse files
ottenhoffottenhoff
authored
SAK-47210 Search replace elasticsearch with opensearch (sakaiproject#10469)
1 parent d972e9a commit ec6edb5

File tree

23 files changed

+257
-274
lines changed

23 files changed

+257
-274
lines changed

‎assignment/impl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@
187187
<artifactId>elasticsearch-api</artifactId>
188188
</dependency>
189189
<dependency>
190-
<groupId>org.elasticsearch</groupId>
191-
<artifactId>elasticsearch</artifactId>
190+
<groupId>org.opensearch</groupId>
191+
<artifactId>opensearch</artifactId>
192192
</dependency>
193193
<dependency>
194194
<groupId>com.sun.mail</groupId>

‎config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

+12-14
Original file line numberDiff line numberDiff line change
@@ -3170,13 +3170,11 @@
31703170
# roster.display.user.pronouns = true
31713171

31723172
## SEARCH
3173-
# Elastic search is the default search as of Sakai 10
3174-
# For more information please see this confluence page
3175-
# https://confluence.sakaiproject.org/display/SEARCH/Elasticsearch
3176-
# Every property of elasticsearch can be configured by using the prefix
3177-
# elasticsearch.
3178-
# And then using the property from the elasticsearch.yml file
3179-
# (As of version .90 this is https://github.com/elasticsearch/elasticsearch/blob/0.90/config/elasticsearch.yml)
3173+
# Opensearch is the open-source successor of Elasticsearch
3174+
# Every property of opensearch can be configured by using the prefix
3175+
# "opensearch"
3176+
# And then using the property from the opensearch.yml file
3177+
# https://github.com/opensearch-project/security/blob/main/securityconfig/opensearch.yml.example
31803178
# This file just contains some of the most common, please see that Yaml file and page
31813179
# for additional info.
31823180

@@ -3243,29 +3241,29 @@
32433241

32443242
# How many shards to start up for elastic search
32453243
# DEFAULT: 5
3246-
# elasticsearch.index.number_of_shards=5
3244+
# opensearch.index.number_of_shards=5
32473245

32483246
# How many replicates to start up for elastic search
32493247
# DEFAULT: 1
3250-
# elasticsearch.index.number_of_replicas=1
3248+
# opensearch.index.number_of_replicas=1
32513249

32523250
# Turning on http communication so you can use curl and other tools. You want to make sure this is firewalled to the outside world, but its really handy to have on even in production.
32533251
# DEFAULT: true
3254-
# elasticsearch.http.enabled=true
3252+
# opensearch.http.enabled=true
32553253

32563254
# Default port to use for http communication above
32573255
# DEFAULT: 9200
3258-
# elasticsearch.http.port=9200
3256+
# opensearch.http.port=9200
32593257

32603258
# Multicast is the default but unicast should be supported you need these options
32613259
# Turn multicast off
3262-
# elasticsearch.discovery.zen.ping.multicast.enabled=false
3260+
# opensearch.discovery.zen.ping.multicast.enabled=false
32633261

32643262
# Pick your communication port
3265-
# elasticsearch.transport.tcp.port=9300
3263+
# opensearch.transport.tcp.port=9300
32663264

32673265
# Set the location of all your nodes, including the port
3268-
# elasticsearch.discovery.zen.ping.unicast.hosts=ec2-184-169-221-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-163-255.us-west-1.compute.amazonaws.com:9300,ec2-184-169-227-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-170-255.us-west-1.compute.amazonaws.com:9300
3266+
# opensearch.discovery.zen.ping.unicast.hosts=ec2-184-169-221-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-163-255.us-west-1.compute.amazonaws.com:9300,ec2-184-169-227-255.us-west-1.compute.amazonaws.com:9300,ec2-204-236-170-255.us-west-1.compute.amazonaws.com:9300
32693267

32703268
# See the confluence page for more details on unicast/multicast/EC2 discovery options.
32713269

‎conversations/impl/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,9 @@
118118
<artifactId>commons-lang3</artifactId>
119119
</dependency>
120120
<dependency>
121-
<groupId>org.elasticsearch</groupId>
122-
<artifactId>elasticsearch</artifactId>
123-
<version>${sakai.elasticsearch.version}</version>
121+
<groupId>org.opensearch</groupId>
122+
<artifactId>opensearch</artifactId>
123+
<version>${sakai.opensearch.version}</version>
124124
<scope>test</scope>
125125
</dependency>
126126
</dependencies>

‎deploy/pom.xml

+24-29
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
<scope>compile</scope>
208208
</dependency>
209209

210-
<!-- lucene jars required by elasticsearch and help -->
210+
<!-- lucene jars required by opensearch and help -->
211211
<dependency>
212212
<groupId>org.apache.lucene</groupId>
213213
<artifactId>lucene-core</artifactId>
@@ -273,40 +273,35 @@
273273
<artifactId>lucene-spatial3d</artifactId>
274274
<scope>compile</scope>
275275
</dependency>
276-
<!-- elasticsearch libs -->
276+
<!-- opensearch libs -->
277277
<dependency>
278-
<groupId>org.elasticsearch</groupId>
279-
<artifactId>elasticsearch</artifactId>
278+
<groupId>org.opensearch</groupId>
279+
<artifactId>opensearch</artifactId>
280280
<scope>compile</scope>
281281
</dependency>
282282
<dependency>
283-
<groupId>org.elasticsearch</groupId>
284-
<artifactId>elasticsearch-core</artifactId>
283+
<groupId>org.opensearch</groupId>
284+
<artifactId>opensearch-core</artifactId>
285285
<scope>compile</scope>
286286
</dependency>
287287
<dependency>
288-
<groupId>org.elasticsearch</groupId>
289-
<artifactId>elasticsearch-cli</artifactId>
288+
<groupId>org.opensearch</groupId>
289+
<artifactId>opensearch-cli</artifactId>
290290
<scope>compile</scope>
291291
</dependency>
292292
<dependency>
293-
<groupId>org.elasticsearch</groupId>
294-
<artifactId>elasticsearch-secure-sm</artifactId>
293+
<groupId>org.opensearch</groupId>
294+
<artifactId>opensearch-secure-sm</artifactId>
295295
<scope>compile</scope>
296296
</dependency>
297297
<dependency>
298-
<groupId>org.elasticsearch</groupId>
299-
<artifactId>elasticsearch-x-content</artifactId>
298+
<groupId>org.opensearch</groupId>
299+
<artifactId>opensearch-x-content</artifactId>
300300
<scope>compile</scope>
301301
</dependency>
302302
<dependency>
303-
<groupId>org.elasticsearch</groupId>
304-
<artifactId>elasticsearch-geo</artifactId>
305-
<scope>compile</scope>
306-
</dependency>
307-
<dependency>
308-
<groupId>org.elasticsearch</groupId>
309-
<artifactId>elasticsearch-lz4</artifactId>
303+
<groupId>org.opensearch</groupId>
304+
<artifactId>opensearch-geo</artifactId>
310305
<scope>compile</scope>
311306
</dependency>
312307
<dependency>
@@ -315,22 +310,22 @@
315310
<scope>compile</scope>
316311
</dependency>
317312
<dependency>
318-
<groupId>org.elasticsearch.client</groupId>
319-
<artifactId>elasticsearch-rest-high-level-client</artifactId>
313+
<groupId>org.opensearch.client</groupId>
314+
<artifactId>opensearch-rest-high-level-client</artifactId>
320315
<scope>compile</scope>
321316
</dependency>
322317
<dependency>
323-
<groupId>org.elasticsearch.client</groupId>
324-
<artifactId>elasticsearch-rest-client</artifactId>
318+
<groupId>org.opensearch.client</groupId>
319+
<artifactId>opensearch-rest-client</artifactId>
325320
<scope>compile</scope>
326321
</dependency>
327322
<dependency>
328-
<groupId>org.elasticsearch.plugin</groupId>
323+
<groupId>org.opensearch.plugin</groupId>
329324
<artifactId>transport-netty4-client</artifactId>
330325
<scope>compile</scope>
331326
</dependency>
332327
<dependency>
333-
<groupId>org.codelibs.elasticsearch.module</groupId>
328+
<groupId>org.opensearch.plugin</groupId>
334329
<artifactId>analysis-common</artifactId>
335330
<scope>compile</scope>
336331
</dependency>
@@ -340,22 +335,22 @@
340335
<scope>compile</scope>
341336
</dependency>
342337
<dependency>
343-
<groupId>org.elasticsearch.plugin</groupId>
338+
<groupId>org.opensearch.plugin</groupId>
344339
<artifactId>parent-join-client</artifactId>
345340
<scope>compile</scope>
346341
</dependency>
347342
<dependency>
348-
<groupId>org.elasticsearch.plugin</groupId>
343+
<groupId>org.opensearch.plugin</groupId>
349344
<artifactId>aggs-matrix-stats-client</artifactId>
350345
<scope>compile</scope>
351346
</dependency>
352347
<dependency>
353-
<groupId>org.elasticsearch.plugin</groupId>
348+
<groupId>org.opensearch.plugin</groupId>
354349
<artifactId>rank-eval-client</artifactId>
355350
<scope>compile</scope>
356351
</dependency>
357352
<dependency>
358-
<groupId>org.elasticsearch.plugin</groupId>
353+
<groupId>org.opensearch.plugin</groupId>
359354
<artifactId>lang-mustache-client</artifactId>
360355
<scope>compile</scope>
361356
</dependency>

‎master/pom.xml

+40-46
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<sakai.ehcache.groupId>net.sf.ehcache</sakai.ehcache.groupId>
3737
<sakai.ehcache.artifactId>ehcache-core</sakai.ehcache.artifactId>
3838
<sakai.ehcache.version>2.6.11</sakai.ehcache.version>
39-
<sakai.elasticsearch.version>7.17.1</sakai.elasticsearch.version>
39+
<sakai.opensearch.version>1.3.4</sakai.opensearch.version>
4040
<sakai.hibernate.version>5.3.20.Final</sakai.hibernate.version>
4141
<sakai.hikaricp.version>4.0.3</sakai.hikaricp.version>
4242
<sakai.httpclient.version>4.5.13</sakai.httpclient.version>
@@ -56,7 +56,7 @@
5656
<sakai.jaxb.version>2.3.6</sakai.jaxb.version>
5757
<sakai.jstl.version>1.2</sakai.jstl.version>
5858
<sakai.lombok.version>1.18.24</sakai.lombok.version>
59-
<sakai.lucene.version>8.11.1</sakai.lucene.version>
59+
<sakai.lucene.version>8.10.1</sakai.lucene.version>
6060
<sakai.netty.version>4.1.71.Final</sakai.netty.version>
6161
<sakai.org.json.version>20210307</sakai.org.json.version>
6262
<sakai.pluto.version>1.1.7</sakai.pluto.version>
@@ -1351,47 +1351,41 @@
13511351
<version>${sakai.openpdf.version}</version>
13521352
<scope>provided</scope>
13531353
</dependency>
1354-
<!-- elasticsearch -->
1354+
<!-- opensearch -->
13551355
<dependency>
1356-
<groupId>org.elasticsearch</groupId>
1357-
<artifactId>elasticsearch</artifactId>
1358-
<version>${sakai.elasticsearch.version}</version>
1356+
<groupId>org.opensearch</groupId>
1357+
<artifactId>opensearch</artifactId>
1358+
<version>${sakai.opensearch.version}</version>
13591359
<scope>provided</scope>
13601360
</dependency>
13611361
<dependency>
1362-
<groupId>org.elasticsearch</groupId>
1363-
<artifactId>elasticsearch-core</artifactId>
1364-
<version>${sakai.elasticsearch.version}</version>
1362+
<groupId>org.opensearch</groupId>
1363+
<artifactId>opensearch-core</artifactId>
1364+
<version>${sakai.opensearch.version}</version>
13651365
<scope>provided</scope>
13661366
</dependency>
13671367
<dependency>
1368-
<groupId>org.elasticsearch</groupId>
1369-
<artifactId>elasticsearch-cli</artifactId>
1370-
<version>${sakai.elasticsearch.version}</version>
1368+
<groupId>org.opensearch</groupId>
1369+
<artifactId>opensearch-cli</artifactId>
1370+
<version>${sakai.opensearch.version}</version>
13711371
<scope>provided</scope>
13721372
</dependency>
13731373
<dependency>
1374-
<groupId>org.elasticsearch</groupId>
1375-
<artifactId>elasticsearch-secure-sm</artifactId>
1376-
<version>${sakai.elasticsearch.version}</version>
1374+
<groupId>org.opensearch</groupId>
1375+
<artifactId>opensearch-secure-sm</artifactId>
1376+
<version>${sakai.opensearch.version}</version>
13771377
<scope>provided</scope>
13781378
</dependency>
13791379
<dependency>
1380-
<groupId>org.elasticsearch</groupId>
1381-
<artifactId>elasticsearch-x-content</artifactId>
1382-
<version>${sakai.elasticsearch.version}</version>
1380+
<groupId>org.opensearch</groupId>
1381+
<artifactId>opensearch-x-content</artifactId>
1382+
<version>${sakai.opensearch.version}</version>
13831383
<scope>provided</scope>
13841384
</dependency>
13851385
<dependency>
1386-
<groupId>org.elasticsearch</groupId>
1387-
<artifactId>elasticsearch-geo</artifactId>
1388-
<version>${sakai.elasticsearch.version}</version>
1389-
<scope>provided</scope>
1390-
</dependency>
1391-
<dependency>
1392-
<groupId>org.elasticsearch</groupId>
1393-
<artifactId>elasticsearch-lz4</artifactId>
1394-
<version>${sakai.elasticsearch.version}</version>
1386+
<groupId>org.opensearch</groupId>
1387+
<artifactId>opensearch-geo</artifactId>
1388+
<version>${sakai.opensearch.version}</version>
13951389
<scope>provided</scope>
13961390
</dependency>
13971391
<dependency>
@@ -1401,15 +1395,15 @@
14011395
<scope>provided</scope>
14021396
</dependency>
14031397
<dependency>
1404-
<groupId>org.elasticsearch.client</groupId>
1405-
<artifactId>elasticsearch-rest-high-level-client</artifactId>
1406-
<version>${sakai.elasticsearch.version}</version>
1398+
<groupId>org.opensearch.client</groupId>
1399+
<artifactId>opensearch-rest-high-level-client</artifactId>
1400+
<version>${sakai.opensearch.version}</version>
14071401
<scope>provided</scope>
14081402
</dependency>
14091403
<dependency>
1410-
<groupId>org.elasticsearch.client</groupId>
1411-
<artifactId>elasticsearch-rest-client</artifactId>
1412-
<version>${sakai.elasticsearch.version}</version>
1404+
<groupId>org.opensearch.client</groupId>
1405+
<artifactId>opensearch-rest-client</artifactId>
1406+
<version>${sakai.opensearch.version}</version>
14131407
<scope>provided</scope>
14141408
<exclusions>
14151409
<exclusion>
@@ -1419,39 +1413,39 @@
14191413
</exclusions>
14201414
</dependency>
14211415
<dependency>
1422-
<groupId>org.elasticsearch.plugin</groupId>
1416+
<groupId>org.opensearch.plugin</groupId>
14231417
<artifactId>transport-netty4-client</artifactId>
1424-
<version>${sakai.elasticsearch.version}</version>
1418+
<version>${sakai.opensearch.version}</version>
14251419
<scope>provided</scope>
14261420
</dependency>
14271421
<dependency>
1428-
<groupId>org.codelibs.elasticsearch.module</groupId>
1422+
<groupId>org.opensearch.plugin</groupId>
14291423
<artifactId>analysis-common</artifactId>
1430-
<version>${sakai.elasticsearch.version}</version>
1424+
<version>${sakai.opensearch.version}</version>
14311425
<scope>provided</scope>
14321426
</dependency>
14331427
<dependency>
1434-
<groupId>org.elasticsearch.plugin</groupId>
1428+
<groupId>org.opensearch.plugin</groupId>
14351429
<artifactId>parent-join-client</artifactId>
1436-
<version>${sakai.elasticsearch.version}</version>
1430+
<version>${sakai.opensearch.version}</version>
14371431
<scope>provided</scope>
14381432
</dependency>
14391433
<dependency>
1440-
<groupId>org.elasticsearch.plugin</groupId>
1434+
<groupId>org.opensearch.plugin</groupId>
14411435
<artifactId>aggs-matrix-stats-client</artifactId>
1442-
<version>${sakai.elasticsearch.version}</version>
1436+
<version>${sakai.opensearch.version}</version>
14431437
<scope>provided</scope>
14441438
</dependency>
14451439
<dependency>
1446-
<groupId>org.elasticsearch.plugin</groupId>
1440+
<groupId>org.opensearch.plugin</groupId>
14471441
<artifactId>rank-eval-client</artifactId>
1448-
<version>${sakai.elasticsearch.version}</version>
1442+
<version>${sakai.opensearch.version}</version>
14491443
<scope>provided</scope>
14501444
</dependency>
14511445
<dependency>
1452-
<groupId>org.elasticsearch.plugin</groupId>
1446+
<groupId>org.opensearch.plugin</groupId>
14531447
<artifactId>lang-mustache-client</artifactId>
1454-
<version>${sakai.elasticsearch.version}</version>
1448+
<version>${sakai.opensearch.version}</version>
14551449
<scope>provided</scope>
14561450
</dependency>
14571451
<!-- netty -->
@@ -1594,7 +1588,7 @@
15941588
<version>5.10.0</version>
15951589
<scope>provided</scope>
15961590
</dependency>
1597-
<!-- elasticsearch 3rd party libs -->
1591+
<!-- opensearch 3rd party libs -->
15981592
<dependency>
15991593
<groupId>joda-time</groupId>
16001594
<artifactId>joda-time</artifactId>

‎msgcntr/messageforums-component-impl/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
<artifactId>elasticsearch-api</artifactId>
141141
</dependency>
142142
<dependency>
143-
<groupId>org.elasticsearch</groupId>
144-
<artifactId>elasticsearch</artifactId>
143+
<groupId>org.opensearch</groupId>
144+
<artifactId>opensearch</artifactId>
145145
</dependency>
146146
</dependencies>
147147
<build>

‎samigo/samigo-app/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@
8686
<artifactId>search-api</artifactId>
8787
</dependency>
8888
<dependency>
89-
<groupId>org.elasticsearch</groupId>
90-
<artifactId>elasticsearch</artifactId>
89+
<groupId>org.opensearch</groupId>
90+
<artifactId>opensearch</artifactId>
9191
<scope>provided</scope>
92-
<version>${sakai.elasticsearch.version}</version>
92+
<version>${sakai.opensearch.version}</version>
9393
</dependency>
9494
<dependency>
9595
<groupId>net.htmlparser.jericho</groupId>

0 commit comments

Comments
 (0)