Skip to content

Commit e70769b

Browse files
committed
Discontinuation of support for Es 7.x and earlier than 8.10
1 parent a756a23 commit e70769b

File tree

32 files changed

+20
-573
lines changed

32 files changed

+20
-573
lines changed

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@ Use `-PengineVersion=os:2.18.0` for OpenSearch.
2525

2626
## Supported ElasticSearch versions
2727

28-
1. 8.0.* until 8.15.* supported, integration tests in CI
29-
2. 7.17.* (latest patch version) - supported, integration tests in CI
30-
3. 7.11.* until 7.16.* - best effort support, not tested in CI
31-
4. 7.10.* integration tests for the latest patch version
32-
5. 7.9.* and below - not tested in CI at all, may be broken
33-
6. 7.3.* and below - broken, not supported
28+
1. 8.10.* until 8.15.* supported, integration tests in CI
3429

3530
## Supported OpenSearch versions
3631

buildSrc/src/main/groovy/com/worksap/nlp/tools/engines.groovy

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,6 @@ trait EngineSupport {
55
}
66

77
enum EsSupport implements EngineSupport {
8-
Es74("es-7.04"),
9-
Es78("es-7.08"),
10-
Es715("es-7.15"),
11-
Es80("es-8.00"),
12-
Es83("es-8.03"),
13-
Es84("es-8.04"),
148
Es810("es-8.10"),
159
Es812("es-8.12"),
1610

@@ -23,20 +17,8 @@ enum EsSupport implements EngineSupport {
2317
}
2418

2519
static EsSupport supportVersion(Version vers) {
26-
if (vers.lt(7, 4)) {
27-
throw new IllegalArgumentException("versions below 7.4 are not supported")
28-
} else if (vers.ge(7, 4) && vers.lt(7, 8)) {
29-
return Es74
30-
} else if (vers.ge(7, 8) && vers.lt(7, 15)) {
31-
return Es78
32-
} else if (vers.ge(7, 15) && vers.lt(8, 0)) {
33-
return Es715
34-
} else if (vers.ge(8, 0) && vers.lt(8, 3)) {
35-
return Es80
36-
} else if (vers.ge(8, 3) && vers.lt(8, 4)) {
37-
return Es83
38-
} else if (vers.ge(8, 4) && vers.lt(8, 10)) {
39-
return Es84
20+
if (vers.lt(8, 10)) {
21+
throw new IllegalArgumentException("versions below 8.10 are not supported")
4022
} else if (vers.ge(8, 10) && vers.lt(8, 12)) {
4123
return Es810
4224
} else if (vers.ge(8, 12) && vers.lt(9, 0)) {
@@ -169,4 +151,4 @@ class ProjectKind {
169151
Version parsedVersion() {
170152
return Version.fromRaw(version)
171153
}
172-
}
154+
}

gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
# elasticsearch versions: 8.15.2, 8.14.3, 8.13.4, 8.12.2, 8.11.4, 8.10.4, 8.9.2,
2-
# 8.8.1, 8.6.2, 8.5.3, 8.4.3, 8.2.3, 7.17.24, 7.14.2, 7.10.2
1+
# elasticsearch versions: 8.15.2, 8.14.3, 8.13.4, 8.12.2, 8.11.4, 8.10.4
32
# opensearch version: 2.18.0, 2.17.1, 2.16.0, 2.15.0, 2.14.0, 2.13.0, 2.12.0, 2.11.1,
43
# 2.10.0, 2.9.0, 2.8.0, 2.7.0, 2.6.0
54
engineVersion=es:8.15.2

integration/src/test/ext/es-8.00-lt/com.worksap.nlp.elasticsearch.sudachi/aliases.kt

Lines changed: 0 additions & 52 deletions
This file was deleted.

integration/src/test/ext/es-8.00/SudachiInSearchEngineEnv.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

integration/src/test/ext/es-8.03/SudachiInSearchEngineEnv.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

integration/src/test/ext/es-8.04/SudachiInSearchEngineEnv.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

integration/src/test/ext/es-8.00-ge/com.worksap.nlp.elasticsearch.sudachi/aliases.kt renamed to integration/src/test/ext/es-8.10-ge/com.worksap.nlp.elasticsearch.sudachi/aliases.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023-2024 Works Applications Co., Ltd.
2+
* Copyright (c) 2023-2025 Works Applications Co., Ltd.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

src/main/ext/es-7.15-lt/xcontent-aliases.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/main/ext/es-8.00-ge/lucene-aliases.kt

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)