commit 2a84138f06e0579991c6f3673015b491b4d3e081
author Dave Borowitz <dborowitz@google.com> Fri Dec 07 15:53:55 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 07 15:53:55 2018 +0000
tree bd81df258babfdfd362e76158641347c766c152d
parent 85c27dba2aaea76fc3b7bc92be0ec25e7ca5184e
parent d54fc0bb5902920568b1dbdef5fff81e0923baba

Merge "Bump gwtorm to 1.20"

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index f0bdc70..fe1f341c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -191,9 +191,9 @@
 
 maven_jar(
     name = "gwtorm-client",
-    artifact = "com.google.gerrit:gwtorm:1.18",
-    sha1 = "f326dec463439a92ccb32f05b38345e21d0b5ecf",
-    src_sha1 = "e0b973d5cafef3d145fa80cdf032fcead1186d29",
+    artifact = "com.google.gerrit:gwtorm:1.20",
+    sha1 = "a4809769b710bc8ce3f203125630b8419f0e58b0",
+    src_sha1 = "cb63296276ce3228b2d83a37017a99e38ad8ed42",
 )
 
 maven_jar(

java/com/google/gerrit/testing/GerritBaseTests.java

diff --git a/java/com/google/gerrit/testing/GerritBaseTests.java b/java/com/google/gerrit/testing/GerritBaseTests.java
index 01fb85d..8f3a6a8 100644
--- a/java/com/google/gerrit/testing/GerritBaseTests.java
+++ b/java/com/google/gerrit/testing/GerritBaseTests.java
@@ -16,7 +16,7 @@
 
 import com.google.common.base.CharMatcher;
 import com.google.gwtorm.client.KeyUtil;
-import com.google.gwtorm.server.StandardKeyEncoder;
+import com.google.gwtorm.client.StandardKeyEncoder;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;

plugins/replication

diff --git a/plugins/replication b/plugins/replication
index 3ce09db..05b0999 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 3ce09db0cae09038f2924f1ff8f097e6c91c7a1e
+Subproject commit 05b0999845151b230d8fe0c38d43cd39bcba8093