diff --git a/WORKSPACE b/WORKSPACE
index ed72d90..043aafb 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-adminSshCommand/WORKSPACE b/example-adminSshCommand/WORKSPACE
index 41e4515..39d5a72 100644
--- a/example-adminSshCommand/WORKSPACE
+++ b/example-adminSshCommand/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-adminSshCommand/pom.xml b/example-adminSshCommand/pom.xml
index db2cccb..5c13154 100644
--- a/example-adminSshCommand/pom.xml
+++ b/example-adminSshCommand/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-adminSshCommand</artifactId>
diff --git a/example-changeHasOperator/WORKSPACE b/example-changeHasOperator/WORKSPACE
index 2da52e1..f015c41 100644
--- a/example-changeHasOperator/WORKSPACE
+++ b/example-changeHasOperator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeHasOperator/pom.xml b/example-changeHasOperator/pom.xml
index 41d2dfe..17b09c6 100644
--- a/example-changeHasOperator/pom.xml
+++ b/example-changeHasOperator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-changeHasOperator</artifactId>
diff --git a/example-changeOperator/WORKSPACE b/example-changeOperator/WORKSPACE
index 5b01685..cd7be2b 100644
--- a/example-changeOperator/WORKSPACE
+++ b/example-changeOperator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeOperator/pom.xml b/example-changeOperator/pom.xml
index 0ca8b85..fe91635 100644
--- a/example-changeOperator/pom.xml
+++ b/example-changeOperator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-changeOperator</artifactId>
diff --git a/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java b/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java
index 093344d..6c1319c 100644
--- a/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java
+++ b/example-changeOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changeoperator/SampleOperator.java
@@ -17,7 +17,7 @@
 import com.google.gerrit.index.query.PostFilterPredicate;
 import com.google.gerrit.index.query.Predicate;
 import com.google.gerrit.index.query.QueryParseException;
-import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.entities.Change;
 import com.google.gerrit.server.query.change.ChangeData;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.inject.Singleton;
diff --git a/example-changeQueryAttributes/WORKSPACE b/example-changeQueryAttributes/WORKSPACE
index 2bb7f49..3f0d70c 100644
--- a/example-changeQueryAttributes/WORKSPACE
+++ b/example-changeQueryAttributes/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeQueryAttributes/pom.xml b/example-changeQueryAttributes/pom.xml
index 75b55db..4d01b21 100644
--- a/example-changeQueryAttributes/pom.xml
+++ b/example-changeQueryAttributes/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-changeQueryAttributes</artifactId>
diff --git a/example-commitValidator/WORKSPACE b/example-commitValidator/WORKSPACE
index fc4ea2e..19df968 100644
--- a/example-commitValidator/WORKSPACE
+++ b/example-commitValidator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-commitValidator/pom.xml b/example-commitValidator/pom.xml
index 55e5b9a..c2441ad 100644
--- a/example-commitValidator/pom.xml
+++ b/example-commitValidator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-commitValidator</artifactId>
diff --git a/example-consoleMetricReporter/WORKSPACE b/example-consoleMetricReporter/WORKSPACE
index bc8e1ab..2981305 100644
--- a/example-consoleMetricReporter/WORKSPACE
+++ b/example-consoleMetricReporter/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-consoleMetricReporter/pom.xml b/example-consoleMetricReporter/pom.xml
index b3f2ecb..5079bbb 100644
--- a/example-consoleMetricReporter/pom.xml
+++ b/example-consoleMetricReporter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-consoleMetricReporter</artifactId>
diff --git a/example-deployedOnIncludedInExtension/WORKSPACE b/example-deployedOnIncludedInExtension/WORKSPACE
index 89fce76..c84eec2 100644
--- a/example-deployedOnIncludedInExtension/WORKSPACE
+++ b/example-deployedOnIncludedInExtension/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-deployedOnIncludedInExtension/pom.xml b/example-deployedOnIncludedInExtension/pom.xml
index b2f106b..f68c614 100644
--- a/example-deployedOnIncludedInExtension/pom.xml
+++ b/example-deployedOnIncludedInExtension/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-deployedOnIncludedInExtension</artifactId>
diff --git a/example-polyCssStyle/gerrit-bluestyle.html b/example-polyCssStyle/gerrit-bluestyle.html
index 0e06538..1746481 100644
--- a/example-polyCssStyle/gerrit-bluestyle.html
+++ b/example-polyCssStyle/gerrit-bluestyle.html
@@ -1,4 +1,4 @@
-<dom-module>
+<dom-module id='gerrit-bluestyle-ui'>
    <!--
    Copyright (C) 2019 The Android Open Source Project
 
