@@ -15,14 +15,10 @@ buildscript {
15
15
opensearch_build = version_tokens[0 ] + ' .0'
16
16
plugin_no_snapshot = opensearch_build
17
17
if (buildVersionQualifier) {
18
- // TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this
19
- opensearch_build_noalpha = opensearch_build
20
18
opensearch_build + = " -${ buildVersionQualifier} "
21
19
plugin_no_snapshot + = " -${ buildVersionQualifier} "
22
20
}
23
21
if (isSnapshot) {
24
- // TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this
25
- opensearch_build_noalpha + = " -SNAPSHOT"
26
22
opensearch_build + = " -SNAPSHOT"
27
23
}
28
24
opensearch_group = " org.opensearch"
@@ -171,8 +167,7 @@ configurations {
171
167
172
168
dependencies {
173
169
implementation " org.opensearch:opensearch:${ opensearch_version} "
174
- // TODO remove _noalpha
175
- api group : ' org.opensearch' , name :' opensearch-ml-client' , version : " ${ opensearch_build_noalpha} "
170
+ api group : ' org.opensearch' , name :' opensearch-ml-client' , version : " ${ opensearch_build} "
176
171
api(group : ' org.opensearch.client' , name : ' opensearch-rest-client' , version : " ${ opensearch_version} " ) {
177
172
exclude group : " org.apache.httpcomponents.client5" , module : " httpclient5"
178
173
}
@@ -206,11 +201,9 @@ dependencies {
206
201
// ZipArchive dependencies used for integration tests
207
202
// Check the order in case of transitive dependencies
208
203
zipArchive group : ' org.opensearch.plugin' , name :' opensearch-job-scheduler' , version : " ${ opensearch_build} "
209
- // TODO remove _noalpha
210
- zipArchive group : ' org.opensearch.plugin' , name :' opensearch-ml-plugin' , version : " ${ opensearch_build_noalpha} "
204
+ zipArchive group : ' org.opensearch.plugin' , name :' opensearch-ml-plugin' , version : " ${ opensearch_build} "
211
205
zipArchive group : ' org.opensearch.plugin' , name :' opensearch-knn' , version : " ${ opensearch_build} "
212
- // TODO remove _noalpha
213
- zipArchive group : ' org.opensearch.plugin' , name :' neural-search' , version : " ${ opensearch_build_noalpha} "
206
+ zipArchive group : ' org.opensearch.plugin' , name :' neural-search' , version : " ${ opensearch_build} "
214
207
secureIntegTestPluginArchive group : ' org.opensearch.plugin' , name :' opensearch-security' , version : " ${ opensearch_build} "
215
208
216
209
configurations. all {
0 commit comments