diff --git a/opensearch-3.yaml b/opensearch-3.yaml index 7e52cdce10b..a59bf8c25b0 100644 --- a/opensearch-3.yaml +++ b/opensearch-3.yaml @@ -4,8 +4,8 @@ # same version they are installed into. package: name: opensearch-3 - version: "3.2.0" - epoch: 1 + version: "3.3.0" + epoch: 0 description: Open source distributed and RESTful search engine. copyright: - license: Apache-2.0 @@ -86,13 +86,7 @@ pipeline: with: repository: https://github.com/opensearch-project/OpenSearch tag: ${{package.version}} - expected-commit: 6adc0bf476e1624190564d7fbe4aba00ccf49ad8 - - - uses: patch - with: - patches: GHSA-3p8m-j85q-pgmj-netty-fix.patch - - - uses: auth/gradle + expected-commit: e972d15408320e6be84c64bb0fdc076ca7696ea2 - runs: | echo "org.gradle.daemon=false" >> gradle.properties diff --git a/opensearch-3/GHSA-3p8m-j85q-pgmj-netty-fix.patch b/opensearch-3/GHSA-3p8m-j85q-pgmj-netty-fix.patch deleted file mode 100644 index 82c3d9f15cc..00000000000 --- a/opensearch-3/GHSA-3p8m-j85q-pgmj-netty-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml -index 24f128885f4..f48f9a737e1 100644 ---- a/gradle/libs.versions.toml -+++ b/gradle/libs.versions.toml -@@ -33,7 +33,7 @@ json_smart = "2.5.2" - # when updating the JNA version, also update the version in buildSrc/build.gradle - jna = "5.16.0" - --netty = "4.1.121.Final" -+netty = "4.1.125.Final" - joda = "2.12.7" - roaringbitmap = "1.3.0" -