@@ -15,49 +15,27 @@
    limitations under the License.
    -->
    <script>
-     Gerrit.install(plugin => {});
+     'use strict';
+     Gerrit.install(plugin => {
+       plugin.registerStyleModule('app-theme', 'gerrit-bluestyle');
+     });
    </script>
+</dom-module>
 
+<dom-module id='gerrit-bluestyle'>
+   <template>
    <style>
-     .gr-app-0 gr-main-header.gr-app {
-       background-color: rgb(59,120,231);
-       box-shadow: 0 4px 5px 0 rgba(0,0,0,0.14), 0 1px 10px 0 rgba(0,0,0,0.12), 0 2px 4px -1px rgba(0,0,0,0.2);
-       padding: 0.5em;
-       border-bottom: 0px;
-     }
-
-     .gr-main-header-0 .linksTitle.gr-main-header,
-     .gr-main-header-0 .bigTitle.gr-main-header,
-     .gr-main-header-0 .loginButton.gr-main-header,
-     .gr-main-header-0 .registerButton.gr-main-header,
-     .gr-main-header-0 .gr-account-dropdown {
-       color: rgb(255,255,255);
-     }
-
-     .gr-main-header-0 iron-icon.gr-main-header {
-       color: rgb(255,255,255);
-     }
-
-     .gr-main-header-0 .titleText.gr-main-header {
-       font-size: 1.1em;
-     }
-
-     .gr-main-header-0 .titleText.gr-main-header::after {
-       content: 'Gerrit';
-     }
-
-     .gr-main-header-0 .titleText.gr-main-header::before {
-       background-image: url('data:image/png;base64,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');
-       background-size: 1.1em 1.1em;
-       background-repeat: no-repeat;
-       content: "";
-       display: inline-block;
-       height: 1.1em;
-       margin-right: calc(1em / 2);
-       margin-left: calc(1em / 3);
-       margin-bottom: calc(1em / 7);
-       vertical-align: middle;
-       width: 1.1em;
+      html {
+        --header-background-color: rgb(59,120,231);
+        --header-box-shadow: 0 4px 5px 0 rgba(0,0,0,0.14), 0 1px 10px 0 rgba(0,0,0,0.12), 0 2px 4px -1px rgba(0,0,0,0.2);
+        --header-text-color: rgb(255,255,255);
+        --header-title-font-size: 1.8rem;
+        --header-title-content: 'Gerrit';
+        --header-padding: 5px 5px 5px 15px;
+        --header-icon: url('data:image/png;base64,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');
+        --header-icon-size: 26px;
+        --header-border-bottom: 0;
      }
    </style>
- </dom-module>
+   </template>
+</dom-module>
diff --git a/example-restApiCommandOption/WORKSPACE b/example-restApiCommandOption/WORKSPACE
index 9d7dba1..f804e4f 100644
--- a/example-restApiCommandOption/WORKSPACE
+++ b/example-restApiCommandOption/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiCommandOption/pom.xml b/example-restApiCommandOption/pom.xml
index c00ad26..4fadfbf 100644
--- a/example-restApiCommandOption/pom.xml
+++ b/example-restApiCommandOption/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-restApiCommandOption</artifactId>
diff --git a/example-restApiGetRevision/WORKSPACE b/example-restApiGetRevision/WORKSPACE
index 0e748a0..0834143 100644
--- a/example-restApiGetRevision/WORKSPACE
+++ b/example-restApiGetRevision/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiGetRevision/pom.xml b/example-restApiGetRevision/pom.xml
index 5369f46..759ec17 100644
--- a/example-restApiGetRevision/pom.xml
+++ b/example-restApiGetRevision/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-restApiGetRevision</artifactId>
diff --git a/example-restApiPostProject/WORKSPACE b/example-restApiPostProject/WORKSPACE
index 706ba77..446e6b8 100644
--- a/example-restApiPostProject/WORKSPACE
+++ b/example-restApiPostProject/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiPostProject/pom.xml b/example-restApiPostProject/pom.xml
index 3449a32..2e51b5c 100644
--- a/example-restApiPostProject/pom.xml
+++ b/example-restApiPostProject/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-restApiPostProject</artifactId>
diff --git a/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java b/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java
index e7e0fc0..f7d41b5 100644
--- a/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java
+++ b/example-restApiPostProject/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostproject/HelloProjectAction.java
@@ -14,6 +14,7 @@
 
 package com.googlesource.gerrit.plugins.examples.restapipostproject;
 
+import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.webui.UiAction;
 import com.google.gerrit.server.CurrentUser;
@@ -53,15 +54,16 @@
   }
 
   @Override
