Merge changes I57d1b1e0,Ia9dd6e8f into stable-3.0
* changes:
Bazel: Remove re-definiton of objenesis dependency
Bazel: Remove unused derby dependency
diff --git a/WORKSPACE b/WORKSPACE
index 754231d..e1caa7a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1048,8 +1048,8 @@
# and httpasyncclient as necessary.
maven_jar(
name = "elasticsearch-rest-client",
- artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.0.0",
- sha1 = "121d12f1c71f318be1a654e8a956e38d5b68e98a",
+ artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.0.1",
+ sha1 = "bc8c679f6e53a51a99190a7a3108ab760b24bbf5",
)
JACKSON_VERSION = "2.9.8"
diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 8400d02..894c829 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -51,7 +51,7 @@
case V6_7:
return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.7.1";
case V7_0:
- return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0";
+ return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.1";
}
throw new IllegalStateException("No tests for version: " + version.name());
}
diff --git a/plugins/replication b/plugins/replication
index 6a4105d..1c82d0a 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 6a4105d7f3dc09fe2eb7cb15901178eab7723a44
+Subproject commit 1c82d0a26c43eefd1f37c1428e92ca80ea9a8be0
