From f57e6af2a849abc461ba76d6d894c57b37f3ceb1 Mon Sep 17 00:00:00 2001
From: Byron Hallett <bhallett@atlassian.com>
Date: Thu, 10 Oct 2024 17:55:38 +1100
Subject: [PATCH] 2.15 compatability

Bump versions of OS and ltr to 2.15.0
---
 build.gradle            | 2 +-
 docker/Dockerfile       | 6 +++---
 docker/local.Dockerfile | 9 ++++-----
 gradle.properties       | 8 ++++----
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index 29d726ad..8078fc2e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,7 +54,7 @@ validateNebulaPom.enabled = false
 buildscript {
   ext {
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
-    opensearch_version = System.getProperty("opensearch.version", "2.13.0")
+    opensearch_version = System.getProperty("opensearch.version", "2.15.0")
     lucene_version = "9.10.0"
     plugin_version = opensearch_version + ".0"
     if (isSnapshot) {
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 44904dec..7c6b7f68 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,8 @@
-ARG opensearch_version=2.5.0
+ARG opensearch_version=2.15.0
 
 FROM opensearchproject/opensearch:${opensearch_version}
-ARG opensearch_version=2.5.0
-ARG ltrversion=2.1.0
+ARG opensearch_version=2.15.0
+ARG ltrversion=2.15.0
 RUN /usr/share/opensearch/bin/opensearch-plugin install -b https://github.com/gsingers/opensearch-learning-to-rank-base/releases/download/release-v${ltrversion}/ltr-plugin-v${ltrversion}.zip
 
 
diff --git a/docker/local.Dockerfile b/docker/local.Dockerfile
index 0e0c5e21..a1cb35b8 100644
--- a/docker/local.Dockerfile
+++ b/docker/local.Dockerfile
@@ -1,13 +1,12 @@
 # Build an image from a local distribution
 
-ARG opensearch_version=2.5.0
+ARG opensearch_version=2.15.0
 FROM opensearchproject/opensearch:${opensearch_version}
-ARG ltrversion=2.1.0
-ARG opensearch_version=2.5.0
+ARG ltrversion=2.15.0
+ARG opensearch_version=2.15.0
 ARG zip_file=ltr-${ltrversion}-os${opensearch_version}.zip
 ARG plugin_file=/usr/share/opensearch/${zip_file}
 
 COPY --chown=opensearch:opensearch build/distributions/${zip_file} ${plugin_file}
 RUN /usr/share/opensearch/bin/opensearch-plugin install -b file:${plugin_file}
-# check in to see if there is a better way to do this so we don't have duplicate RUN commands
-
+# check in to see if there is a better way to do this so we don't have duplicate RUN commands
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index d450d873..cdfb6926 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
-ltrVersion = 2.2.0
-opensearchVersion = 2.6.0
-luceneVersion = 9.5.0
-ow2Version = 9.4
+ltrVersion = 2.15.0
+opensearchVersion = 2.15.0
+luceneVersion = 9.10.0
+ow2Version = 9.6
 antlrVersion=4.13.0