-  public String apply(ProjectResource rsrc, Input input) {
+  public Response<String> apply(ProjectResource rsrc, Input input) {
     final String greeting = input.french ? "Bonjour" : "Hello";
-    return String.format(
-        "%s %s from project %s!",
-        greeting,
-        isNullOrEmpty(input.message)
-            ? firstNonNull(user.get().getUserName().get(), "world")
-            : input.message,
-        rsrc.getName());
+    return Response.ok(
+        String.format(
+            "%s %s from project %s!",
+            greeting,
+            isNullOrEmpty(input.message)
+                ? firstNonNull(user.get().getUserName().get(), "world")
+                : input.message,
+            rsrc.getName()));
   }
 
   @Override
diff --git a/example-restApiPostRevision/WORKSPACE b/example-restApiPostRevision/WORKSPACE
index a65df07..327beb0 100644
--- a/example-restApiPostRevision/WORKSPACE
+++ b/example-restApiPostRevision/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiPostRevision/pom.xml b/example-restApiPostRevision/pom.xml
index ffa1094..335baeb 100644
--- a/example-restApiPostRevision/pom.xml
+++ b/example-restApiPostRevision/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-restApiPostRevision</artifactId>
diff --git a/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java b/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java
index eecaf03..d9cff27 100644
--- a/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java
+++ b/example-restApiPostRevision/src/main/java/com/googlesource/gerrit/plugins/examples/restapipostrevision/HelloRevisionAction.java
@@ -16,6 +16,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Strings;
+import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestModifyView;
 import com.google.gerrit.extensions.webui.UiAction;
 import com.google.gerrit.server.CurrentUser;
@@ -41,16 +42,17 @@
   }
 
   @Override
