Remove version from CMakeLists.txt (opensearch-project#325)

Removes hardcoding version in CMakeLists and configures build.gradle to pass in OpenSearch version. Updates numpy to fix whitesource check. Signed-off-by: John Mazanec <[email protected]>
martin-gaievski · Mar 18, 2022 · 38f1c23 · 38f1c23
1 parent ba64c68
commit 38f1c23
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/benchmarks/perf-tool/requirements.txt b/benchmarks/perf-tool/requirements.txt
@@ -18,7 +18,7 @@ h5py==3.3.0
     # via -r requirements.in
 idna==3.2
     # via requests
-numpy==1.22.0
+numpy==1.22.1
     # via
     #   -r requirements.in
     #   h5py

diff --git a/build.gradle b/build.gradle
@@ -151,7 +151,7 @@ opensearch_tmp_dir.mkdirs()
 
 task cmakeJniLib(type:Exec) {
     workingDir 'jni'
-    commandLine 'cmake', '.'
+    commandLine 'cmake', '.', "-DKNN_PLUGIN_VERSION=${opensearch_version}"
 }
 
 task buildJniLib(type:Exec) {

diff --git a/jni/CMakeLists.txt b/jni/CMakeLists.txt
@@ -39,8 +39,9 @@ else()
     message(FATAL_ERROR "Unable to run on system: ${CMAKE_SYSTEM_NAME}")
 endif()
 
+# By default, set to 0.0.0
 if(NOT KNN_PLUGIN_VERSION)
-    set(KNN_PLUGIN_VERSION "1.3.0.0")
+    set(KNN_PLUGIN_VERSION "0.0.0")
 endif()
 
 # Set architecture specific variables