From 8f7bfc0de23964e33d438a959c87a2a1c31ed72a Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Sat, 15 Aug 2020 16:21:07 -0500
Subject: [PATCH 1/4] [ci] update Elasticsearch versions in CI and docs

---
 .ci/seed_es_on_travis.sh | 16 +++++++++++++++-
 .travis.yml              | 30 ++++++++++++++++++++++++++++--
 CONTRIBUTING.md          |  6 ++++--
 setup_local.sh           |  6 +++---
 4 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/.ci/seed_es_on_travis.sh b/.ci/seed_es_on_travis.sh
index 3d4bd2c..4962337 100755
--- a/.ci/seed_es_on_travis.sh
+++ b/.ci/seed_es_on_travis.sh
@@ -50,7 +50,7 @@ case "$ES_VERSION" in
       export ES_BINARY_URL="${ES5PLUS_ARCHIVE}/elasticsearch-$ES_VERSION.deb"
       ;;
 
-    "6.8.8")
+    "6.8.11")
       export MAPPING_FILE=${ES6_MAPPING_FILE};
       export ES_BINARY_URL="${ES5PLUS_ARCHIVE}/elasticsearch-$ES_VERSION.deb"
       ;;
@@ -103,6 +103,20 @@ case "$ES_VERSION" in
       # overwrite SAMPLE_DATA_FILE to use the ES7-compliant data
       export SAMPLE_DATA_FILE="${ES7_SAMPLE_DATA_FILE}"
       ;;
+
+    "7.7.1")
+      export MAPPING_FILE=${ES7_MAPPING_FILE};
+      export ES_BINARY_URL="${ES5PLUS_ARCHIVE}/elasticsearch-$ES_VERSION-amd64.deb"
+      # overwrite SAMPLE_DATA_FILE to use the ES7-compliant data
+      export SAMPLE_DATA_FILE="${ES7_SAMPLE_DATA_FILE}"
+      ;;
+
+    "7.8.1")
+      export MAPPING_FILE=${ES7_MAPPING_FILE};
+      export ES_BINARY_URL="${ES5PLUS_ARCHIVE}/elasticsearch-$ES_VERSION-amd64.deb"
+      # overwrite SAMPLE_DATA_FILE to use the ES7-compliant data
+      export SAMPLE_DATA_FILE="${ES7_SAMPLE_DATA_FILE}"
+      ;;
    esac
 
 # pull the binary
diff --git a/.travis.yml b/.travis.yml
index f03febf..c5dc3a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ matrix:
       warnings_are_errors: true
       cache: packages
       env:
-        - ES_VERSION=6.8.8
+        - ES_VERSION=6.8.11
         - TASK=rpkg
     - language: r
       warnings_are_errors: true
@@ -98,6 +98,22 @@ matrix:
         - TASK=rpkg
       after_success:
         - .ci/report_to_covr.sh
+    - language: r
+      warnings_are_errors: true
+      cache: packages
+      env:
+        - ES_VERSION=7.7.1
+        - TASK=rpkg
+      after_success:
+        - .ci/report_to_covr.sh
+    - language: r
+      warnings_are_errors: true
+      cache: packages
+      env:
+        - ES_VERSION=7.8.1
+        - TASK=rpkg
+      after_success:
+        - .ci/report_to_covr.sh
     #################
     # Python builds #
     #################
@@ -129,7 +145,7 @@ matrix:
     - language: python
       python: 3.5
       env:
-        - ES_VERSION=6.8.8
+        - ES_VERSION=6.8.11
         - TASK=pypkg
     - language: python
       python: 3.5
@@ -166,3 +182,13 @@ matrix:
       env:
         - ES_VERSION=7.6.2
         - TASK=pypkg
+    - language: python
+      python: 3.5
+      env:
+        - ES_VERSION=7.7.1
+        - TASK=pypkg
+    - language: python
+      python: 3.5
+      env:
+        - ES_VERSION=7.8.1
+        - TASK=pypkg
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 39de2e5..e37a13e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -89,14 +89,14 @@ The set of Elasticsearch versions this project tests against changes regularly a
 
 > `uptasticsearch` may be tested against specific additional intermediate versions if bugs are found in the interaction between `uptasticsearch` and those versions
 
-So, for example, as of April 2020 that meant we tested against:
+So, for example, as of August 2020 that meant we tested against:
 
 * 1.0.0
 * 1.7.6
 * 2.4.6
 * 5.6.16
 * 6.0.1
-* 6.8.8
+* 6.8.11
 * 7.0.1
 * 7.1.1
 * 7.2.1
@@ -104,6 +104,8 @@ So, for example, as of April 2020 that meant we tested against:
 * 7.4.2
 * 7.5.2
 * 7.6.2
+* 7.7.1
+* 7.8.1
 
 You may notice that this strategy means that `uptasticsearch` is tested for backwards compatibility with Elasticsearch versions which have already reached [End-of-Life](https://www.elastic.co/support/eol). For example, support for Elasticsearch 1.7.x officially ended in January 2017. We test these old versions because we know of users whose companies still run those versions, and for whom Elasticsearch upgrades are prohibitively expensive. In general, upgrades across major versions pre-6.x [require a full cluster restart](https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html).
 
diff --git a/setup_local.sh b/setup_local.sh
index 2a8d3f0..df62f4d 100755
--- a/setup_local.sh
+++ b/setup_local.sh
@@ -40,13 +40,13 @@ case "${MAJOR_VERSION}" in
 6.8) docker run -d -p 9200:9200 \
           -e "discovery.type=single-node" \
           -e "xpack.security.enabled=false" \
-          docker.elastic.co/elasticsearch/elasticsearch:6.8.8
+          docker.elastic.co/elasticsearch/elasticsearch:6.8.11
      MAPPING_FILE=$(pwd)/test-data/es6_shakespeare_mapping.json
      ;;
-7.6) docker run -d -p 9200:9200 \
+7.8) docker run -d -p 9200:9200 \
           -e "discovery.type=single-node" \
           -e "xpack.security.enabled=false" \
-          docker.elastic.co/elasticsearch/elasticsearch:7.6.2
+          docker.elastic.co/elasticsearch/elasticsearch:7.8.1
      MAPPING_FILE=$(pwd)/test-data/es7_shakespeare_mapping.json
      SAMPLE_DATA_FILE=$(pwd)/test-data/sample_es7.json
     ;;

From 09d8c1dd13bc5404076312ae3a7ab663b43d1ebd Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Mon, 17 Aug 2020 22:06:16 -0500
Subject: [PATCH 2/4] empty commit


From b3edd20f2c64eee3bc1389fa971c26244983b877 Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Sat, 22 Aug 2020 21:44:39 -0500
Subject: [PATCH 3/4] empty commit


From 1ea84a7a6958f49a860742f33a509635c1ceac8c Mon Sep 17 00:00:00 2001
From: James Lamb <jaylamb20@gmail.com>
Date: Sat, 22 Aug 2020 21:45:13 -0500
Subject: [PATCH 4/4] empty commit