Merge branch 'main' of github.com:opensearch-project/reporting into f…

…ail-backport

Signed-off-by: Derek Ho <[email protected]>

.github/CODEOWNERS

@@ -1,2 +1,2 @@
 # This should match the owning team set up in https://github.com/orgs/opensearch-project/teams
-*   @pjfitzgibbons @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az
+*   @pjfitzgibbons @ps48 @kavithacm @derek-ho @joshuali925 @dai-chen @YANG-DB @rupal-bq @mengweieric @vamsi-amazon @swiddis @penghuo @seankao-az @anirudha

.github/workflows/maven-publish.yml

@@ -5,8 +5,8 @@ on:
   push:
     branches:
       - main
-      - '1.3'
-      - 2.x
+      - 1.*
+      - 2.*
 
 jobs:
   build-and-publish-snapshots:
@@ -32,4 +32,4 @@ jobs:
           export SONATYPE_PASSWORD=$(aws secretsmanager get-secret-value --secret-id maven-snapshots-password --query SecretString --output text)
           echo "::add-mask::$SONATYPE_USERNAME"
           echo "::add-mask::$SONATYPE_PASSWORD"
-          ./gradlew publishPluginZipPublicationToSnapshotsRepository
+          ./gradlew publishPluginZipPublicationToSnapshotsRepository

MAINTAINERS.md

@@ -19,14 +19,14 @@ This document contains a list of maintainers in this repo. See [opensearch-proje
 | Vamsi Manohar     | [vamsi-amazon](https://github.com/vamsi-amazon)   | Amazon      |
 | Peng Huo          | [penghuo](https://github.com/penghuo)             | Amazon      |
 | Sean Kao          | [seankao-az](https://github.com/seankao-az)       | Amazon      |
+| Anirudha Jadhav   | [anirudha](https://github.com/anirudha)           | Amazon      |
 
 
 ## Emeritus Maintainers
 
 | Maintainer        | GitHub ID                                               | Affiliation |
 | ----------------- | ------------------------------------------------------- | ----------- |
 | Charlotte Henkle  | [CEHENKLE](https://github.com/CEHENKLE)                 | Amazon      |
-| Anirudha Jadhav   | [anirudha](https://github.com/anirudha)                 | Amazon      |
 | Nick Knize        | [nknize](https://github.com/nknize)                     | Amazon      |
 | David Cui         | [davidcui1225](https://github.com/davidcui1225)         | Amazon      |
 | Eugene Lee        | [eugenesk24](https://github.com/eugenesk24)             | Amazon      |

build.gradle

@@ -325,12 +325,12 @@ testClusters.integTest {
 }
 
 // For job-scheduler and reports-scheduler, the latest opensearch releases appear to be 1.1.0.0.
-String baseVersion = "2.8.0"
+String baseVersion = "2.9.0"
 String bwcVersion = baseVersion + ".0"
 String baseName = "reportsSchedulerBwcCluster"
 String bwcFilePath = "src/test/resources/bwc"
-String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=$bwcVersion-SNAPSHOT&p=zip"
-String bwcReportsSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=$bwcVersion-SNAPSHOT&p=zip"
+String bwcJobSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-job-scheduler&v=$bwcVersion-SNAPSHOT&p=zip"
+String bwcReportsSchedulerURL = "https://aws.oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=org.opensearch.plugin&a=opensearch-reports-scheduler&v=$bwcVersion-SNAPSHOT&p=zip"
 
 2.times {i ->
     testClusters {

release-notes/opensearch-reporting.release-notes-2.8.0.0.md

@@ -0,0 +1,11 @@
+## Version 2.8.0.0 Release Notes
+
+Compatible with OpenSearch 2.8.0
+
+### Bug Fixes
+* Update json version to 20230227 ([#692](https://github.com/opensearch-project/reporting/pull/692))
+* Update Gradle Wrapper to 7.6.1 ([#695](https://github.com/opensearch-project/reporting/pull/695))
+* Removing guava dependency to fix jarhell ([#709](https://github.com/opensearch-project/reporting/pull/709))
+
+### Maintenance
+* Increment version to 2.8.0-SNAPSHOT ([#688](https://github.com/opensearch-project/reporting/pull/688))

release-notes/opensearch-reporting.release-notes-2.9.0.0.md

@@ -0,0 +1,9 @@
+## Version 2.9.0.0 Release Notes
+
+Compatible with OpenSearch 2.9.0
+
+### Bug Fixes
+* Removing guava dependency to fix jarhell ([#709](https://github.com/opensearch-project/reporting/pull/709))
+
+### Maintenance
+* Increment version to 2.9.0-SNAPSHOT ([#712](https://github.com/opensearch-project/reporting/pull/712))