From 0dac5bcb279e10ee3fc268e032b5ac7fcbb9a59c Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Fri, 22 Sep 2023 18:32:33 +0000 Subject: [PATCH 1/2] Add newer versions of server to compatibility matrix Signed-off-by: Vacha Shah --- .github/workflows/test-integration.yml | 4 +++- COMPATIBILITY.md | 10 ++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 2aa32ecb2d..e83e831214 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,8 @@ 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 } steps: - name: Checkout Java Client uses: actions/checkout@v3 diff --git a/COMPATIBILITY.md b/COMPATIBILITY.md index 0a1ec94bc8..a18f19c99d 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.9.0 | ## Upgrading From b3ae58d94fbdbde088a4f47a0d3f1134b4ce0b9f Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Fri, 29 Sep 2023 06:19:44 +0000 Subject: [PATCH 2/2] Fixing tests with >=2.9.0 and adding 2.10.0 to compatibility matrix Signed-off-by: Vacha Shah --- .github/workflows/test-integration.yml | 1 + COMPATIBILITY.md | 2 +- .../opensearch/integTest/OpenSearchJavaClientTestCase.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index e83e831214..2961130bdf 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -23,6 +23,7 @@ jobs: - { 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 a18f19c99d..d528d976aa 100644 --- a/COMPATIBILITY.md +++ b/COMPATIBILITY.md @@ -8,7 +8,7 @@ The below matrix shows the compatibility of the [`opensearch-java-client`](https | Client Version | OpenSearch Version | |----------------|--------------------| | 1.0.0 | 1.x | -| 2.x.0 | 1.3.13-2.9.0 | +| 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 38a053b63a..e62416c64f 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 @@ -47,7 +47,7 @@ import javax.net.ssl.SSLEngine; public abstract class OpenSearchJavaClientTestCase extends OpenSearchRestTestCase implements OpenSearchTransportSupport { - private static final List systemIndices = List.of(".opensearch-observability", ".opendistro_security"); + private static final List systemIndices = List.of(".opensearch-observability", ".opendistro_security", ".plugins-ml-config"); private static OpenSearchClient javaClient; private static OpenSearchClient adminJavaClient;