Skip to content

Commit 5233f5f

Browse files
BrewTestBotchenrui333
authored andcommitted
opensearch 2.15.0
opensearch: fix gradle compatibility Signed-off-by: Rui Chen <rui@chenrui.dev>
1 parent 0985900 commit 5233f5f

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

Formula/o/opensearch.rb

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
class Opensearch < Formula
22
desc "Open source distributed and RESTful search engine"
33
homepage "https://github.com/opensearch-project/OpenSearch"
4-
url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/2.14.0.tar.gz"
5-
sha256 "72eab7e3882e3dd8d16aad39d077b46576ef583e267c6ccdfe3bffdd429ff6fb"
4+
url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/2.15.0.tar.gz"
5+
sha256 "047f0c26ec3ae54f6b0213d7191c346290c9d4ac2b8a6d21b0d947f9d36b83a6"
66
license "Apache-2.0"
77

88
bottle do
@@ -18,6 +18,9 @@ class Opensearch < Formula
1818
depends_on "gradle" => :build
1919
depends_on "openjdk"
2020

21+
# upstream patch PR, https://github.com/opensearch-project/OpenSearch/pull/14182
22+
patch :DATA
23+
2124
def install
2225
platform = OS.kernel_name.downcase
2326
platform += "-arm64" if Hardware::CPU.arm?
@@ -106,3 +109,18 @@ def caveats
106109
system "#{bin}/opensearch-plugin", "list"
107110
end
108111
end
112+
113+
__END__
114+
diff --git a/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java
115+
index 448ba8a..669a67e 100644
116+
--- a/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java
117+
+++ b/buildSrc/src/main/java/org/opensearch/gradle/info/GlobalBuildInfoPlugin.java
118+
@@ -199,7 +199,7 @@ public class GlobalBuildInfoPlugin implements Plugin<Project> {
119+
}
120+
121+
private JvmInstallationMetadata getJavaInstallation(File javaHome) {
122+
- final InstallationLocation location = new InstallationLocation(javaHome, "Java home");
123+
+ final InstallationLocation location = InstallationLocation.userDefined(javaHome, "Java home");
124+
125+
try {
126+
try {

0 commit comments

Comments
 (0)