Skip to content

Commit cc56942

Browse files
committed
fixup
1 parent 2691890 commit cc56942

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

build.gradle

+3-10
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,10 @@ buildscript {
1515
opensearch_build = version_tokens[0] + '.0'
1616
plugin_no_snapshot = opensearch_build
1717
if (buildVersionQualifier) {
18-
// TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this
19-
opensearch_build_noalpha = opensearch_build
2018
opensearch_build += "-${buildVersionQualifier}"
2119
plugin_no_snapshot += "-${buildVersionQualifier}"
2220
}
2321
if (isSnapshot) {
24-
// TODO: when upstream plugin dependencies are on alpha1, switch to opensearch_build and remove this
25-
opensearch_build_noalpha += "-SNAPSHOT"
2622
opensearch_build += "-SNAPSHOT"
2723
}
2824
opensearch_group = "org.opensearch"
@@ -171,8 +167,7 @@ configurations {
171167

172168
dependencies {
173169
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}"
176171
api(group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}") {
177172
exclude group: "org.apache.httpcomponents.client5", module: "httpclient5"
178173
}
@@ -206,11 +201,9 @@ dependencies {
206201
// ZipArchive dependencies used for integration tests
207202
// Check the order in case of transitive dependencies
208203
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}"
211205
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}"
214207
secureIntegTestPluginArchive group: 'org.opensearch.plugin', name:'opensearch-security', version: "${opensearch_build}"
215208

216209
configurations.all {

0 commit comments

Comments
 (0)