diff --git a/Formula/o/opensearch.rb b/Formula/o/opensearch.rb index e2e47c11c3e19..0c0a5b308037e 100644 --- a/Formula/o/opensearch.rb +++ b/Formula/o/opensearch.rb @@ -1,31 +1,24 @@ 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.19.2.tar.gz" - sha256 "660eaf0958e79198c3f5483361b70a1f7618ae965955d25f2ca48ca2d113ed18" + url "https://github.com/opensearch-project/OpenSearch/archive/refs/tags/3.0.0.tar.gz" + sha256 "5701c0a0e801a27cb1fb6521c17138c43a0933e364fa2cfb5a62cfcdcb4e1270" license "Apache-2.0" bottle do - sha256 cellar: :any_skip_relocation, arm64_sequoia: "2dc6a9a9df5ecb31dc045f765c6fa4a725793d91b70595861ad3f11b3b0064a7" - sha256 cellar: :any_skip_relocation, arm64_sonoma: "88975f6160f4a89fc9493e6c889b8b698dec4028a527bfa68da32214c1ba1bbb" - sha256 cellar: :any_skip_relocation, arm64_ventura: "ec9dce75fab4820d576da5b88bc86cdc3247824f1bad98f6e9333eadc09c5597" - sha256 cellar: :any_skip_relocation, sonoma: "668204234f0812989aa2e7ffc52661c578e3ac935b952907be2260554cfc3ac9" - sha256 cellar: :any_skip_relocation, ventura: "15d0a18e26c272146a86425d0ce5c2dbf1c5c433aab352db783e46b66ee17795" - sha256 cellar: :any_skip_relocation, arm64_linux: "ffd1eddbab1e73489038703ac8ef8c6beadd30b054f830c85d21454adfd3e39e" - sha256 cellar: :any_skip_relocation, x86_64_linux: "c24ab6ddd1a235545f34efa48bb75be5e607590bd6929acc9ab6b343fc9e8f32" + sha256 cellar: :any_skip_relocation, arm64_sequoia: "02c7d73c1f51d079efc702aeabc45e840dfbd6f9c3e3a5d5d39845b7e084f9b9" + sha256 cellar: :any_skip_relocation, arm64_sonoma: "08a110cc034a792732c5612adfa6879b8d0cd360d0abb538f4987be274bdf829" + sha256 cellar: :any_skip_relocation, arm64_ventura: "3ff98574221a06111ee8663c5a55f9de0661b3275f85c93fea08cc4b93a21abb" + sha256 cellar: :any_skip_relocation, sonoma: "9ac2af223ccdc1bc9df151bd53e56415c3ea5a3dd664e9ff6efd32734df83974" + sha256 cellar: :any_skip_relocation, ventura: "7316664aaad936f205d760e5e3292b3f567723d05acd4eaf7cf3c7818333a60b" + sha256 cellar: :any_skip_relocation, arm64_linux: "2af72cc2f707be2ca3ea709fbf1e597a923e4daa7a3e5610178bb697bb022eb8" + sha256 cellar: :any_skip_relocation, x86_64_linux: "c7f8b518e5898e1af368400a5053ee50e2df258bc05de53dfcc8549ffffab46f" end depends_on "gradle" => :build # Can be updated after https://github.com/opensearch-project/OpenSearch/pull/18085 is released. depends_on "openjdk@21" - # Remove below patches after https://github.com/opensearch-project/OpenSearch/pull/17942 is released. - patch :DATA - patch do - url "https://github.com/opensearch-project/OpenSearch/commit/d3eb8fe5e85f1103d73410703269a0f967ad3ec2.patch?full_index=1" - sha256 "f9c91e12cdbcb8625bcc704d34d6d10bdfc94aa86395faa6293bdf41d030cfe8" - end - def install platform = OS.kernel_name.downcase platform += "-arm64" if Hardware::CPU.arm? @@ -37,7 +30,7 @@ def install Dir["../distribution/archives/no-jdk-#{platform}-tar/build/distributions/opensearch-*.tar.gz"].first # Install into package directory - libexec.install "bin", "lib", "modules" + libexec.install "bin", "lib", "modules", "agent" # Set up Opensearch for local development: inreplace "config/opensearch.yml" do |s| @@ -103,11 +96,9 @@ def caveats port = free_port (testpath/"data").mkdir (testpath/"logs").mkdir - fork do - exec bin/"opensearch", "-Ehttp.port=#{port}", - "-Epath.data=#{testpath}/data", - "-Epath.logs=#{testpath}/logs" - end + spawn bin/"opensearch", "-Ehttp.port=#{port}", + "-Epath.data=#{testpath}/data", + "-Epath.logs=#{testpath}/logs" sleep 60 output = shell_output("curl -s -XGET localhost:#{port}/") assert_equal "opensearch", JSON.parse(output)["version"]["distribution"] @@ -115,81 +106,3 @@ def caveats system bin/"opensearch-plugin", "list" end end - -__END__ -diff --git a/build.gradle b/build.gradle -index 679f7b9299248fb0f5173db8fccdfb77965e394b..187574da9e62aec063548871f5dc1a7fbf62a082 100644 ---- a/build.gradle -+++ b/build.gradle -@@ -721,7 +721,7 @@ subprojects { - reporting { - reports { - testAggregateTestReport(AggregateTestReport) { -- testType = TestSuiteType.UNIT_TEST -+ testSuiteName = "test" - } - } - } -diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle -index 113ab8aced60b29406c60a80ae2097505eb9923b..b94431c63c96467fa75ba7cc607391997dd287fc 100644 ---- a/distribution/packages/build.gradle -+++ b/distribution/packages/build.gradle -@@ -63,7 +63,7 @@ import java.util.regex.Pattern - */ - - plugins { -- id "com.netflix.nebula.ospackage-base" version "11.10.1" -+ id "com.netflix.nebula.ospackage-base" version "11.11.2" - } - - void addProcessFilesTask(String type, boolean jdk) { -diff --git a/gradle/code-coverage.gradle b/gradle/code-coverage.gradle -index eb27dd1a76634251bceafd6fefbafd65eafd5c66..1e41f12e1cc48de3ec9bcd0078f348f3a30af8f3 100644 ---- a/gradle/code-coverage.gradle -+++ b/gradle/code-coverage.gradle -@@ -38,7 +38,7 @@ if (System.getProperty("tests.coverage")) { - reporting { - reports { - testCodeCoverageReport(JacocoCoverageReport) { -- testType = TestSuiteType.UNIT_TEST -+ testSuiteName = "test" - } - } - } -diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties -index c51246f2815f5294bd8a51b3ac25c19964577ac1..95e1a2f213a063c0f371f4eab8e67ba860be7baa 100644 ---- a/gradle/wrapper/gradle-wrapper.properties -+++ b/gradle/wrapper/gradle-wrapper.properties -@@ -11,7 +11,7 @@ - - distributionBase=GRADLE_USER_HOME - distributionPath=wrapper/dists --distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip -+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip - zipStoreBase=GRADLE_USER_HOME - zipStorePath=wrapper/dists --distributionSha256Sum=296742a352f0b20ec14b143fb684965ad66086c7810b7b255dee216670716175 -+distributionSha256Sum=fba8464465835e74f7270bbf43d6d8a8d7709ab0a43ce1aa3323f73e9aa0c612 -diff --git a/gradlew b/gradlew -index f5feea6d6b116baaca5a2642d4d9fa1f47d574a7..faf93008b77e7b52e18c44e4eef257fc2f8fd76d 100755 ---- a/gradlew -+++ b/gradlew -@@ -86,8 +86,7 @@ done - # shellcheck disable=SC2034 - APP_BASE_NAME=${0##*/} - # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) --APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s --' "$PWD" ) || exit -+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit - - # Use the maximum available, or set MAX_FD != -1 to use that value. - MAX_FD=maximum -@@ -206,7 +205,7 @@ fi - DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - - # Collect all arguments for the java command: --# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, -+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, - # and any embedded shellness will be escaped. - # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be - # treated as '${Hostname}' itself on the command line.