commit 2bd5e459ea46ae47ca9a24c9006a2c8a256bcd58
author Dave Borowitz <dborowitz@google.com> Thu Apr 18 13:56:49 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 18 13:56:49 2019 +0000
tree b14be33fbdc5384c576b44cc60a9b6d84a07f708
parent a93ac138063f5c32c469264c3229348753850782
parent 7c393c8fa4124f343a85dc837418e0bf69d019d3

Merge changes from topic "exceptions"

* changes:
  Submit: Do not request fields from index when computing topic size
  OnlineReindexer: Catch all RuntimeExceptions at top level
  ChangeData: Remove remaining throws clauses
  Throw StorageException instead of IOException from Indexers
  Throw StorageException instead of IOException from Index
  Remove StorageException catch clauses from httpd
  Remove StorageException catch clauses from gpg
  Remove StorageException catch clauses from elasticsearch
  Remove StorageException catch clauses from Prolog predicates
  Remove StorageException from throws clauses
  Make StorageException a RuntimeException
  Rename OrmException to StorageException and move to exceptions package
  Rename common.errors package to exceptions

javatests/com/google/gerrit/elasticsearch/ElasticContainer.java

diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 479788a..8400d02 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-rc2";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }

javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java

diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
index 0ce66e8..f01138a 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticV6QueryProjectsTest.java
@@ -41,7 +41,7 @@
       return;
     }
 
-    container = ElasticContainer.createAndStart(ElasticVersion.V6_2);
+    container = ElasticContainer.createAndStart(ElasticVersion.V6_7);
     nodeInfo = new ElasticNodeInfo(container.getHttpHost().getPort());
   }