From a0a3e5db3b466891daa2aa7aa580a0e6858b221e Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 8 Aug 2024 00:49:56 +0000 Subject: [PATCH 1/2] opensearch 2.16.0 opensearch: remove patch Signed-off-by: Patrick Linnane --- Formula/o/opensearch.rb | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/Formula/o/opensearch.rb b/Formula/o/opensearch.rb index 4810898984d76..ff277ea5d68ad 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.15.0.tar.gz" - sha256 "047f0c26ec3ae54f6b0213d7191c346290c9d4ac2b8a6d21b0d947f9d36b83a6" + url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/2.16.0.tar.gz" + sha256 "a97926572ab790dc9e3af4075c957bd2225fd9dfb22fcdbc66073bd7c024c1c2" license "Apache-2.0" bottle do @@ -18,9 +18,6 @@ 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? @@ -109,18 +106,3 @@ 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 { From b750003fc3545aaa8acfbe756a725fe37a89661a Mon Sep 17 00:00:00 2001 From: BrewTestBot <1589480+BrewTestBot@users.noreply.github.com> Date: Thu, 8 Aug 2024 05:12:06 +0000 Subject: [PATCH 2/2] opensearch: update 2.16.0 bottle. --- Formula/o/opensearch.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Formula/o/opensearch.rb b/Formula/o/opensearch.rb index ff277ea5d68ad..7d7e8dc7b34b3 100644 --- a/Formula/o/opensearch.rb +++ b/Formula/o/opensearch.rb @@ -6,13 +6,13 @@ class Opensearch < Formula license "Apache-2.0" bottle do - sha256 cellar: :any_skip_relocation, arm64_sonoma: "7009f5630e705c55d869bac1e8d71ab30c70d022f11a879a72a5a82b0524c3ba" - sha256 cellar: :any_skip_relocation, arm64_ventura: "ff23a724d03f9b84fb212fd339b28c5e94ba48ff4f621766f54a520bfce769ce" - sha256 cellar: :any_skip_relocation, arm64_monterey: "c49d88837a1f367f7cf14679fc736305e1718151a73cfff2cbdd52f771784904" - sha256 cellar: :any_skip_relocation, sonoma: "decd137e07a6c3ac8edae50e87814a8a8eaa83ba779bc911c2bff9952d4b4abf" - sha256 cellar: :any_skip_relocation, ventura: "cf920fb2a2bda3823e9e97aa521abc0507be9ac2cdf0f7808d69f0c1a9c5e065" - sha256 cellar: :any_skip_relocation, monterey: "26f99356e867594f9e3293f671822bec39f064b5bd7d4a3eea622a630257d5ba" - sha256 cellar: :any_skip_relocation, x86_64_linux: "433074e2aa4a053ee92018502ddd37bf527b27c6353a02feb810b4343d2760da" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "6657e9aed9a44d1f8ad873ba025063993ff27c19cedfb3accf26e9e2b7227764" + sha256 cellar: :any_skip_relocation, arm64_ventura: "5e07cd6a21e336ef4b6fb46c16a1e7ba1b5cbd9e3e7febcb129b4554842b291b" + sha256 cellar: :any_skip_relocation, arm64_monterey: "9f8f9cbb5a4e7078881633e263c51c53979ccaacf7ae6e77ce204ecf62c57cdf" + sha256 cellar: :any_skip_relocation, sonoma: "80fa55a1cb6f148aae3d2317d687202ed9c0a2447adce6005a0c513c610acc61" + sha256 cellar: :any_skip_relocation, ventura: "785a28e3bcccf62b5659b02f56a48d735bd4aa03c4c117f44cbad823ce3fc418" + sha256 cellar: :any_skip_relocation, monterey: "c1d072c3631235902dd651f0ebfb29a778ad78ac965cb1c065979d007f12299b" + sha256 cellar: :any_skip_relocation, x86_64_linux: "227c0b81f036114bc4a066b816e94d6b3d1dec4d83117cb149eca1e2e2911c2e" end depends_on "gradle" => :build