From 3c7e150b83d15f25448d97de20519eac9d105ef8 Mon Sep 17 00:00:00 2001
From: David Z <38449481+dzane17@users.noreply.github.com>
Date: Tue, 7 Mar 2023 16:20:08 -0600
Subject: [PATCH 1/2] [Backport 2.x] CVE-2020-8908 Upgrade checkstyle using bad
 guava version

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
---
 build.gradle                                                 | 5 +++++
 licenses/jackson-annotations-2.14.1.jar.sha1                 | 1 -
 licenses/jackson-annotations-2.14.2.jar.sha1                 | 1 +
 licenses/jackson-databind-2.14.1.jar.sha1                    | 1 -
 licenses/jackson-databind-2.14.2.jar.sha1                    | 1 +
 licenses/jackson-module-paranamer-2.14.1.jar.sha1            | 1 -
 licenses/jackson-module-paranamer-2.14.2.jar.sha1            | 1 +
 licenses/netty-buffer-4.1.90.Final.jar.sha1                  | 1 -
 licenses/netty-buffer-4.1.91.Final.jar.sha1                  | 1 +
 licenses/netty-codec-4.1.90.Final.jar.sha1                   | 1 -
 licenses/netty-codec-4.1.91.Final.jar.sha1                   | 1 +
 licenses/netty-codec-http-4.1.90.Final.jar.sha1              | 1 -
 licenses/netty-codec-http-4.1.91.Final.jar.sha1              | 1 +
 licenses/netty-codec-http2-4.1.90.Final.jar.sha1             | 1 -
 licenses/netty-codec-http2-4.1.91.Final.jar.sha1             | 1 +
 licenses/netty-codec-socks-4.1.90.Final.jar.sha1             | 1 -
 licenses/netty-codec-socks-4.1.91.Final.jar.sha1             | 1 +
 licenses/netty-common-4.1.90.Final.jar.sha1                  | 1 -
 licenses/netty-common-4.1.91.Final.jar.sha1                  | 1 +
 licenses/netty-handler-4.1.90.Final.jar.sha1                 | 1 -
 licenses/netty-handler-4.1.91.Final.jar.sha1                 | 1 +
 licenses/netty-handler-proxy-4.1.90.Final.jar.sha1           | 1 -
 licenses/netty-handler-proxy-4.1.91.Final.jar.sha1           | 1 +
 licenses/netty-resolver-4.1.90.Final.jar.sha1                | 1 -
 licenses/netty-resolver-4.1.91.Final.jar.sha1                | 1 +
 licenses/netty-transport-4.1.90.Final.jar.sha1               | 1 -
 licenses/netty-transport-4.1.91.Final.jar.sha1               | 1 +
 .../netty-transport-native-unix-common-4.1.90.Final.jar.sha1 | 1 -
 .../netty-transport-native-unix-common-4.1.91.Final.jar.sha1 | 1 +
 licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1   | 2 +-
 30 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 licenses/jackson-annotations-2.14.1.jar.sha1
 create mode 100644 licenses/jackson-annotations-2.14.2.jar.sha1
 delete mode 100644 licenses/jackson-databind-2.14.1.jar.sha1
 create mode 100644 licenses/jackson-databind-2.14.2.jar.sha1
 delete mode 100644 licenses/jackson-module-paranamer-2.14.1.jar.sha1
 create mode 100644 licenses/jackson-module-paranamer-2.14.2.jar.sha1
 delete mode 100644 licenses/netty-buffer-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-buffer-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-codec-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-codec-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-codec-http-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-codec-http-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-codec-http2-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-codec-http2-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-codec-socks-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-codec-socks-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-common-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-common-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-handler-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-handler-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-handler-proxy-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-handler-proxy-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-resolver-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-resolver-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-transport-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-transport-4.1.91.Final.jar.sha1
 delete mode 100644 licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1
 create mode 100644 licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1

diff --git a/build.gradle b/build.gradle
index f331a2c3..f9b74fb2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,6 +47,11 @@ plugins {
 
 }
 
