From 5233f5f0486784ac26d637011f53f7eb098234e6 Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Wed, 26 Jun 2024 00:46:05 +0000 Subject: [PATCH] opensearch 2.15.0 opensearch: fix gradle compatibility Signed-off-by: Rui Chen --- Formula/o/opensearch.rb | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Formula/o/opensearch.rb b/Formula/o/opensearch.rb index add97d666962..55cfe37b5ed5 100644 --- a/Formula/o/opensearch.rb +++ b/Formula/o/opensearch.rb @@ -1,8 +1,8 @@ class Opensearch < Formula desc "Open source distributed and RESTful search engine" homepage "https://github.com/opensearch-project/OpenSearch" - url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/2.14.0.tar.gz" - sha256 "72eab7e3882e3dd8d16aad39d077b46576ef583e267c6ccdfe3bffdd429ff6fb" + url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/2.15.0.tar.gz" + sha256 "047f0c26ec3ae54f6b0213d7191c346290c9d4ac2b8a6d21b0d947f9d36b83a6" license "Apache-2.0" bottle do @@ -18,6 +18,9 @@ class Opensearch < Formula depends_on "gradle" => :build depends_on "openjdk" + # upstream patch PR, https://github.com/opensearch-project/OpenSearch/pull/14182 + patch :DATA + def install platform = OS.kernel_name.downcase platform += "-arm64" if Hardware::CPU.arm? @@ -106,3 +109,18 @@ def caveats system "#{bin}/opensearch-plugin", "list" end end + +__END__ +diff --git a/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java +index 448ba8a..669a67e 100644 +--- a/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java ++++ b/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java +@@ -199,7 +199,7 @@ public class GlobalBuildInfoPlugin implements Plugin { + } + + private JvmInstallationMetadata getJavaInstallation(File javaHome) { +- final InstallationLocation location = new InstallationLocation(javaHome, "Java home"); ++ final InstallationLocation location = InstallationLocation.userDefined(javaHome, "Java home"); + + try { + try {