From d498c65f527e4782e1aad67f1cfe39d871bc78d7 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 12:01:11 -0400
Subject: [PATCH] Add newer versions of server to compatibility matrix (#635)
 (#643)

* Add newer versions of server to compatibility matrix



* Fixing tests with >=2.9.0 and adding 2.10.0 to compatibility matrix



---------


(cherry picked from commit 063db02366dd106f5d8327b33334bf4dd9c6be4f)

Signed-off-by: Vacha Shah <vachshah@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .github/workflows/test-integration.yml                 |  5 ++++-
 COMPATIBILITY.md                                       | 10 ++--------
 .../integTest/OpenSearchJavaClientTestCase.java        |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml
index 2aa32ecb2d..2961130bdf 100644
--- a/.github/workflows/test-integration.yml
+++ b/.github/workflows/test-integration.yml
@@ -12,7 +12,7 @@ jobs:
           - { opensearch_version: 1.0.1, java: 11 }
           - { opensearch_version: 1.1.0, java: 11 }
           - { opensearch_version: 1.2.4, java: 11 }
-          - { opensearch_version: 1.3.9, java: 11 }
+          - { opensearch_version: 1.3.13, java: 11 }
           - { opensearch_version: 2.0.1, java: 11 }
           - { opensearch_version: 2.1.0, java: 11 }
           - { opensearch_version: 2.2.1, java: 11 }
@@ -21,6 +21,9 @@ jobs:
           - { opensearch_version: 2.5.0, java: 11 }
           - { opensearch_version: 2.6.0, java: 11 }
           - { opensearch_version: 2.7.0, java: 11 }
+          - { opensearch_version: 2.8.0, java: 11 }
+          - { opensearch_version: 2.9.0, java: 11 }
+          - { opensearch_version: 2.10.0, java: 11 }
     steps:
       - name: Checkout Java Client
         uses: actions/checkout@v3
diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md
index 0a1ec94bc8..d528d976aa 100644
--- a/COMPATIBILITY.md
+++ b/COMPATIBILITY.md
@@ -7,14 +7,8 @@ The below matrix shows the compatibility of the [`opensearch-java-client`](https
 
 | Client Version | OpenSearch Version |
 |----------------|--------------------|
-| 1.0.0          | 1.0.0-1.3.9        |
-| 2.0.0          | 1.3.9-2.0.1        |
-| 2.1.0          | 1.3.9-2.3.0        |
-| 2.2.0          | 1.3.9-2.5.0        |
-| 2.3.0          | 1.3.9-2.7.0        |
-| 2.4.0          | 1.3.9-2.7.0        |
-| 2.5.0          | 1.3.9-2.7.0        |
-| 2.6.0          | 1.3.9-2.7.0        |
+| 1.0.0          | 1.x                |
+| 2.x.0          | 1.3.13-2.10.0       |
 
 ## Upgrading
 
diff --git a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java
index 7cae6e2599..a5511840a7 100644
--- a/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java
+++ b/java-client/src/test/java/org/opensearch/client/opensearch/integTest/OpenSearchJavaClientTestCase.java
@@ -39,7 +39,7 @@
 import java.util.TreeSet;
 
 public abstract class OpenSearchJavaClientTestCase extends OpenSearchRestTestCase implements OpenSearchTransportSupport {
-    private static final List<String> systemIndices = List.of(".opensearch-observability", ".opendistro_security");
+    private static final List<String> systemIndices = List.of(".opensearch-observability", ".opendistro_security", ".plugins-ml-config");
     private static OpenSearchClient javaClient;
     private static OpenSearchClient adminJavaClient;