+checkstyle {
+    toolVersion = '9.3'
+    configFile file("checkstyle/checkstyle.xml")
+}
+
 spotbugsMain {
     excludeFilter = file("checkstyle/findbugs-exclude.xml")
     effort = 'max'
diff --git a/licenses/jackson-annotations-2.14.1.jar.sha1 b/licenses/jackson-annotations-2.14.1.jar.sha1
deleted file mode 100644
index e43faef9..00000000
--- a/licenses/jackson-annotations-2.14.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a6ad504d591a7903ffdec76b5b7252819a2d162
\ No newline at end of file
diff --git a/licenses/jackson-annotations-2.14.2.jar.sha1 b/licenses/jackson-annotations-2.14.2.jar.sha1
new file mode 100644
index 00000000..bfa80ea0
--- /dev/null
+++ b/licenses/jackson-annotations-2.14.2.jar.sha1
@@ -0,0 +1 @@
+a7aae9525864930723e3453ab799521fdfd9d873
\ No newline at end of file
diff --git a/licenses/jackson-databind-2.14.1.jar.sha1 b/licenses/jackson-databind-2.14.1.jar.sha1
deleted file mode 100644
index 0e672692..00000000
--- a/licenses/jackson-databind-2.14.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-268524b9056cae1211b9f1f52560ef19347f4d17
\ No newline at end of file
diff --git a/licenses/jackson-databind-2.14.2.jar.sha1 b/licenses/jackson-databind-2.14.2.jar.sha1
new file mode 100644
index 00000000..1e2ec2f7
--- /dev/null
+++ b/licenses/jackson-databind-2.14.2.jar.sha1
@@ -0,0 +1 @@
+01e71fddbc80bb86f71a6345ac1e8ab8a00e7134
\ No newline at end of file
diff --git a/licenses/jackson-module-paranamer-2.14.1.jar.sha1 b/licenses/jackson-module-paranamer-2.14.1.jar.sha1
deleted file mode 100644
index afc61677..00000000
--- a/licenses/jackson-module-paranamer-2.14.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-58f6c8b06f2f0e78e933f9a2594381c058abbd99
\ No newline at end of file
diff --git a/licenses/jackson-module-paranamer-2.14.2.jar.sha1 b/licenses/jackson-module-paranamer-2.14.2.jar.sha1
new file mode 100644
index 00000000..aa7942d8
--- /dev/null
+++ b/licenses/jackson-module-paranamer-2.14.2.jar.sha1
@@ -0,0 +1 @@
+1258e1272442006d5bf67331a3701d6d768bafcb
\ No newline at end of file
diff --git a/licenses/netty-buffer-4.1.90.Final.jar.sha1 b/licenses/netty-buffer-4.1.90.Final.jar.sha1
deleted file mode 100644
index 67604d11..00000000
--- a/licenses/netty-buffer-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-937eb60c19c5f5c1326b96123c9ec3d33238d4d5
\ No newline at end of file
diff --git a/licenses/netty-buffer-4.1.91.Final.jar.sha1 b/licenses/netty-buffer-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..158024bc
--- /dev/null
+++ b/licenses/netty-buffer-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+d8f180291c3501e931968ca7e40ae0323c4eacee
\ No newline at end of file
diff --git a/licenses/netty-codec-4.1.90.Final.jar.sha1 b/licenses/netty-codec-4.1.90.Final.jar.sha1
deleted file mode 100644
index c8fb04a0..00000000
--- a/licenses/netty-codec-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-9992a22c82e18b8fd4f34989535f3e504e55aa37
\ No newline at end of file
diff --git a/licenses/netty-codec-4.1.91.Final.jar.sha1 b/licenses/netty-codec-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..764a03d3
--- /dev/null
+++ b/licenses/netty-codec-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+3044b8e325e33f72c96ac1ea51dda85bef090cc0
\ No newline at end of file
diff --git a/licenses/netty-codec-http-4.1.90.Final.jar.sha1 b/licenses/netty-codec-http-4.1.90.Final.jar.sha1
deleted file mode 100644
index 861599ce..00000000
--- a/licenses/netty-codec-http-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-19bbcd46f8ee0d118486f98eff22fe665b9689e5
\ No newline at end of file
diff --git a/licenses/netty-codec-http-4.1.91.Final.jar.sha1 b/licenses/netty-codec-http-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..ca956129
--- /dev/null
+++ b/licenses/netty-codec-http-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+4519d2ff470941f0086214b19c9acf992868112f
\ No newline at end of file
diff --git a/licenses/netty-codec-http2-4.1.90.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.90.Final.jar.sha1
deleted file mode 100644
index 64caa309..00000000
--- a/licenses/netty-codec-http2-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ea3be877ea976b3d71e1a872958d32854b24db66
\ No newline at end of file
diff --git a/licenses/netty-codec-http2-4.1.91.Final.jar.sha1 b/licenses/netty-codec-http2-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..d57336af
--- /dev/null
+++ b/licenses/netty-codec-http2-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+4ee7027e1653c6ee3f843191e0d932f29e8e14e1
\ No newline at end of file
diff --git a/licenses/netty-codec-socks-4.1.90.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.90.Final.jar.sha1
deleted file mode 100644
index 2738db8a..00000000
--- a/licenses/netty-codec-socks-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7397535a4e03d2f74c71aa2282eb7a2760ffc37b
\ No newline at end of file
diff --git a/licenses/netty-codec-socks-4.1.91.Final.jar.sha1 b/licenses/netty-codec-socks-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..10d7478c
--- /dev/null
+++ b/licenses/netty-codec-socks-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+8f0a52677da411a8ab762c426d723c7f54471504
\ No newline at end of file
diff --git a/licenses/netty-common-4.1.90.Final.jar.sha1 b/licenses/netty-common-4.1.90.Final.jar.sha1
deleted file mode 100644
index afb53180..00000000
--- a/licenses/netty-common-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-43597a09382c6ae2bef469a9b3a41e8a17850638
\ No newline at end of file
diff --git a/licenses/netty-common-4.1.91.Final.jar.sha1 b/licenses/netty-common-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..deaad405
--- /dev/null
+++ b/licenses/netty-common-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+93e5056462a242718e7689d81180d125c79d7723
\ No newline at end of file
diff --git a/licenses/netty-handler-4.1.90.Final.jar.sha1 b/licenses/netty-handler-4.1.90.Final.jar.sha1
deleted file mode 100644
index c98bfb52..00000000
--- a/licenses/netty-handler-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-64f6946ce4d9189cec5341d3f5f86ac5653099b5
\ No newline at end of file
diff --git a/licenses/netty-handler-4.1.91.Final.jar.sha1 b/licenses/netty-handler-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..3e121e5d
--- /dev/null
+++ b/licenses/netty-handler-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+444cf41e4fe28c47ffebba5e77b9458a12f938a1
\ No newline at end of file
diff --git a/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1
deleted file mode 100644
index 60bde875..00000000
--- a/licenses/netty-handler-proxy-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-6ab526a43a14f7796434fa6a705c34201603235f
\ No newline at end of file
diff --git a/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1 b/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..116ed58f
--- /dev/null
+++ b/licenses/netty-handler-proxy-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+2e3e57eae1a61e4e5f558e39619186fec6c424d3
\ No newline at end of file
diff --git a/licenses/netty-resolver-4.1.90.Final.jar.sha1 b/licenses/netty-resolver-4.1.90.Final.jar.sha1
deleted file mode 100644
index b9217782..00000000
--- a/licenses/netty-resolver-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-47c415d8c83f08b820ba00e6497a6cf19dd0155f
\ No newline at end of file
diff --git a/licenses/netty-resolver-4.1.91.Final.jar.sha1 b/licenses/netty-resolver-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..bc57e2d0
--- /dev/null
+++ b/licenses/netty-resolver-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+04725d117d4b71ef0e743aa79062489b45472b26
\ No newline at end of file
diff --git a/licenses/netty-transport-4.1.90.Final.jar.sha1 b/licenses/netty-transport-4.1.90.Final.jar.sha1
deleted file mode 100644
index c7a77dbf..00000000
--- a/licenses/netty-transport-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-82d68da212f62b076c763f5efa9b072d2abc018f
\ No newline at end of file
diff --git a/licenses/netty-transport-4.1.91.Final.jar.sha1 b/licenses/netty-transport-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..2562ece3
--- /dev/null
+++ b/licenses/netty-transport-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+c2f6bd7143194ca842b535546a405c06aa993934
\ No newline at end of file
diff --git a/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1
deleted file mode 100644
index 5f954b25..00000000
--- a/licenses/netty-transport-native-unix-common-4.1.90.Final.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-e42282002cf22105e7e993651aead231246d0220
\ No newline at end of file
diff --git a/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1 b/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1
new file mode 100644
index 00000000..6f45d642
--- /dev/null
+++ b/licenses/netty-transport-native-unix-common-4.1.91.Final.jar.sha1
@@ -0,0 +1 @@
+80990b5885b8b67be096d7090cba18f05c67120e
\ No newline at end of file
diff --git a/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1 b/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1
index 81fefffc..7891734c 100644
--- a/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1
+++ b/licenses/performanceanalyzer-rca-2.7.0.0-SNAPSHOT.jar.sha1
@@ -1 +1 @@
-5b6981ded955c77a09b5f241cbbefe68e5663c24
\ No newline at end of file
+af83f32a361647a8cc232af2ff8b7414e71ee61d
\ No newline at end of file

From e0ef7db215e42466c99415a93d712c7351ea6ab7 Mon Sep 17 00:00:00 2001
From: Khushboo Rajput <khushbr@amazon.com>
Date: Mon, 17 Apr 2023 18:00:12 -0700
Subject: [PATCH 2/2] [Backport 2.x] Update CODEOWNERS and MAINTAINERS list

Signed-off-by: Khushboo Rajput <khushbr@amazon.com>
---
 .github/CODEOWNERS |  2 +-
 MAINTAINERS.md     | 37 +++++++++++++++++++++++++------------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 5c23ee8f..63e39fdc 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @opensearch-project/performance-analyzer
\ No newline at end of file
+*   @praveensameneni @khushbr @ansjcy @goyamegh @getsaurabh02 @sbcd90 @sgup432
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
index 24367b73..7f5e5d2c 100644
--- a/MAINTAINERS.md
+++ b/MAINTAINERS.md
@@ -1,12 +1,25 @@
-# OpenSearch Performance Analyzer Maintainers
-
-## Maintainers
-| Maintainer              | GitHub ID                                               | Affiliation |
-| ----------------------- | ------------------------------------------------------- | ----------- |
-| Joshua Tokle            | [jotok](https://github.com/jotok)                       | Amazon      |
-| Kunal Khatua            | [kkhatua](https://github.com/kkhatua)                   | Amazon      |
-| Ruizhen Guo             | [rguo-aws](https://github.com/rguo-aws)                 | Amazon      |
-| Sruti Parthiban         | [sruti1312](https://github.com/sruti1312)               | Amazon      |
-| Yujia Sun               | [yujias0706](https://github.com/yujias0706)             | Amazon      |
-
-[This document](https://github.com/opensearch-project/.github/blob/main/MAINTAINERS.md) explains what maintainers do in this repo, and how they should be doing it. If you're interested in contributing, see [CONTRIBUTING](CONTRIBUTING.md).
+## Overview
+
+This document contains a list of maintainers in this repo. See [opensearch-project/.github/RESPONSIBILITIES.md](https://github.com/opensearch-project/.github/blob/main/RESPONSIBILITIES.md#maintainer-responsibilities) that explains what the role of maintainer means, what maintainers do in this and other repos, and how they should be doing it. If you're interested in contributing, and becoming a maintainer, see [CONTRIBUTING](CONTRIBUTING.md).
+
+## Current Maintainers
+
+| Maintainer       | GitHub ID                                             | Affiliation |
+|------------------|-------------------------------------------------------| ----------- |
+| Praveen Sameneni | [praveensameneni](https://github.com/praveensameneni) | Amazon      |
+| Khushboo Rajput  | [khushbr](https://github.com/khushbr)                 | Amazon      |
+| Chenyang Ji      | [ansjcy](https://github.com/ansjcy)                   | Amazon      |
+| Megha Goyal      | [goyamegh](https://github.com/goyamegh)               | Amazon      |
+| Saurabh Singh    | [getsaurabh02](https://github.com/getsaurabh02)       | Amazon      |
+| Subhobrata Dey   | [sbcd90](https://github.com/sbcd90)                   | Amazon      |
+| Sagar            | [sgup432](https://github.com/sgup432)                 | Amazon      |
+
+## Previous Maintainers
+
+| Maintainer      | GitHub ID                                   | Affiliation |
+|-----------------|---------------------------------------------|-------------|
+| Joshua Tokle    | [jotok](https://github.com/jotok)           | Amazon      |
+| Ruizhen Guo     | [rguo-aws](https://github.com/rguo-aws)     | Amazon      |
+| Yujia Sun       | [yujias0706](https://github.com/yujias0706) | Amazon      |
+| Kunal Khatua    | [kkhatua](https://github.com/kkhatua)       | Amazon      |
+| Sruti Parthiban | [sruti1312](https://github.com/sruti1312)   | Amazon      |