-  public String apply(RevisionResource rev, Input input) {
+  public Response<String> apply(RevisionResource rev, Input input) {
     final String greeting = input.french ? "Bonjour" : "Hello";
-    return String.format(
-        "%s %s from change %s, patch set %d!",
-        greeting,
-        Strings.isNullOrEmpty(input.message)
-            ? MoreObjects.firstNonNull(user.get().getUserName(), "world")
-            : input.message,
-        rev.getChange().getId().toString(),
-        rev.getPatchSet().getPatchSetId());
+    return Response.ok(
+        String.format(
+            "%s %s from change %s, patch set %d!",
+            greeting,
+            Strings.isNullOrEmpty(input.message)
+                ? MoreObjects.firstNonNull(user.get().getUserName(), "world")
+                : input.message,
+            rev.getChange().getId().toString(),
+            rev.getPatchSet().number()));
   }
 
   @Override
diff --git a/example-servlet/WORKSPACE b/example-servlet/WORKSPACE
index 4e7075e..5108e5b 100644
--- a/example-servlet/WORKSPACE
+++ b/example-servlet/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-servlet/pom.xml b/example-servlet/pom.xml
index f845987..c1e3f85 100644
--- a/example-servlet/pom.xml
+++ b/example-servlet/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-servlet</artifactId>
diff --git a/example-simpleSshCommand/WORKSPACE b/example-simpleSshCommand/WORKSPACE
index c276362..4db59ca 100644
--- a/example-simpleSshCommand/WORKSPACE
+++ b/example-simpleSshCommand/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-simpleSshCommand/pom.xml b/example-simpleSshCommand/pom.xml
index 8aeaec8..c8399d6 100644
--- a/example-simpleSshCommand/pom.xml
+++ b/example-simpleSshCommand/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-simpleSshCommand</artifactId>
diff --git a/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE b/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
index 4d120b4..11c98bc 100644
--- a/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
+++ b/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshAndRestCommandOptionBeanParseListener/pom.xml b/example-sshAndRestCommandOptionBeanParseListener/pom.xml
index 60aa07f..6d20c83 100644
--- a/example-sshAndRestCommandOptionBeanParseListener/pom.xml
+++ b/example-sshAndRestCommandOptionBeanParseListener/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-sshAndRestCommandOptionBeanParseListener</artifactId>
diff --git a/example-sshCommandAlias/WORKSPACE b/example-sshCommandAlias/WORKSPACE
index c276362..4db59ca 100644
--- a/example-sshCommandAlias/WORKSPACE
+++ b/example-sshCommandAlias/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandAlias/pom.xml b/example-sshCommandAlias/pom.xml
index c81aab5..7e175fa 100644
--- a/example-sshCommandAlias/pom.xml
+++ b/example-sshCommandAlias/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-sshCommandAlias</artifactId>
diff --git a/example-sshCommandDelegateDynamicBean/WORKSPACE b/example-sshCommandDelegateDynamicBean/WORKSPACE
index 77b9dfd..68d6734 100644
--- a/example-sshCommandDelegateDynamicBean/WORKSPACE
+++ b/example-sshCommandDelegateDynamicBean/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandDelegateDynamicBean/pom.xml b/example-sshCommandDelegateDynamicBean/pom.xml
index 4858160..58f1a09 100644
--- a/example-sshCommandDelegateDynamicBean/pom.xml
+++ b/example-sshCommandDelegateDynamicBean/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-sshCommandDelegateDynamicBean</artifactId>
diff --git a/example-sshCommandOption/WORKSPACE b/example-sshCommandOption/WORKSPACE
index 24f0bd2..37267b1 100644
--- a/example-sshCommandOption/WORKSPACE
+++ b/example-sshCommandOption/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandOption/pom.xml b/example-sshCommandOption/pom.xml
index 336e507..8ad5c22 100644
--- a/example-sshCommandOption/pom.xml
+++ b/example-sshCommandOption/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-sshCommandOption</artifactId>
diff --git a/example-topMenu/WORKSPACE b/example-topMenu/WORKSPACE
index c276362..4db59ca 100644
--- a/example-topMenu/WORKSPACE
+++ b/example-topMenu/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-topMenu/pom.xml b/example-topMenu/pom.xml
index dda35ce..0674054 100644
--- a/example-topMenu/pom.xml
+++ b/example-topMenu/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-topMenu</artifactId>
diff --git a/example-usageDataLogger/WORKSPACE b/example-usageDataLogger/WORKSPACE
index 02d4b2f..be89154 100644
--- a/example-usageDataLogger/WORKSPACE
+++ b/example-usageDataLogger/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-usageDataLogger/pom.xml b/example-usageDataLogger/pom.xml
index 602bba9..8d019f8 100644
--- a/example-usageDataLogger/pom.xml
+++ b/example-usageDataLogger/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-usageDataLogger</artifactId>
diff --git a/example-validationListenerAssignee/WORKSPACE b/example-validationListenerAssignee/WORKSPACE
index e28e2bb..ef8b33c 100644
--- a/example-validationListenerAssignee/WORKSPACE
+++ b/example-validationListenerAssignee/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerAssignee/pom.xml b/example-validationListenerAssignee/pom.xml
index 0bee1c2..7d55425 100644
--- a/example-validationListenerAssignee/pom.xml
+++ b/example-validationListenerAssignee/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-validationListenerAssignee</artifactId>
diff --git a/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java b/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java
index 61d8926..9201419 100644
--- a/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java
+++ b/example-validationListenerAssignee/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerassignee/AssigneeValidator.java
@@ -16,8 +16,8 @@
 
 import com.google.gerrit.exceptions.StorageException;
 import com.google.gerrit.index.query.QueryParseException;
-import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.entities.Account;
+import com.google.gerrit.entities.Change;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.gerrit.server.query.change.ChangeQueryProcessor;
 import com.google.gerrit.server.validators.AssigneeValidationListener;
@@ -41,7 +41,7 @@
   public void validateAssignee(Change change, Account assignee) throws ValidationException {
     try {
       if (queryProcessor
-              .query(queryBuilder.assignee(assignee.getPreferredEmail()))
+              .query(queryBuilder.assignee(assignee.preferredEmail()))
               .entities()
               .size()
           > MAX_ASSIGNED_CHANGES) {
diff --git a/example-validationListenerCommit/WORKSPACE b/example-validationListenerCommit/WORKSPACE
index d1cabad..07cfc14 100644
--- a/example-validationListenerCommit/WORKSPACE
+++ b/example-validationListenerCommit/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerCommit/pom.xml b/example-validationListenerCommit/pom.xml
index 9ede1f9..22928ed 100644
--- a/example-validationListenerCommit/pom.xml
+++ b/example-validationListenerCommit/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-validationListenerCommit</artifactId>
diff --git a/example-validationListenerHashtag/WORKSPACE b/example-validationListenerHashtag/WORKSPACE
index f6fc271..7be8208 100644
--- a/example-validationListenerHashtag/WORKSPACE
+++ b/example-validationListenerHashtag/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerHashtag/pom.xml b/example-validationListenerHashtag/pom.xml
index 1abab31..692d642 100644
--- a/example-validationListenerHashtag/pom.xml
+++ b/example-validationListenerHashtag/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-validationListenerHashtag</artifactId>
diff --git a/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java b/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java
index bccc62e..0e0cb0a 100644
--- a/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java
+++ b/example-validationListenerHashtag/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerhashtag/HashtagValidator.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenerhashtag;
 
-import com.google.gerrit.reviewdb.client.Change;
+import com.google.gerrit.entities.Change;
 import com.google.gerrit.server.validators.HashtagValidationListener;
 import com.google.gerrit.server.validators.ValidationException;
 import java.util.Set;
diff --git a/example-validationListenerMerge/WORKSPACE b/example-validationListenerMerge/WORKSPACE
index 02db944..01efab6 100644
--- a/example-validationListenerMerge/WORKSPACE
+++ b/example-validationListenerMerge/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerMerge/pom.xml b/example-validationListenerMerge/pom.xml
index b2de21d..2919a6d 100644
--- a/example-validationListenerMerge/pom.xml
+++ b/example-validationListenerMerge/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-validationListenerMerge</artifactId>
diff --git a/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java b/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java
index 5088d29..9aaed95 100644
--- a/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java
+++ b/example-validationListenerMerge/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenermerge/MergeUserValidator.java
@@ -14,8 +14,8 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenermerge;
 
-import com.google.gerrit.reviewdb.client.Branch;
-import com.google.gerrit.reviewdb.client.PatchSet;
+import com.google.gerrit.entities.BranchNameKey;
+import com.google.gerrit.entities.PatchSet;
 import com.google.gerrit.server.IdentifiedUser;
 import com.google.gerrit.server.git.CodeReviewCommit;
 import com.google.gerrit.server.git.validators.MergeValidationException;
@@ -48,7 +48,7 @@
       Repository repo,
       CodeReviewCommit commit,
       ProjectState destProject,
-      Branch.NameKey destBranch,
+      BranchNameKey destBranch,
       PatchSet.Id patchSetId,
       IdentifiedUser caller)
       throws MergeValidationException {
diff --git a/example-validationListenerNewProjectCreated/WORKSPACE b/example-validationListenerNewProjectCreated/WORKSPACE
index d1d63a8..8774f6a 100644
--- a/example-validationListenerNewProjectCreated/WORKSPACE
+++ b/example-validationListenerNewProjectCreated/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerNewProjectCreated/pom.xml b/example-validationListenerNewProjectCreated/pom.xml
index d9ecc01..8bf666e 100644
--- a/example-validationListenerNewProjectCreated/pom.xml
+++ b/example-validationListenerNewProjectCreated/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-validationListenerNewProjectCreated</artifactId>
diff --git a/example-validationListenerRefOperation/WORKSPACE b/example-validationListenerRefOperation/WORKSPACE
index e1da78e..c9509a4 100644
--- a/example-validationListenerRefOperation/WORKSPACE
+++ b/example-validationListenerRefOperation/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerRefOperation/pom.xml b/example-validationListenerRefOperation/pom.xml
index 260441e..ce7ba8b 100644
--- a/example-validationListenerRefOperation/pom.xml
+++ b/example-validationListenerRefOperation/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-validationListenerRefOperation</artifactId>
diff --git a/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java b/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java
index da7f4cb..41f299f 100644
--- a/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java
+++ b/example-validationListenerRefOperation/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerrefoperation/RefOperationValidationExample.java
@@ -15,7 +15,7 @@
 package com.googlesource.gerrit.plugins.examples.validationlistenerrefoperation;
 
 import com.google.common.collect.Lists;
-import com.google.gerrit.reviewdb.client.RefNames;
+import com.google.gerrit.entities.RefNames;
 import com.google.gerrit.server.events.RefReceivedEvent;
 import com.google.gerrit.server.git.validators.RefOperationValidationListener;
 import com.google.gerrit.server.git.validators.ValidationMessage;
diff --git a/example-validationListenerUpload/WORKSPACE b/example-validationListenerUpload/WORKSPACE
index c270e88..fbbbea2 100644
--- a/example-validationListenerUpload/WORKSPACE
+++ b/example-validationListenerUpload/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerUpload/pom.xml b/example-validationListenerUpload/pom.xml
index 7cae253..9b89075 100644
--- a/example-validationListenerUpload/pom.xml
+++ b/example-validationListenerUpload/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-validationListenerUpload</artifactId>
diff --git a/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java b/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java
index e2231f8..2721ebe 100644
--- a/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java
+++ b/example-validationListenerUpload/src/main/java/com/googlesource/gerrit/plugins/examples/validationlistenerupload/DenyUploadExample.java
@@ -14,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenerupload;
 
-import com.google.gerrit.reviewdb.client.Project;
+import com.google.gerrit.entities.Project;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.git.validators.UploadValidationListener;
 import com.google.gerrit.server.validators.ValidationException;
diff --git a/example-webLinkBranch/WORKSPACE b/example-webLinkBranch/WORKSPACE
index c8bb3f4..cd49964 100644
--- a/example-webLinkBranch/WORKSPACE
+++ b/example-webLinkBranch/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkBranch/pom.xml b/example-webLinkBranch/pom.xml
index 277eafa..9989913 100644
--- a/example-webLinkBranch/pom.xml
+++ b/example-webLinkBranch/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-webLinkBranch</artifactId>
diff --git a/example-webLinkFileHistory/WORKSPACE b/example-webLinkFileHistory/WORKSPACE
index c276362..4db59ca 100644
--- a/example-webLinkFileHistory/WORKSPACE
+++ b/example-webLinkFileHistory/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkFileHistory/pom.xml b/example-webLinkFileHistory/pom.xml
index d52c78f..1863d81 100644
--- a/example-webLinkFileHistory/pom.xml
+++ b/example-webLinkFileHistory/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-webLinkFileHistory</artifactId>
diff --git a/example-webLinkPatchSet/WORKSPACE b/example-webLinkPatchSet/WORKSPACE
index c276362..4db59ca 100644
--- a/example-webLinkPatchSet/WORKSPACE
+++ b/example-webLinkPatchSet/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkPatchSet/pom.xml b/example-webLinkPatchSet/pom.xml
index b1ac302..e126e0a 100644
--- a/example-webLinkPatchSet/pom.xml
+++ b/example-webLinkPatchSet/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-webLinkPatchSet</artifactId>
diff --git a/example-webLinkProject/WORKSPACE b/example-webLinkProject/WORKSPACE
index c276362..4db59ca 100644
--- a/example-webLinkProject/WORKSPACE
+++ b/example-webLinkProject/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+    commit = "3f9dadc615dc4053369a42d9ada37dafd8d4763c",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkProject/pom.xml b/example-webLinkProject/pom.xml
index 4ed1537..1642f55 100644
--- a/example-webLinkProject/pom.xml
+++ b/example-webLinkProject/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.googlesource.gerrit.plugins</groupId>
     <artifactId>examples-all</artifactId>
-    <version>3.0.13</version>
+    <version>3.1.8</version>
   </parent>
 
   <artifactId>example-webLinkProject</artifactId>
diff --git a/pom.xml b/pom.xml
index 65f9c41..af4f885 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>examples-all</artifactId>
   <packaging>pom</packaging>
-  <version>3.0.13</version>
+  <version>3.1.8</version>
 
   <modules>
     <module>example-adminSshCommand</module>