From 99ff71289e6cc29231d0e9dce40c5a8686ba91a5 Mon Sep 17 00:00:00 2001
From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com>
Date: Mon, 24 Jul 2023 20:09:24 +0000
Subject: [PATCH 1/2] opensearch-2/2.9.0 package update

---
 opensearch-2.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/opensearch-2.yaml b/opensearch-2.yaml
index ff4a8da5a46..5466612f185 100644
--- a/opensearch-2.yaml
+++ b/opensearch-2.yaml
@@ -1,7 +1,7 @@
 package:
   name: opensearch-2
-  version: "2.8.0"
-  epoch: 1
+  version: 2.9.0
+  epoch: 0
   description:
   target-architecture:
     - all
@@ -29,7 +29,7 @@ pipeline:
     with:
       repository: https://github.com/opensearch-project/OpenSearch
       tag: ${{package.version}}
-      expected-commit: db90a415ff2fd428b4f7b3f800a51dc229287cb4
+      expected-commit: 1164221ee2b8ba3560f0ff492309867beea28433
 
   - runs: |
       export LANG=en_US.UTF-8

From 527a8da29c50024325855571b7b993803b64bfd7 Mon Sep 17 00:00:00 2001
From: Ajay Kemparaj <ajaykemparaj@gmail.com>
Date: Mon, 24 Jul 2023 14:30:09 -0700
Subject: [PATCH 2/2] upstream addressed net changes

https://github.com/opensearch-project/OpenSearch/compare/2.8.0...2.9.0#diff-ffefe72fc1ee096585e9d66d31384a4c489667cdc2e4a752e9c3183eaad6621fR30

Signed-off-by: Ajay Kemparaj <ajaykemparaj@gmail.com>
---
 opensearch-2.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/opensearch-2.yaml b/opensearch-2.yaml
index 5466612f185..341bc16a753 100644
--- a/opensearch-2.yaml
+++ b/opensearch-2.yaml
@@ -35,12 +35,8 @@ pipeline:
       export LANG=en_US.UTF-8
       export JAVA_HOME=/usr/lib/jvm/java-11-openjdk
 
-      # Bump netty to resolve GHSA-6mjq-h674-j845
-      sed -i "s/4.1.91.Final/4.1.94.Final/g" buildSrc/version.properties
-
       gradle localDistro
 
-
       mkdir -p ${{targets.destdir}}/usr/share/opensearch/logs
 
       install -dm777 ${{targets.destdir}}/usr/share/opensearch/