Merge branch 'stable-3.1'

* stable-3.1:
  Update bazlets to latest stable-3.1
  Update bazlets to latest stable-3.0
  Rename GWT examples to have -GWT suffix
  Update maven build to 2.16.13
  Update bazlets to latest stable-2.16
  Update maven build to 2.15.18
  Update maven build to 2.14.20
  Remove Buck based build
  Update bazlets to latest stable-2.15
  Update bazlets to latest stable-2.14
  Update bazlets to Gerrit API 2.14.20

Just did: 'git merge --log -X theirs stable-3.1'

Change-Id: Ic8af5c25324ea96290c6ca9ba871f69185a7f60f
diff --git a/.gitignore b/.gitignore
index 43d62c1..ab5a64f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 bazel-out
 bazel-testlogs
 *.idea
+*/target
diff --git a/BUILD b/BUILD
index 4901d67..41c9ddd 100644
--- a/BUILD
+++ b/BUILD
@@ -30,14 +30,6 @@
         "//example-webLinkFileHistory",
         "//example-webLinkPatchSet",
         "//example-webLinkProject",
-        "//example-wuiChangeScreenBelowChangeInfoBlock",
-        "//example-wuiChangeScreenHeader",
-        "//example-wuiChangeScreenHeaderRightOfButtons",
-        "//example-wuiChangeScreenHeaderRightOfPopDowns",
-        "//example-wuiPluginScreen",
-        "//example-wuiPreferenceScreenBottom",
-        "//example-wuiProfileExtensionBottom",
-        "//example-wuiSettingsScreen",
     ],
     outs = ["all.zip"],
     cmd = " && ".join([
diff --git a/README b/README
index 8632b6b..c1e573b 100644
--- a/README
+++ b/README
@@ -44,74 +44,9 @@
 
 
 
-Buck Build
+Maven Build
 ==========
 
-This plugin can be built with Buck.
-
-Two build modes are supported: Standalone and in Gerrit tree. Standalone
-build mode is recommended, as this mode doesn't require local Gerrit
-tree to exist.
-
-Build standalone
-----------------
-
-Clone bucklets library:
-
-
-  git clone https://gerrit.googlesource.com/bucklets
-
-
-and link it to examples directory:
-
-
-  cd examples && ln -s ../bucklets .
-
-
-To build a specific example plugin, issue the following command:
-
-
-  cd example-<example> && buck build plugin
-
-
-The output or each example is created in
-
-
-  buck-out/gen/example-<example>.jar
-
-To execute the tests run:
-
-
-  buck test
-
-
-Build in Gerrit tree
---------------------
-
-Clone or link this plugin to the plugins directory of Gerrit's source
-tree, and issue the command:
-
-
-  buck build plugins/examples/example-<example>
-
-
-The output is created in
-
-
-  buck-out/gen/plugins/examples/example-<example>/example-<example>.jar
-
-
-This project can be imported into the Eclipse IDE:
-
-
-  ./tools/eclipse/project.py
-
-
-To execute the tests run:
-
-
-  buck test --include examples/example-<example>
-
 Note that for compatibility reasons a Maven build is provided, but is considered
 to be deprecated and will be removed in a future version of this plugin.
 
@@ -125,4 +60,4 @@
 When building with Maven, the Gerrit Plugin API must be available.
 
 How to build the Gerrit Plugin API is described in the Gerrit
-documentation (../../../Documentation/dev-buck.html#_extension_and_plugin_api_jar_files).
+documentation (../../../Documentation/dev-bazel.html#_extension_and_plugin_api_jar_files).
diff --git a/WORKSPACE b/WORKSPACE
index 4ae996b..1412c68 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
@@ -19,15 +19,8 @@
 #    "gerrit_api_maven_local",
 #)
 
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
 # Load release Plugin API
 gerrit_api()
 
 # Load snapshot Plugin API
 #gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-adminSshCommand/.buckconfig b/example-adminSshCommand/.buckconfig
deleted file mode 100644
index 4cb7797..0000000
--- a/example-adminSshCommand/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-adminSshCommand
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-adminSshCommand/BUCK b/example-adminSshCommand/BUCK
deleted file mode 100644
index 5520b69..0000000
--- a/example-adminSshCommand/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-adminSshCommand',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-adminSshCommand',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.adminsshcommand.SshModule',
-    'Implementation-Title: Example Admin Ssh Command',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-adminSshCommand__plugin'],
-)
diff --git a/example-adminSshCommand/WORKSPACE b/example-adminSshCommand/WORKSPACE
index a80d076..8df7d92 100644
--- a/example-adminSshCommand/WORKSPACE
+++ b/example-adminSshCommand/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-adminSshCommand/lib/gerrit/BUCK b/example-adminSshCommand/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-adminSshCommand/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-adminSshCommand/pom.xml b/example-adminSshCommand/pom.xml
index 9a87157..4e073be 100644
--- a/example-adminSshCommand/pom.xml
+++ b/example-adminSshCommand/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-adminSshCommand</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-adminSshCommand/tools/bzl/plugin.bzl b/example-adminSshCommand/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-adminSshCommand/tools/bzl/plugin.bzl
+++ b/example-adminSshCommand/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-changeHasOperator/.buckconfig b/example-changeHasOperator/.buckconfig
deleted file mode 100644
index 1ef8ff0..0000000
--- a/example-changeHasOperator/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-changeHasOperator
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-changeHasOperator/.gitignore b/example-changeHasOperator/.gitignore
index db1c934..16a6bd7 100644
--- a/example-changeHasOperator/.gitignore
+++ b/example-changeHasOperator/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-changeHasOperator/BUCK b/example-changeHasOperator/BUCK
deleted file mode 100644
index d076b60..0000000
--- a/example-changeHasOperator/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-changeHasOperator',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-changeHasOperator',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.changehasoperator.Module',
-    'Implementation-Title: Example Change Has Operator',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-changeHasOperator__plugin'],
-)
diff --git a/example-changeHasOperator/WORKSPACE b/example-changeHasOperator/WORKSPACE
index f6f67d7..1c53818 100644
--- a/example-changeHasOperator/WORKSPACE
+++ b/example-changeHasOperator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeHasOperator/lib/gerrit/BUCK b/example-changeHasOperator/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-changeHasOperator/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-changeHasOperator/pom.xml b/example-changeHasOperator/pom.xml
index c020e06..acb01b9 100644
--- a/example-changeHasOperator/pom.xml
+++ b/example-changeHasOperator/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-changeHasOperator</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-changeHasOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changehasoperator/SampleHasOperand.java b/example-changeHasOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changehasoperator/SampleHasOperand.java
index cb1c08a..29ad39b 100644
--- a/example-changeHasOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changehasoperator/SampleHasOperand.java
+++ b/example-changeHasOperator/src/main/java/com/googlesource/gerrit/plugins/examples/changehasoperator/SampleHasOperand.java
@@ -14,16 +14,16 @@
 
 package com.googlesource.gerrit.plugins.examples.changehasoperator;
 
+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.server.query.change.ChangeData;
-import com.google.gerrit.server.query.change.ChangeOperatorPredicate;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.inject.Singleton;
 
 @Singleton
 public class SampleHasOperand implements ChangeQueryBuilder.ChangeHasOperandFactory {
-  public static class MyOddPredicate extends ChangeOperatorPredicate {
+  public static class MyOddPredicate extends PostFilterPredicate<ChangeData> {
 
     MyOddPredicate() {
       super("has", "odd");
diff --git a/example-changeHasOperator/tools/bzl/plugin.bzl b/example-changeHasOperator/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-changeHasOperator/tools/bzl/plugin.bzl
+++ b/example-changeHasOperator/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-changeOperator/.buckconfig b/example-changeOperator/.buckconfig
deleted file mode 100644
index 0971b8a..0000000
--- a/example-changeOperator/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-changeOperator
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-changeOperator/.gitignore b/example-changeOperator/.gitignore
index db1c934..16a6bd7 100644
--- a/example-changeOperator/.gitignore
+++ b/example-changeOperator/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-changeOperator/BUCK b/example-changeOperator/BUCK
deleted file mode 100644
index 1a77256..0000000
--- a/example-changeOperator/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-changeOperator',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-changeOperator',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.changeoperator.Module',
-    'Implementation-Title: Example changeOperator',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-changeOperator__plugin'],
-)
diff --git a/example-changeOperator/WORKSPACE b/example-changeOperator/WORKSPACE
index 1e1faf6..5485912 100644
--- a/example-changeOperator/WORKSPACE
+++ b/example-changeOperator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeOperator/lib/gerrit/BUCK b/example-changeOperator/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-changeOperator/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-changeOperator/pom.xml b/example-changeOperator/pom.xml
index a276628..2c93e1b 100644
--- a/example-changeOperator/pom.xml
+++ b/example-changeOperator/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-changeOperator</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
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 96a4867..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
@@ -14,17 +14,17 @@
 
 package com.googlesource.gerrit.plugins.examples.changeoperator;
 
-import com.google.gerrit.entities.Change;
+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.entities.Change;
 import com.google.gerrit.server.query.change.ChangeData;
-import com.google.gerrit.server.query.change.ChangeOperatorPredicate;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.inject.Singleton;
 
 @Singleton
 public class SampleOperator implements ChangeQueryBuilder.ChangeOperatorFactory {
-  public static class MyPredicate extends ChangeOperatorPredicate {
+  public static class MyPredicate extends PostFilterPredicate<ChangeData> {
     private final Change.Id id;
 
     MyPredicate(Change.Id id) {
diff --git a/example-changeOperator/tools/bzl/plugin.bzl b/example-changeOperator/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-changeOperator/tools/bzl/plugin.bzl
+++ b/example-changeOperator/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-changeQueryAttributes/BUCK b/example-changeQueryAttributes/BUCK
deleted file mode 100644
index 583b33a..0000000
--- a/example-changeQueryAttributes/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-changeQueryAttributes',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-changeQueryAttributes',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.changequeryattributes.Module',
-    'Implementation-Title: Example Simple Change Query Attribute',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-changeQueryAttributes__plugin'],
-)
diff --git a/example-changeQueryAttributes/WORKSPACE b/example-changeQueryAttributes/WORKSPACE
index 3dde217..0bee67a 100644
--- a/example-changeQueryAttributes/WORKSPACE
+++ b/example-changeQueryAttributes/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-changeQueryAttributes/lib/gerrit/BUCK b/example-changeQueryAttributes/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-changeQueryAttributes/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-changeQueryAttributes/pom.xml b/example-changeQueryAttributes/pom.xml
index 8421d33..9505039 100644
--- a/example-changeQueryAttributes/pom.xml
+++ b/example-changeQueryAttributes/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-changeQueryAttributes</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/AttributeFactory.java b/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/AttributeFactory.java
index dbf4e43..e67d5c9 100644
--- a/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/AttributeFactory.java
+++ b/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/AttributeFactory.java
@@ -15,9 +15,9 @@
 package com.googlesource.gerrit.plugins.examples.changequeryattributes;
 
 import com.google.gerrit.extensions.common.PluginDefinedInfo;
+import com.google.gerrit.server.DynamicOptions.BeanProvider;
+import com.google.gerrit.server.change.ChangeAttributeFactory;
 import com.google.gerrit.server.query.change.ChangeData;
-import com.google.gerrit.server.query.change.ChangeQueryProcessor;
-import com.google.gerrit.server.query.change.ChangeQueryProcessor.ChangeAttributeFactory;
 
 public class AttributeFactory implements ChangeAttributeFactory {
 
@@ -32,7 +32,7 @@
   }
 
   @Override
-  public PluginDefinedInfo create(ChangeData c, ChangeQueryProcessor qp, String plugin) {
+  public PluginDefinedInfo create(ChangeData c, BeanProvider bp, String plugin) {
     return new PluginAttribute(c);
   }
 }
diff --git a/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/Module.java b/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/Module.java
index f01989d..9db4619 100644
--- a/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/Module.java
+++ b/example-changeQueryAttributes/src/main/java/com/googlesource/gerrit/plugins/examples/changequeryattributes/Module.java
@@ -15,7 +15,7 @@
 package com.googlesource.gerrit.plugins.examples.changequeryattributes;
 
 import com.google.gerrit.extensions.annotations.Exports;
-import com.google.gerrit.server.query.change.ChangeQueryProcessor.ChangeAttributeFactory;
+import com.google.gerrit.server.change.ChangeAttributeFactory;
 import com.google.inject.AbstractModule;
 
 public class Module extends AbstractModule {
diff --git a/example-changeQueryAttributes/tools/bzl/plugin.bzl b/example-changeQueryAttributes/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-changeQueryAttributes/tools/bzl/plugin.bzl
+++ b/example-changeQueryAttributes/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-commitValidator/.buckconfig b/example-commitValidator/.buckconfig
deleted file mode 100644
index 0418874..0000000
--- a/example-commitValidator/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-commitValidator
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-commitValidator/BUCK b/example-commitValidator/BUCK
deleted file mode 100644
index e0127fe..0000000
--- a/example-commitValidator/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-commitValidator',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-commitValidator',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.commitvalidator.Module',
-    'Implementation-Title: Example Commit Validator',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-commitvalidator__plugin'],
-)
diff --git a/example-commitValidator/WORKSPACE b/example-commitValidator/WORKSPACE
index 68fa79d..6696082 100644
--- a/example-commitValidator/WORKSPACE
+++ b/example-commitValidator/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-commitValidator/lib/gerrit/BUCK b/example-commitValidator/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-commitValidator/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-commitValidator/pom.xml b/example-commitValidator/pom.xml
index 9577610..1e67299 100644
--- a/example-commitValidator/pom.xml
+++ b/example-commitValidator/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-commitValidator</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-commitValidator/tools/bzl/plugin.bzl b/example-commitValidator/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-commitValidator/tools/bzl/plugin.bzl
+++ b/example-commitValidator/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-consoleMetricReporter/.buckconfig b/example-consoleMetricReporter/.buckconfig
deleted file mode 100644
index e1b61c4..0000000
--- a/example-consoleMetricReporter/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-consoleMetricReporter
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-consoleMetricReporter/.gitignore b/example-consoleMetricReporter/.gitignore
index dd528a6..bd20ac3 100644
--- a/example-consoleMetricReporter/.gitignore
+++ b/example-consoleMetricReporter/.gitignore
@@ -2,8 +2,5 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
 /bazel-example-consoleMetricReporter
diff --git a/example-consoleMetricReporter/BUCK b/example-consoleMetricReporter/BUCK
deleted file mode 100644
index bc4703d..0000000
--- a/example-consoleMetricReporter/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-consoleMetricReporter',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-consoleMetricReporter',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.consolemetricreporter.Module',
-    'Implementation-Title: Example consoleMetricReporter',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-consoleMetricReporter__plugin'],
-)
diff --git a/example-consoleMetricReporter/WORKSPACE b/example-consoleMetricReporter/WORKSPACE
index 43708fa..71a98a9 100644
--- a/example-consoleMetricReporter/WORKSPACE
+++ b/example-consoleMetricReporter/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-consoleMetricReporter/lib/gerrit/BUCK b/example-consoleMetricReporter/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-consoleMetricReporter/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-consoleMetricReporter/pom.xml b/example-consoleMetricReporter/pom.xml
index a97f5ba..5a1ce9a 100644
--- a/example-consoleMetricReporter/pom.xml
+++ b/example-consoleMetricReporter/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-consoleMetricReporter</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-consoleMetricReporter/tools/bzl/plugin.bzl b/example-consoleMetricReporter/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-consoleMetricReporter/tools/bzl/plugin.bzl
+++ b/example-consoleMetricReporter/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-deployedOnIncludedInExtension/.buckconfig b/example-deployedOnIncludedInExtension/.buckconfig
deleted file mode 100644
index a311abb..0000000
--- a/example-deployedOnIncludedInExtension/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-deployedOnIncludedInExtension
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-deployedOnIncludedInExtension/BUCK b/example-deployedOnIncludedInExtension/BUCK
deleted file mode 100644
index e0d1ff8..0000000
--- a/example-deployedOnIncludedInExtension/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-deployedOnIncludedInExtension',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-deployedOnIncludedInExtension',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.deployedonincludedinextension.Module',
-    'Implementation-Title: Example Deployed On Included-In Extension',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-deployedOnIncludedInExtension__plugin'],
-)
diff --git a/example-deployedOnIncludedInExtension/WORKSPACE b/example-deployedOnIncludedInExtension/WORKSPACE
index 495c94b..2aa2358 100644
--- a/example-deployedOnIncludedInExtension/WORKSPACE
+++ b/example-deployedOnIncludedInExtension/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-deployedOnIncludedInExtension/lib/gerrit/BUCK b/example-deployedOnIncludedInExtension/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-deployedOnIncludedInExtension/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-deployedOnIncludedInExtension/pom.xml b/example-deployedOnIncludedInExtension/pom.xml
index a1c867c..f318bea 100644
--- a/example-deployedOnIncludedInExtension/pom.xml
+++ b/example-deployedOnIncludedInExtension/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-deployedOnIncludedInExtension</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-deployedOnIncludedInExtension/tools/bzl/plugin.bzl b/example-deployedOnIncludedInExtension/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-deployedOnIncludedInExtension/tools/bzl/plugin.bzl
+++ b/example-deployedOnIncludedInExtension/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-restApiCommandOption/BUCK b/example-restApiCommandOption/BUCK
deleted file mode 100644
index 7e6dfbf..0000000
--- a/example-restApiCommandOption/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-restApiCommandOption',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-restApiCommandOption',
-    'Gerrit-HttpModule: com.googlesource.gerrit.plugins.examples.restapicommandoption.HttpModule',
-    'Implementation-Title: Example Simple REST Command Option',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-restApiCommandOption__plugin'],
-)
diff --git a/example-restApiCommandOption/WORKSPACE b/example-restApiCommandOption/WORKSPACE
index 10baaf7..23c3393 100644
--- a/example-restApiCommandOption/WORKSPACE
+++ b/example-restApiCommandOption/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiCommandOption/lib/gerrit/BUCK b/example-restApiCommandOption/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-restApiCommandOption/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-restApiCommandOption/pom.xml b/example-restApiCommandOption/pom.xml
index 276c47d..b2f34e9 100644
--- a/example-restApiCommandOption/pom.xml
+++ b/example-restApiCommandOption/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-restApiCommandOption</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-restApiCommandOption/src/main/java/com/googlesource/gerrit/plugins/examples/restapicommandoption/HttpModule.java b/example-restApiCommandOption/src/main/java/com/googlesource/gerrit/plugins/examples/restapicommandoption/HttpModule.java
index afcc105..ce9c581 100644
--- a/example-restApiCommandOption/src/main/java/com/googlesource/gerrit/plugins/examples/restapicommandoption/HttpModule.java
+++ b/example-restApiCommandOption/src/main/java/com/googlesource/gerrit/plugins/examples/restapicommandoption/HttpModule.java
@@ -17,7 +17,7 @@
 import com.google.gerrit.extensions.annotations.Exports;
 import com.google.gerrit.httpd.plugins.HttpPluginModule;
 import com.google.gerrit.server.DynamicOptions;
-import com.google.gerrit.server.query.change.QueryChanges;
+import com.google.gerrit.server.restapi.change.QueryChanges;
 import org.kohsuke.args4j.Option;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/example-restApiCommandOption/tools/bzl/plugin.bzl b/example-restApiCommandOption/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-restApiCommandOption/tools/bzl/plugin.bzl
+++ b/example-restApiCommandOption/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-restApiGetRevision/.buckconfig b/example-restApiGetRevision/.buckconfig
deleted file mode 100644
index a5765f2..0000000
--- a/example-restApiGetRevision/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-restApiGetRevision
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-restApiGetRevision/.gitignore b/example-restApiGetRevision/.gitignore
index db1c934..16a6bd7 100644
--- a/example-restApiGetRevision/.gitignore
+++ b/example-restApiGetRevision/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-restApiGetRevision/BUCK b/example-restApiGetRevision/BUCK
deleted file mode 100644
index c1053cc..0000000
--- a/example-restApiGetRevision/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-restApiGetRevision',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-restApiGetRevision',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.restapigetrevision.SshModule',
-    'Implementation-Title: Example Simple Ssh Command',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-restApiGetRevision__plugin'],
-)
diff --git a/example-restApiGetRevision/WORKSPACE b/example-restApiGetRevision/WORKSPACE
index 8255487..0f354e8 100644
--- a/example-restApiGetRevision/WORKSPACE
+++ b/example-restApiGetRevision/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiGetRevision/bucklets b/example-restApiGetRevision/bucklets
deleted file mode 120000
index faeb10e..0000000
--- a/example-restApiGetRevision/bucklets
+++ /dev/null
@@ -1 +0,0 @@
-../bucklets
\ No newline at end of file
diff --git a/example-restApiGetRevision/lib/gerrit/BUCK b/example-restApiGetRevision/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-restApiGetRevision/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-restApiGetRevision/pom.xml b/example-restApiGetRevision/pom.xml
index cfc4047..e0827d4 100644
--- a/example-restApiGetRevision/pom.xml
+++ b/example-restApiGetRevision/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-restApiGetRevision</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-restApiGetRevision/tools/bzl/plugin.bzl b/example-restApiGetRevision/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-restApiGetRevision/tools/bzl/plugin.bzl
+++ b/example-restApiGetRevision/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-restApiPostProject/.buckconfig b/example-restApiPostProject/.buckconfig
deleted file mode 100644
index c8c0733..0000000
--- a/example-restApiPostProject/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-restApiPostProject
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-restApiPostProject/.gitignore b/example-restApiPostProject/.gitignore
index db1c934..16a6bd7 100644
--- a/example-restApiPostProject/.gitignore
+++ b/example-restApiPostProject/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-restApiPostProject/BUCK b/example-restApiPostProject/BUCK
deleted file mode 100644
index 80e0cb8..0000000
--- a/example-restApiPostProject/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-restApiPostProject',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-restApiPostProject',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.restapipostproject.SshModule',
-    'Implementation-Title: Example Simple Ssh Command',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-restApiPostProject__plugin'],
-)
diff --git a/example-restApiPostProject/WORKSPACE b/example-restApiPostProject/WORKSPACE
index 60839a4..d58ea10 100644
--- a/example-restApiPostProject/WORKSPACE
+++ b/example-restApiPostProject/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiPostProject/bucklets b/example-restApiPostProject/bucklets
deleted file mode 120000
index faeb10e..0000000
--- a/example-restApiPostProject/bucklets
+++ /dev/null
@@ -1 +0,0 @@
-../bucklets
\ No newline at end of file
diff --git a/example-restApiPostProject/lib/gerrit/BUCK b/example-restApiPostProject/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-restApiPostProject/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-restApiPostProject/pom.xml b/example-restApiPostProject/pom.xml
index 57f5a9c..640aaed 100644
--- a/example-restApiPostProject/pom.xml
+++ b/example-restApiPostProject/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-restApiPostProject</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
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 1676602..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(), "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-restApiPostProject/tools/bzl/plugin.bzl b/example-restApiPostProject/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-restApiPostProject/tools/bzl/plugin.bzl
+++ b/example-restApiPostProject/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-restApiPostRevision/.buckconfig b/example-restApiPostRevision/.buckconfig
deleted file mode 100644
index 36a0a17..0000000
--- a/example-restApiPostRevision/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-restApiPostRevision
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-restApiPostRevision/.gitignore b/example-restApiPostRevision/.gitignore
index db1c934..16a6bd7 100644
--- a/example-restApiPostRevision/.gitignore
+++ b/example-restApiPostRevision/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-restApiPostRevision/BUCK b/example-restApiPostRevision/BUCK
deleted file mode 100644
index b39bbec..0000000
--- a/example-restApiPostRevision/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-restApiPostRevision',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-restApiPostRevision',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.restapipostrevision.SshModule',
-    'Implementation-Title: Example Simple Ssh Command',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-restApiPostRevision__plugin'],
-)
diff --git a/example-restApiPostRevision/WORKSPACE b/example-restApiPostRevision/WORKSPACE
index ea0d4d4..d3c232c 100644
--- a/example-restApiPostRevision/WORKSPACE
+++ b/example-restApiPostRevision/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-restApiPostRevision/bucklets b/example-restApiPostRevision/bucklets
deleted file mode 120000
index faeb10e..0000000
--- a/example-restApiPostRevision/bucklets
+++ /dev/null
@@ -1 +0,0 @@
-../bucklets
\ No newline at end of file
diff --git a/example-restApiPostRevision/lib/gerrit/BUCK b/example-restApiPostRevision/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-restApiPostRevision/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-restApiPostRevision/pom.xml b/example-restApiPostRevision/pom.xml
index f46a8bb..4d15530 100644
--- a/example-restApiPostRevision/pom.xml
+++ b/example-restApiPostRevision/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-restApiPostRevision</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
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-restApiPostRevision/tools/bzl/plugin.bzl b/example-restApiPostRevision/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-restApiPostRevision/tools/bzl/plugin.bzl
+++ b/example-restApiPostRevision/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-servlet/.buckconfig b/example-servlet/.buckconfig
deleted file mode 100644
index f3348a3..0000000
--- a/example-servlet/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-servlet
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-servlet/.gitignore b/example-servlet/.gitignore
index dd66af4..adac181 100644
--- a/example-servlet/.gitignore
+++ b/example-servlet/.gitignore
@@ -2,8 +2,5 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
 /bazel-example-servlet
diff --git a/example-servlet/BUCK b/example-servlet/BUCK
deleted file mode 100644
index 0c07509..0000000
--- a/example-servlet/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-servlet',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-servlet',
-    'Gerrit-HttpModule: com.googlesource.gerrit.plugins.examples.servlet.HttpModule',
-    'Implementation-Title: Example Servlet',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-servlet__plugin'],
-)
diff --git a/example-servlet/WORKSPACE b/example-servlet/WORKSPACE
index 9aef3d1..b4b8b7d 100644
--- a/example-servlet/WORKSPACE
+++ b/example-servlet/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-servlet/lib/gerrit/BUCK b/example-servlet/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-servlet/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-servlet/pom.xml b/example-servlet/pom.xml
index 282cc59..5b93250 100644
--- a/example-servlet/pom.xml
+++ b/example-servlet/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-servlet</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-servlet/tools/bzl/plugin.bzl b/example-servlet/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-servlet/tools/bzl/plugin.bzl
+++ b/example-servlet/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-simpleSshCommand/.buckconfig b/example-simpleSshCommand/.buckconfig
deleted file mode 100644
index 31d8382..0000000
--- a/example-simpleSshCommand/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-simpleSshCommand
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-simpleSshCommand/.gitignore b/example-simpleSshCommand/.gitignore
index db1c934..16a6bd7 100644
--- a/example-simpleSshCommand/.gitignore
+++ b/example-simpleSshCommand/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-simpleSshCommand/BUCK b/example-simpleSshCommand/BUCK
deleted file mode 100644
index fd4375e..0000000
--- a/example-simpleSshCommand/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-simpleSshCommand',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-simpleSshCommand',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.simplesshcommand.SshModule',
-    'Implementation-Title: Example Simple Ssh Command',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-# TODO(davido): is this needed?
-# requires for bucklets/tools/eclipse/project.py to work
-# not sure, if this does something useful in standalone context
-java_library(
-  name = 'classpath',
-  deps = [':example-simpleSshCommand__plugin'],
-)
diff --git a/example-simpleSshCommand/WORKSPACE b/example-simpleSshCommand/WORKSPACE
index 00047c0..aef2088 100644
--- a/example-simpleSshCommand/WORKSPACE
+++ b/example-simpleSshCommand/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-simpleSshCommand/bucklets b/example-simpleSshCommand/bucklets
deleted file mode 120000
index faeb10e..0000000
--- a/example-simpleSshCommand/bucklets
+++ /dev/null
@@ -1 +0,0 @@
-../bucklets
\ No newline at end of file
diff --git a/example-simpleSshCommand/lib/gerrit/BUCK b/example-simpleSshCommand/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-simpleSshCommand/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-simpleSshCommand/pom.xml b/example-simpleSshCommand/pom.xml
index 4ed1a30..317c4b5 100644
--- a/example-simpleSshCommand/pom.xml
+++ b/example-simpleSshCommand/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-simpleSshCommand</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-simpleSshCommand/tools/bzl/plugin.bzl b/example-simpleSshCommand/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-simpleSshCommand/tools/bzl/plugin.bzl
+++ b/example-simpleSshCommand/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-sshAndRestCommandOptionBeanParseListener/BUCK b/example-sshAndRestCommandOptionBeanParseListener/BUCK
deleted file mode 100644
index 1559199..0000000
--- a/example-sshAndRestCommandOptionBeanParseListener/BUCK
+++ /dev/null
@@ -1,19 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-sshAndRestCommandOptionBeanParseListener',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-sshAndRestCommandOptionBeanParseListener',
-    'Gerrit-HttpModule: com.googlesource.gerrit.plugins.examples.sshandrestcommandoptionbeanparselistener.Modules$HttpModule',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.sshandrestcommandoptionbeanparselistener.Modules$SshModule',
-    'Implementation-Title: Example Simple SSH and REST Command Option Bean Parse Listener',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-sshAndRestCommandOptionBeanParseListener__plugin'],
-)
diff --git a/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE b/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
index a122188..73a755d 100644
--- a/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
+++ b/example-sshAndRestCommandOptionBeanParseListener/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshAndRestCommandOptionBeanParseListener/lib/gerrit/BUCK b/example-sshAndRestCommandOptionBeanParseListener/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-sshAndRestCommandOptionBeanParseListener/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-sshAndRestCommandOptionBeanParseListener/pom.xml b/example-sshAndRestCommandOptionBeanParseListener/pom.xml
index f0b45c9..7c5d953 100644
--- a/example-sshAndRestCommandOptionBeanParseListener/pom.xml
+++ b/example-sshAndRestCommandOptionBeanParseListener/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-sshAndRestCommandOptionBeanParseListener</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-sshAndRestCommandOptionBeanParseListener/src/main/java/com/googlesource/gerrit/plugins/examples/sshandrestcommandoptionbeanparselistener/Modules.java b/example-sshAndRestCommandOptionBeanParseListener/src/main/java/com/googlesource/gerrit/plugins/examples/sshandrestcommandoptionbeanparselistener/Modules.java
index b91c5cb..9508065 100644
--- a/example-sshAndRestCommandOptionBeanParseListener/src/main/java/com/googlesource/gerrit/plugins/examples/sshandrestcommandoptionbeanparselistener/Modules.java
+++ b/example-sshAndRestCommandOptionBeanParseListener/src/main/java/com/googlesource/gerrit/plugins/examples/sshandrestcommandoptionbeanparselistener/Modules.java
@@ -17,7 +17,7 @@
 import com.google.gerrit.extensions.annotations.Exports;
 import com.google.gerrit.httpd.plugins.HttpPluginModule;
 import com.google.gerrit.server.DynamicOptions;
-import com.google.gerrit.server.query.change.QueryChanges;
+import com.google.gerrit.server.restapi.change.QueryChanges;
 import com.google.gerrit.sshd.commands.Query;
 import com.google.inject.AbstractModule;
 import org.kohsuke.args4j.Option;
diff --git a/example-sshAndRestCommandOptionBeanParseListener/tools/bzl/plugin.bzl b/example-sshAndRestCommandOptionBeanParseListener/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-sshAndRestCommandOptionBeanParseListener/tools/bzl/plugin.bzl
+++ b/example-sshAndRestCommandOptionBeanParseListener/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-sshCommandAlias/.buckconfig b/example-sshCommandAlias/.buckconfig
deleted file mode 100644
index 7f7d882..0000000
--- a/example-sshCommandAlias/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-sshCommandAlias
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-sshCommandAlias/.gitignore b/example-sshCommandAlias/.gitignore
index db1c934..16a6bd7 100644
--- a/example-sshCommandAlias/.gitignore
+++ b/example-sshCommandAlias/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-sshCommandAlias/BUCK b/example-sshCommandAlias/BUCK
deleted file mode 100644
index 3cb5ddd..0000000
--- a/example-sshCommandAlias/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-sshCommandAlias',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-sshCommandAlias',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.sshcommandalias.SshModule',
-    'Implementation-Title: Example Ssh Command Alias',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-sshCommandAlias__plugin'],
-)
diff --git a/example-sshCommandAlias/WORKSPACE b/example-sshCommandAlias/WORKSPACE
index 00047c0..aef2088 100644
--- a/example-sshCommandAlias/WORKSPACE
+++ b/example-sshCommandAlias/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandAlias/lib/gerrit/BUCK b/example-sshCommandAlias/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-sshCommandAlias/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-sshCommandAlias/pom.xml b/example-sshCommandAlias/pom.xml
index 67ed518..ab9c3ea 100644
--- a/example-sshCommandAlias/pom.xml
+++ b/example-sshCommandAlias/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-sshCommandAlias</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-sshCommandAlias/tools/bzl/plugin.bzl b/example-sshCommandAlias/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-sshCommandAlias/tools/bzl/plugin.bzl
+++ b/example-sshCommandAlias/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-sshCommandDelegateDynamicBean/BUCK b/example-sshCommandDelegateDynamicBean/BUCK
deleted file mode 100644
index afcb8ae..0000000
--- a/example-sshCommandDelegateDynamicBean/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-sshCommandDelegateDynamicBean',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-sshCommandDelegateDynamicBean',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.sshcommanddelegatedynamicbean.SshModule',
-    'Implementation-Title: Example SSH Command Delegate Dynamic Bean',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-sshCommandDelegateDynamicBean__plugin'],
-)
diff --git a/example-sshCommandDelegateDynamicBean/WORKSPACE b/example-sshCommandDelegateDynamicBean/WORKSPACE
index 795c0d6..b48b8c7 100644
--- a/example-sshCommandDelegateDynamicBean/WORKSPACE
+++ b/example-sshCommandDelegateDynamicBean/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandDelegateDynamicBean/lib/gerrit/BUCK b/example-sshCommandDelegateDynamicBean/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-sshCommandDelegateDynamicBean/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-sshCommandDelegateDynamicBean/pom.xml b/example-sshCommandDelegateDynamicBean/pom.xml
index 956c157..54ec498 100644
--- a/example-sshCommandDelegateDynamicBean/pom.xml
+++ b/example-sshCommandDelegateDynamicBean/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-sshCommandDelegateDynamicBean</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-sshCommandDelegateDynamicBean/tools/bzl/plugin.bzl b/example-sshCommandDelegateDynamicBean/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-sshCommandDelegateDynamicBean/tools/bzl/plugin.bzl
+++ b/example-sshCommandDelegateDynamicBean/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-sshCommandOption/BUCK b/example-sshCommandOption/BUCK
deleted file mode 100644
index b6161be..0000000
--- a/example-sshCommandOption/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-sshCommandOption',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-sshCommandOption',
-    'Gerrit-SshModule: com.googlesource.gerrit.plugins.examples.sshcommandoption.SshModule',
-    'Implementation-Title: Example Simple SSH Command Option',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-sshCommandOption__plugin'],
-)
diff --git a/example-sshCommandOption/WORKSPACE b/example-sshCommandOption/WORKSPACE
index 7cec05f..8fb4ced 100644
--- a/example-sshCommandOption/WORKSPACE
+++ b/example-sshCommandOption/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-sshCommandOption/lib/gerrit/BUCK b/example-sshCommandOption/lib/gerrit/BUCK
deleted file mode 100644
index 20c888c..0000000
--- a/example-sshCommandOption/lib/gerrit/BUCK
+++ /dev/null
@@ -1,12 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-sshCommandOption/pom.xml b/example-sshCommandOption/pom.xml
index 8f59842..91ccecf 100644
--- a/example-sshCommandOption/pom.xml
+++ b/example-sshCommandOption/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-sshCommandOption</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-sshCommandOption/tools/bzl/plugin.bzl b/example-sshCommandOption/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-sshCommandOption/tools/bzl/plugin.bzl
+++ b/example-sshCommandOption/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-topMenu/.buckconfig b/example-topMenu/.buckconfig
deleted file mode 100644
index 3ab1645..0000000
--- a/example-topMenu/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-topMenu
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-topMenu/.gitignore b/example-topMenu/.gitignore
index db1c934..16a6bd7 100644
--- a/example-topMenu/.gitignore
+++ b/example-topMenu/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-topMenu/BUCK b/example-topMenu/BUCK
deleted file mode 100644
index 3df62e4..0000000
--- a/example-topMenu/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-topMenu',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-topMenu',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.topmenu.Module',
-    'Implementation-Title: Example TopMenu',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-topMenu__plugin'],
-)
diff --git a/example-topMenu/WORKSPACE b/example-topMenu/WORKSPACE
index 00047c0..aef2088 100644
--- a/example-topMenu/WORKSPACE
+++ b/example-topMenu/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-topMenu/lib/gerrit/BUCK b/example-topMenu/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-topMenu/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-topMenu/pom.xml b/example-topMenu/pom.xml
index be789bc..0e5e0a3 100644
--- a/example-topMenu/pom.xml
+++ b/example-topMenu/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-topMenu</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-topMenu/tools/bzl/plugin.bzl b/example-topMenu/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-topMenu/tools/bzl/plugin.bzl
+++ b/example-topMenu/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-usageDataLogger/.buckconfig b/example-usageDataLogger/.buckconfig
deleted file mode 100644
index ee3180a..0000000
--- a/example-usageDataLogger/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-usageDataLogger
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-usageDataLogger/.gitignore b/example-usageDataLogger/.gitignore
index d96b202..401eff3 100644
--- a/example-usageDataLogger/.gitignore
+++ b/example-usageDataLogger/.gitignore
@@ -2,8 +2,5 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
 /bazel-example-usageDataLogger
diff --git a/example-usageDataLogger/BUCK b/example-usageDataLogger/BUCK
deleted file mode 100644
index 09ea366..0000000
--- a/example-usageDataLogger/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-usageDataLogger',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-usageDataLogger',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.usagedatalogger.Module',
-    'Implementation-Title: Example Usage Data Logger',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-usageDataLogger__plugin'],
-)
diff --git a/example-usageDataLogger/WORKSPACE b/example-usageDataLogger/WORKSPACE
index 35f2eec..f8b97d0 100644
--- a/example-usageDataLogger/WORKSPACE
+++ b/example-usageDataLogger/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-usageDataLogger/lib/gerrit/BUCK b/example-usageDataLogger/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-usageDataLogger/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-usageDataLogger/pom.xml b/example-usageDataLogger/pom.xml
index 7011a0c..8bd4712 100644
--- a/example-usageDataLogger/pom.xml
+++ b/example-usageDataLogger/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-usageDataLogger</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-usageDataLogger/tools/bzl/plugin.bzl b/example-usageDataLogger/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-usageDataLogger/tools/bzl/plugin.bzl
+++ b/example-usageDataLogger/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-validationListenerAssignee/.buckconfig b/example-validationListenerAssignee/.buckconfig
deleted file mode 100644
index a597fac..0000000
--- a/example-validationListenerAssignee/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-validationListenerAssignee
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-validationListenerAssignee/.gitignore b/example-validationListenerAssignee/.gitignore
index db1c934..16a6bd7 100644
--- a/example-validationListenerAssignee/.gitignore
+++ b/example-validationListenerAssignee/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-validationListenerAssignee/BUCK b/example-validationListenerAssignee/BUCK
deleted file mode 100644
index 625090c..0000000
--- a/example-validationListenerAssignee/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-validationListenerAssignee',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-validationListenerAssignee',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.validationlistenerassignee.Module',
-    'Implementation-Title: Example Validation Listener Assignee',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-validationListenerAssignee__plugin'],
-)
diff --git a/example-validationListenerAssignee/WORKSPACE b/example-validationListenerAssignee/WORKSPACE
index 3fb085d..0a6da04 100644
--- a/example-validationListenerAssignee/WORKSPACE
+++ b/example-validationListenerAssignee/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerAssignee/lib/gerrit/BUCK b/example-validationListenerAssignee/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-validationListenerAssignee/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-validationListenerAssignee/pom.xml b/example-validationListenerAssignee/pom.xml
index f8c7bc1..c8ab14e 100644
--- a/example-validationListenerAssignee/pom.xml
+++ b/example-validationListenerAssignee/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-validationListenerAssignee</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
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 60fdc03..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
@@ -14,14 +14,14 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenerassignee;
 
+import com.google.gerrit.exceptions.StorageException;
+import com.google.gerrit.index.query.QueryParseException;
 import com.google.gerrit.entities.Account;
 import com.google.gerrit.entities.Change;
-import com.google.gerrit.index.query.QueryParseException;
 import com.google.gerrit.server.query.change.ChangeQueryBuilder;
 import com.google.gerrit.server.query.change.ChangeQueryProcessor;
 import com.google.gerrit.server.validators.AssigneeValidationListener;
 import com.google.gerrit.server.validators.ValidationException;
-import com.google.gwtorm.server.OrmException;
 import com.google.inject.Inject;
 import java.io.IOException;
 import org.eclipse.jgit.errors.ConfigInvalidException;
@@ -41,14 +41,14 @@
   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) {
         throw new ValidationException(
             "Cannot assign user to more than " + MAX_ASSIGNED_CHANGES + " changes");
       }
-    } catch (OrmException | IOException | ConfigInvalidException | QueryParseException e) {
+    } catch (StorageException | IOException | ConfigInvalidException | QueryParseException e) {
       log.error("Failed to validate assignee for change " + change.getId(), e);
       // Allow assignee.
     }
diff --git a/example-validationListenerAssignee/tools/bzl/plugin.bzl b/example-validationListenerAssignee/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-validationListenerAssignee/tools/bzl/plugin.bzl
+++ b/example-validationListenerAssignee/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-validationListenerCommit/.buckconfig b/example-validationListenerCommit/.buckconfig
deleted file mode 100644
index c3ce4c8..0000000
--- a/example-validationListenerCommit/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-validationListenerCommit
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-validationListenerCommit/.gitignore b/example-validationListenerCommit/.gitignore
index db1c934..16a6bd7 100644
--- a/example-validationListenerCommit/.gitignore
+++ b/example-validationListenerCommit/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-validationListenerCommit/BUCK b/example-validationListenerCommit/BUCK
deleted file mode 100644
index e61c849..0000000
--- a/example-validationListenerCommit/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-validationListenerCommit',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-validationListenerCommit',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.validationlistenercommit.Module',
-    'Implementation-Title: Example Validation Listener Commit',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-validationListenerCommit__plugin'],
-)
diff --git a/example-validationListenerCommit/WORKSPACE b/example-validationListenerCommit/WORKSPACE
index 7467937..1c36aba 100644
--- a/example-validationListenerCommit/WORKSPACE
+++ b/example-validationListenerCommit/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerCommit/lib/gerrit/BUCK b/example-validationListenerCommit/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-validationListenerCommit/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-validationListenerCommit/pom.xml b/example-validationListenerCommit/pom.xml
index 812c175..bc4d34c 100644
--- a/example-validationListenerCommit/pom.xml
+++ b/example-validationListenerCommit/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-validationListenerCommit</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-validationListenerCommit/tools/bzl/plugin.bzl b/example-validationListenerCommit/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-validationListenerCommit/tools/bzl/plugin.bzl
+++ b/example-validationListenerCommit/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-validationListenerHashtag/.buckconfig b/example-validationListenerHashtag/.buckconfig
deleted file mode 100644
index 4ef2069..0000000
--- a/example-validationListenerHashtag/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-validationListenerHashtag
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-validationListenerHashtag/.gitignore b/example-validationListenerHashtag/.gitignore
index db1c934..16a6bd7 100644
--- a/example-validationListenerHashtag/.gitignore
+++ b/example-validationListenerHashtag/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-validationListenerHashtag/BUCK b/example-validationListenerHashtag/BUCK
deleted file mode 100644
index 0c76c5a..0000000
--- a/example-validationListenerHashtag/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-validationListenerHashtag',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-validationListenerHashtag',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.validationlistenerhashtag.Module',
-    'Implementation-Title: Example Validation Listener Hashtag',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-validationListenerHashtag__plugin'],
-)
diff --git a/example-validationListenerHashtag/WORKSPACE b/example-validationListenerHashtag/WORKSPACE
index 78ceec7..88fd725 100644
--- a/example-validationListenerHashtag/WORKSPACE
+++ b/example-validationListenerHashtag/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerHashtag/lib/gerrit/BUCK b/example-validationListenerHashtag/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-validationListenerHashtag/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-validationListenerHashtag/pom.xml b/example-validationListenerHashtag/pom.xml
index 847a2d0..15495af 100644
--- a/example-validationListenerHashtag/pom.xml
+++ b/example-validationListenerHashtag/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-validationListenerHashtag</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-validationListenerHashtag/tools/bzl/plugin.bzl b/example-validationListenerHashtag/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-validationListenerHashtag/tools/bzl/plugin.bzl
+++ b/example-validationListenerHashtag/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-validationListenerMerge/.buckconfig b/example-validationListenerMerge/.buckconfig
deleted file mode 100644
index 22eee3f..0000000
--- a/example-validationListenerMerge/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-validationListenerMerge
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-validationListenerMerge/.gitignore b/example-validationListenerMerge/.gitignore
index db1c934..16a6bd7 100644
--- a/example-validationListenerMerge/.gitignore
+++ b/example-validationListenerMerge/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-validationListenerMerge/BUCK b/example-validationListenerMerge/BUCK
deleted file mode 100644
index 49d3948..0000000
--- a/example-validationListenerMerge/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-validationListenerMerge',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-validationListenerMerge',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.validationlistenermerge.Module',
-    'Implementation-Title: Example Validation Listener Merge',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-validationListenerMerge__plugin'],
-)
diff --git a/example-validationListenerMerge/WORKSPACE b/example-validationListenerMerge/WORKSPACE
index 022fda7..698bd54 100644
--- a/example-validationListenerMerge/WORKSPACE
+++ b/example-validationListenerMerge/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerMerge/lib/gerrit/BUCK b/example-validationListenerMerge/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-validationListenerMerge/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-validationListenerMerge/pom.xml b/example-validationListenerMerge/pom.xml
index b63c248..85ba789 100644
--- a/example-validationListenerMerge/pom.xml
+++ b/example-validationListenerMerge/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-validationListenerMerge</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
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 d35dc10..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,7 +14,7 @@
 
 package com.googlesource.gerrit.plugins.examples.validationlistenermerge;
 
-import com.google.gerrit.entities.Branch;
+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;
@@ -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-validationListenerMerge/tools/bzl/plugin.bzl b/example-validationListenerMerge/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-validationListenerMerge/tools/bzl/plugin.bzl
+++ b/example-validationListenerMerge/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-validationListenerNewProjectCreated/.buckconfig b/example-validationListenerNewProjectCreated/.buckconfig
deleted file mode 100644
index 0df5541..0000000
--- a/example-validationListenerNewProjectCreated/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-validationListenerNewProjectCreated
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-validationListenerNewProjectCreated/.gitignore b/example-validationListenerNewProjectCreated/.gitignore
index db1c934..16a6bd7 100644
--- a/example-validationListenerNewProjectCreated/.gitignore
+++ b/example-validationListenerNewProjectCreated/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-validationListenerNewProjectCreated/BUCK b/example-validationListenerNewProjectCreated/BUCK
deleted file mode 100644
index 54a2277..0000000
--- a/example-validationListenerNewProjectCreated/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-validationListenerNewProjectCreated',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-validationListenerNewProjectCreated',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.validationlistenernewprojectcreated.Module',
-    'Implementation-Title: Example Validation Listener NewProjectCreated',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-validationListenerNewProjectCreated__plugin'],
-)
diff --git a/example-validationListenerNewProjectCreated/WORKSPACE b/example-validationListenerNewProjectCreated/WORKSPACE
index 76a1a0d..c9f2199 100644
--- a/example-validationListenerNewProjectCreated/WORKSPACE
+++ b/example-validationListenerNewProjectCreated/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerNewProjectCreated/lib/gerrit/BUCK b/example-validationListenerNewProjectCreated/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-validationListenerNewProjectCreated/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-validationListenerNewProjectCreated/pom.xml b/example-validationListenerNewProjectCreated/pom.xml
index 1229aef..b9bc4e6 100644
--- a/example-validationListenerNewProjectCreated/pom.xml
+++ b/example-validationListenerNewProjectCreated/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-validationListenerNewProjectCreated</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-validationListenerNewProjectCreated/tools/bzl/plugin.bzl b/example-validationListenerNewProjectCreated/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-validationListenerNewProjectCreated/tools/bzl/plugin.bzl
+++ b/example-validationListenerNewProjectCreated/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-validationListenerRefOperation/.buckconfig b/example-validationListenerRefOperation/.buckconfig
deleted file mode 100644
index 81a8e40..0000000
--- a/example-validationListenerRefOperation/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-validationListenerRefOperation
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-validationListenerRefOperation/.gitignore b/example-validationListenerRefOperation/.gitignore
index db1c934..16a6bd7 100644
--- a/example-validationListenerRefOperation/.gitignore
+++ b/example-validationListenerRefOperation/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-validationListenerRefOperation/BUCK b/example-validationListenerRefOperation/BUCK
deleted file mode 100644
index 35d515f..0000000
--- a/example-validationListenerRefOperation/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-validationListenerRefOperation',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-validationListenerRefOperation',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.validationlistenerrefoperation.Module',
-    'Implementation-Title: Example Validation Listener RefOperation',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-validationListenerRefOperation__plugin'],
-)
diff --git a/example-validationListenerRefOperation/WORKSPACE b/example-validationListenerRefOperation/WORKSPACE
index 0a0276e..deb7563 100644
--- a/example-validationListenerRefOperation/WORKSPACE
+++ b/example-validationListenerRefOperation/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerRefOperation/lib/gerrit/BUCK b/example-validationListenerRefOperation/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-validationListenerRefOperation/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-validationListenerRefOperation/pom.xml b/example-validationListenerRefOperation/pom.xml
index 208f1ad..25cc758 100644
--- a/example-validationListenerRefOperation/pom.xml
+++ b/example-validationListenerRefOperation/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-validationListenerRefOperation</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-validationListenerRefOperation/tools/bzl/plugin.bzl b/example-validationListenerRefOperation/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-validationListenerRefOperation/tools/bzl/plugin.bzl
+++ b/example-validationListenerRefOperation/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-validationListenerUpload/.buckconfig b/example-validationListenerUpload/.buckconfig
deleted file mode 100644
index 277e01e..0000000
--- a/example-validationListenerUpload/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-validationListenerUpload
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-validationListenerUpload/.gitignore b/example-validationListenerUpload/.gitignore
index db1c934..16a6bd7 100644
--- a/example-validationListenerUpload/.gitignore
+++ b/example-validationListenerUpload/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-validationListenerUpload/BUCK b/example-validationListenerUpload/BUCK
deleted file mode 100644
index 07b9292..0000000
--- a/example-validationListenerUpload/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-validationListenerUpload',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-validationListenerUpload',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.validationlistenerupload.Module',
-    'Implementation-Title: Example Validation Listener Upload',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-validationListenerUpload__plugin'],
-)
diff --git a/example-validationListenerUpload/WORKSPACE b/example-validationListenerUpload/WORKSPACE
index 806c34c..8d9c07b 100644
--- a/example-validationListenerUpload/WORKSPACE
+++ b/example-validationListenerUpload/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-validationListenerUpload/lib/gerrit/BUCK b/example-validationListenerUpload/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-validationListenerUpload/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-validationListenerUpload/pom.xml b/example-validationListenerUpload/pom.xml
index 0a4bc4a..a811ec7 100644
--- a/example-validationListenerUpload/pom.xml
+++ b/example-validationListenerUpload/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-validationListenerUpload</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-validationListenerUpload/tools/bzl/plugin.bzl b/example-validationListenerUpload/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-validationListenerUpload/tools/bzl/plugin.bzl
+++ b/example-validationListenerUpload/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-webLinkBranch/.buckconfig b/example-webLinkBranch/.buckconfig
deleted file mode 100644
index 7bf4b66..0000000
--- a/example-webLinkBranch/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-webLinkBranch
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-webLinkBranch/.gitignore b/example-webLinkBranch/.gitignore
index db1c934..16a6bd7 100644
--- a/example-webLinkBranch/.gitignore
+++ b/example-webLinkBranch/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-webLinkBranch/BUCK b/example-webLinkBranch/BUCK
deleted file mode 100644
index 740b343..0000000
--- a/example-webLinkBranch/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-webLinkBranch',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-webLinkBranch',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.weblinkbranch.Module',
-    'Implementation-Title: Example WebLink Branch',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-webLinkBranch__plugin'],
-)
diff --git a/example-webLinkBranch/WORKSPACE b/example-webLinkBranch/WORKSPACE
index 2a8b48f..25b7e45 100644
--- a/example-webLinkBranch/WORKSPACE
+++ b/example-webLinkBranch/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkBranch/lib/gerrit/BUCK b/example-webLinkBranch/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-webLinkBranch/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-webLinkBranch/pom.xml b/example-webLinkBranch/pom.xml
index b52782f..80efb59 100644
--- a/example-webLinkBranch/pom.xml
+++ b/example-webLinkBranch/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-webLinkBranch</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-webLinkBranch/tools/bzl/plugin.bzl b/example-webLinkBranch/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-webLinkBranch/tools/bzl/plugin.bzl
+++ b/example-webLinkBranch/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-webLinkFileHistory/.buckconfig b/example-webLinkFileHistory/.buckconfig
deleted file mode 100644
index 0f0ffdd..0000000
--- a/example-webLinkFileHistory/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-webLinkFileHistory
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-webLinkFileHistory/.gitignore b/example-webLinkFileHistory/.gitignore
index db1c934..16a6bd7 100644
--- a/example-webLinkFileHistory/.gitignore
+++ b/example-webLinkFileHistory/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-webLinkFileHistory/BUCK b/example-webLinkFileHistory/BUCK
deleted file mode 100644
index 569f36b..0000000
--- a/example-webLinkFileHistory/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-webLinkFileHistory',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-webLinkFileHistory',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.weblinkfilehistory.Module',
-    'Implementation-Title: Example WebLink FileHistory',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-webLinkFileHistory__plugin'],
-)
diff --git a/example-webLinkFileHistory/WORKSPACE b/example-webLinkFileHistory/WORKSPACE
index 00047c0..aef2088 100644
--- a/example-webLinkFileHistory/WORKSPACE
+++ b/example-webLinkFileHistory/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkFileHistory/lib/gerrit/BUCK b/example-webLinkFileHistory/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-webLinkFileHistory/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-webLinkFileHistory/pom.xml b/example-webLinkFileHistory/pom.xml
index f5be5d1..acb2e7e 100644
--- a/example-webLinkFileHistory/pom.xml
+++ b/example-webLinkFileHistory/pom.xml
@@ -22,7 +22,7 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-webLinkFileHistory</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
diff --git a/example-webLinkFileHistory/tools/bzl/plugin.bzl b/example-webLinkFileHistory/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-webLinkFileHistory/tools/bzl/plugin.bzl
+++ b/example-webLinkFileHistory/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-webLinkPatchSet/.buckconfig b/example-webLinkPatchSet/.buckconfig
deleted file mode 100644
index 04886d6..0000000
--- a/example-webLinkPatchSet/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-webLinkPatchSet
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-webLinkPatchSet/.gitignore b/example-webLinkPatchSet/.gitignore
index db1c934..16a6bd7 100644
--- a/example-webLinkPatchSet/.gitignore
+++ b/example-webLinkPatchSet/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-webLinkPatchSet/BUCK b/example-webLinkPatchSet/BUCK
deleted file mode 100644
index 796bd4b..0000000
--- a/example-webLinkPatchSet/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-webLinkPatchSet',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: example-webLinkPatchSet',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.weblinkpatchset.Module',
-    'Implementation-Title: Example WebLink PatchSet',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-webLinkPatchSet__plugin'],
-)
diff --git a/example-webLinkPatchSet/WORKSPACE b/example-webLinkPatchSet/WORKSPACE
index 00047c0..aef2088 100644
--- a/example-webLinkPatchSet/WORKSPACE
+++ b/example-webLinkPatchSet/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkPatchSet/lib/gerrit/BUCK b/example-webLinkPatchSet/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-webLinkPatchSet/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-webLinkPatchSet/pom.xml b/example-webLinkPatchSet/pom.xml
index e492009..7bf2073 100644
--- a/example-webLinkPatchSet/pom.xml
+++ b/example-webLinkPatchSet/pom.xml
@@ -22,11 +22,11 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-webLinkPatchSet</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
+    <GWT-Version>2.8.2</GWT-Version>
   </properties>
 
   <build>
diff --git a/example-webLinkPatchSet/tools/bzl/plugin.bzl b/example-webLinkPatchSet/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-webLinkPatchSet/tools/bzl/plugin.bzl
+++ b/example-webLinkPatchSet/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-webLinkProject/.buckconfig b/example-webLinkProject/.buckconfig
deleted file mode 100644
index 7fc83a2..0000000
--- a/example-webLinkProject/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-webLinkProject
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-webLinkProject/.gitignore b/example-webLinkProject/.gitignore
index db1c934..16a6bd7 100644
--- a/example-webLinkProject/.gitignore
+++ b/example-webLinkProject/.gitignore
@@ -2,7 +2,4 @@
 /.classpath
 /.settings
 /.project
-/.buckd
-/buck-cache
-/buck-out
 *.iml
diff --git a/example-webLinkProject/BUCK b/example-webLinkProject/BUCK
deleted file mode 100644
index f517263..0000000
--- a/example-webLinkProject/BUCK
+++ /dev/null
@@ -1,27 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-gerrit_plugin(
-  name = 'example-webLinkProject',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  manifest_entries = [
-    'Gerrit-PluginName: cookbook',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.weblinkproject.Module',
-    'Implementation-Title: Cookbook plugin',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_test(
-  name = 'examples_tests',
-  srcs = glob(['src/test/java/**/*IT.java']),
-  labels = ['example-webLinkProject'],
-  deps = GERRIT_PLUGIN_API + GERRIT_TESTS + [
-    ':example-webLinkProject__plugin',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-webLinkProject__plugin'],
-)
diff --git a/example-webLinkProject/WORKSPACE b/example-webLinkProject/WORKSPACE
index 00047c0..aef2088 100644
--- a/example-webLinkProject/WORKSPACE
+++ b/example-webLinkProject/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
+    commit = "5f7ca2e226195c2de6eece2c160a9a7690dc7be8",
     #    local_path = "/home/<user>/projects/bazlets",
 )
 
diff --git a/example-webLinkProject/lib/gerrit/BUCK b/example-webLinkProject/lib/gerrit/BUCK
deleted file mode 100644
index ca3acf9..0000000
--- a/example-webLinkProject/lib/gerrit/BUCK
+++ /dev/null
@@ -1,20 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-webLinkProject/pom.xml b/example-webLinkProject/pom.xml
index 773b80e..37707c9 100644
--- a/example-webLinkProject/pom.xml
+++ b/example-webLinkProject/pom.xml
@@ -22,11 +22,11 @@
   <groupId>com.googlesource.gerrit.plugins</groupId>
   <artifactId>example-webLinkProject</artifactId>
   <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
+  <version>2.16.13</version>
   <properties>
     <Gerrit-ApiType>plugin</Gerrit-ApiType>
     <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
+    <GWT-Version>2.8.2</GWT-Version>
   </properties>
 
   <build>
diff --git a/example-webLinkProject/tools/bzl/plugin.bzl b/example-webLinkProject/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/example-webLinkProject/tools/bzl/plugin.bzl
+++ b/example-webLinkProject/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/.bazelrc b/example-wuiChangeScreenBelowChangeInfoBlock/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/.buckconfig b/example-wuiChangeScreenBelowChangeInfoBlock/.buckconfig
deleted file mode 100644
index 4f087f7..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiChangeScreenBelowChangeInfoBlock
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/BUCK b/example-wuiChangeScreenBelowChangeInfoBlock/BUCK
deleted file mode 100644
index 4abe2ac..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiChangeScreenBelowChangeInfoBlock',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiChangeScreenBelowChangeInfoBlock',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.Module',
-    'Implementation-Title: Example Change Screen Extension Below Change Info Block',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiChangeScreenBelowChangeInfoBlock__plugin'],
-)
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/BUILD b/example-wuiChangeScreenBelowChangeInfoBlock/BUILD
deleted file mode 100644
index 9035d4c..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiChangeScreenBelowChangeInfoBlock",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiChangeScreenBelowChangeInfoBlock",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.Module",
-        "Implementation-Title: Example Change Screen Extension Below Change Info Block",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/LICENSE b/example-wuiChangeScreenBelowChangeInfoBlock/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/WORKSPACE b/example-wuiChangeScreenBelowChangeInfoBlock/WORKSPACE
deleted file mode 100644
index cb67375..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiChangeScreenBelowChangeInfoBlock")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/bazlets.bzl b/example-wuiChangeScreenBelowChangeInfoBlock/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/lib/BUCK b/example-wuiChangeScreenBelowChangeInfoBlock/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/lib/gerrit/BUCK b/example-wuiChangeScreenBelowChangeInfoBlock/lib/gerrit/BUCK
deleted file mode 100644
index 06d0f74..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/lib/gwt/BUCK b/example-wuiChangeScreenBelowChangeInfoBlock/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/lib/ow2/BUCK b/example-wuiChangeScreenBelowChangeInfoBlock/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/pom.xml b/example-wuiChangeScreenBelowChangeInfoBlock/pom.xml
deleted file mode 100644
index fc6e67d..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiChangeScreenBelowChangeInfoBlock</artifactId>
-  <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiChangeScreenBelowChangeInfoBlock</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Change Screen Extension Below Change Info Block</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/HelloForm.gwt.xml b/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/HelloForm.gwt.xml
deleted file mode 100644
index c15cafe..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/HelloForm.gwt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.client.ExamplePlugin"/>
-</module>
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/Module.java b/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/Module.java
deleted file mode 100644
index 0000021..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/Module.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExampleChangeScreenExtension.java b/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExampleChangeScreenExtension.java
deleted file mode 100644
index eb7fcb1..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExampleChangeScreenExtension.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.info.ChangeInfo;
-import com.google.gerrit.client.info.ChangeInfo.RevisionInfo;
-import com.google.gerrit.plugin.client.extension.Panel;
-import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwtexpui.clippy.client.CopyableLabel;
-
-/** Extension for change screen that displays the numeric change ID with copy-to-clipboard icon. */
-public class ExampleChangeScreenExtension extends VerticalPanel {
-  static class Factory implements Panel.EntryPoint {
-    @Override
-    public void onLoad(Panel panel) {
-      panel.setWidget(new ExampleChangeScreenExtension(panel));
-    }
-  }
-
-  ExampleChangeScreenExtension(Panel panel) {
-    ChangeInfo change = panel.getObject(GerritUiExtensionPoint.Key.CHANGE_INFO).cast();
-    RevisionInfo rev = panel.getObject(GerritUiExtensionPoint.Key.REVISION_INFO).cast();
-
-    Grid g = new Grid(2, 2);
-    g.addStyleName("infoBlock");
-    CellFormatter fmt = g.getCellFormatter();
-
-    g.setText(0, 0, "Numeric Change ID");
-    fmt.addStyleName(0, 0, "header");
-    fmt.addStyleName(0, 0, "topmost");
-    fmt.addStyleName(0, 1, "topmost");
-    g.setWidget(0, 1, new CopyableLabel(Integer.toString(change._number())));
-    add(g);
-
-    g.setText(1, 0, "Patch Set ID");
-    fmt.addStyleName(1, 0, "header");
-    fmt.addStyleName(1, 0, "bottomheader");
-    fmt.addStyleName(1, 1, "bottomheader");
-    g.setWidget(1, 1, new CopyableLabel(String.valueOf(rev._number())));
-    add(g);
-  }
-}
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExampleChangeScreenExtensionTwo.java b/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExampleChangeScreenExtensionTwo.java
deleted file mode 100644
index bced2ca..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExampleChangeScreenExtensionTwo.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.info.ChangeInfo;
-import com.google.gerrit.client.info.ChangeInfo.RevisionInfo;
-import com.google.gerrit.plugin.client.extension.Panel;
-import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import com.google.gwtexpui.clippy.client.CopyableLabel;
-
-/** Extension for change screen that displays the numeric change ID with copy-to-clipboard icon. */
-public class ExampleChangeScreenExtensionTwo extends VerticalPanel {
-  static class Factory implements Panel.EntryPoint {
-    @Override
-    public void onLoad(Panel panel) {
-      panel.setWidget(new ExampleChangeScreenExtensionTwo(panel));
-    }
-  }
-
-  ExampleChangeScreenExtensionTwo(Panel panel) {
-    ChangeInfo change = panel.getObject(GerritUiExtensionPoint.Key.CHANGE_INFO).cast();
-    RevisionInfo rev = panel.getObject(GerritUiExtensionPoint.Key.REVISION_INFO).cast();
-
-    Grid g = new Grid(2, 2);
-    g.addStyleName("infoBlock");
-    CellFormatter fmt = g.getCellFormatter();
-
-    g.setText(0, 0, "(2) Numeric Change ID");
-    fmt.addStyleName(0, 0, "header");
-    fmt.addStyleName(0, 0, "topmost");
-    fmt.addStyleName(0, 1, "topmost");
-    g.setWidget(0, 1, new CopyableLabel(Integer.toString(change._number())));
-    add(g);
-
-    g.setText(1, 0, "(2) Patch Set ID");
-    fmt.addStyleName(1, 0, "header");
-    fmt.addStyleName(1, 0, "bottomheader");
-    fmt.addStyleName(1, 1, "bottomheader");
-    g.setWidget(1, 1, new CopyableLabel(String.valueOf(rev._number())));
-    add(g);
-  }
-}
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExamplePlugin.java b/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExamplePlugin.java
deleted file mode 100644
index 312c857..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenbelowchangeinfoblock/client/ExamplePlugin.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenbelowchangeinfoblock.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gwt.core.client.GWT;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get()
-        .panel(
-            GerritUiExtensionPoint.CHANGE_SCREEN_BELOW_CHANGE_INFO_BLOCK,
-            new ExampleChangeScreenExtension.Factory(),
-            "first");
-    Plugin.get()
-        .panel(
-            GerritUiExtensionPoint.CHANGE_SCREEN_BELOW_CHANGE_INFO_BLOCK,
-            new ExampleChangeScreenExtensionTwo.Factory(),
-            "second");
-  }
-}
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/resources/Documentation/about.md b/example-wuiChangeScreenBelowChangeInfoBlock/src/main/resources/Documentation/about.md
deleted file mode 100644
index 1fed9b8..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Sample plugin to demonstrate adding a Change Screen extension to Gerrit that is below the Change Info Block.
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/tools/bzl/BUILD b/example-wuiChangeScreenBelowChangeInfoBlock/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/tools/bzl/plugin.bzl b/example-wuiChangeScreenBelowChangeInfoBlock/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiChangeScreenBelowChangeInfoBlock/tools/workspace-status.sh b/example-wuiChangeScreenBelowChangeInfoBlock/tools/workspace-status.sh
deleted file mode 100755
index 934cacd..0000000
--- a/example-wuiChangeScreenBelowChangeInfoBlock/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUICHANGESCREENBELOWCHANGEINFOBLOCK_LABEL $(rev)
diff --git a/example-wuiChangeScreenHeader/.bazelrc b/example-wuiChangeScreenHeader/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiChangeScreenHeader/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiChangeScreenHeader/.buckconfig b/example-wuiChangeScreenHeader/.buckconfig
deleted file mode 100644
index 9c47216..0000000
--- a/example-wuiChangeScreenHeader/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiChangeScreenHeader
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiChangeScreenHeader/BUCK b/example-wuiChangeScreenHeader/BUCK
deleted file mode 100644
index 2b79c3c..0000000
--- a/example-wuiChangeScreenHeader/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenheader.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiChangeScreenHeader',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiChangeScreenHeader',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenheader.Module',
-    'Implementation-Title: Example Change Screen Header Extension',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiChangeScreenHeader__plugin'],
-)
diff --git a/example-wuiChangeScreenHeader/BUILD b/example-wuiChangeScreenHeader/BUILD
deleted file mode 100644
index 490034b..0000000
--- a/example-wuiChangeScreenHeader/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenheader.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiChangeScreenHeader",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiChangeScreenHeader",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenheader.Module",
-        "Implementation-Title: Example Change Screen Header Extension",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiChangeScreenHeader/LICENSE b/example-wuiChangeScreenHeader/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiChangeScreenHeader/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiChangeScreenHeader/WORKSPACE b/example-wuiChangeScreenHeader/WORKSPACE
deleted file mode 100644
index 37ad4a3..0000000
--- a/example-wuiChangeScreenHeader/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiChangeScreenHeader")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiChangeScreenHeader/bazlets.bzl b/example-wuiChangeScreenHeader/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiChangeScreenHeader/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiChangeScreenHeader/lib/BUCK b/example-wuiChangeScreenHeader/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiChangeScreenHeader/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiChangeScreenHeader/lib/gerrit/BUCK b/example-wuiChangeScreenHeader/lib/gerrit/BUCK
deleted file mode 100644
index 06d0f74..0000000
--- a/example-wuiChangeScreenHeader/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiChangeScreenHeader/lib/gwt/BUCK b/example-wuiChangeScreenHeader/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiChangeScreenHeader/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiChangeScreenHeader/lib/ow2/BUCK b/example-wuiChangeScreenHeader/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiChangeScreenHeader/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiChangeScreenHeader/pom.xml b/example-wuiChangeScreenHeader/pom.xml
deleted file mode 100644
index 37dfffe..0000000
--- a/example-wuiChangeScreenHeader/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiChangeScreenHeader</artifactId>
-  <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiChangeScreenHeader</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuichangescreenheader.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Change Screen Header Extension</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuichangescreenheader.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/HelloForm.gwt.xml b/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/HelloForm.gwt.xml
deleted file mode 100644
index ddb853c..0000000
--- a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/HelloForm.gwt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuichangescreenheader.client.ExamplePlugin"/>
-</module>
diff --git a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/Module.java b/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/Module.java
deleted file mode 100644
index 8507a5e..0000000
--- a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/Module.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheader;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/client/ChangeScreenStatusExtension.java b/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/client/ChangeScreenStatusExtension.java
deleted file mode 100644
index 46170fe..0000000
--- a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/client/ChangeScreenStatusExtension.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheader.client;
-
-import com.google.gerrit.plugin.client.extension.Panel;
-import com.google.gwt.dom.client.Style.Unit;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.InlineLabel;
-
-/** Extension for change screen that displays a status in the header bar. */
-public class ChangeScreenStatusExtension extends FlowPanel {
-  static class Factory implements Panel.EntryPoint {
-    @Override
-    public void onLoad(Panel panel) {
-      panel.setWidget(new ChangeScreenStatusExtension());
-    }
-  }
-
-  ChangeScreenStatusExtension() {
-    getElement().getStyle().setPadding(5, Unit.PX);
-    add(new Image(ExamplePlugin.RESOURCES.greenCheck()));
-    add(new InlineLabel("OK"));
-  }
-}
diff --git a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/client/ExamplePlugin.java b/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/client/ExamplePlugin.java
deleted file mode 100644
index 5679e0d..0000000
--- a/example-wuiChangeScreenHeader/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheader/client/ExamplePlugin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheader.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gwt.core.client.GWT;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get()
-        .panel(
-            GerritUiExtensionPoint.CHANGE_SCREEN_HEADER,
-            new ChangeScreenStatusExtension.Factory(),
-            "status");
-  }
-}
diff --git a/example-wuiChangeScreenHeader/src/main/resources/Documentation/about.md b/example-wuiChangeScreenHeader/src/main/resources/Documentation/about.md
deleted file mode 100644
index ca76fbd..0000000
--- a/example-wuiChangeScreenHeader/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Sample plugin to demonstrate an extension to the Change Screen header
diff --git a/example-wuiChangeScreenHeader/tools/bzl/BUILD b/example-wuiChangeScreenHeader/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiChangeScreenHeader/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiChangeScreenHeader/tools/bzl/plugin.bzl b/example-wuiChangeScreenHeader/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiChangeScreenHeader/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiChangeScreenHeader/tools/workspace-status.sh b/example-wuiChangeScreenHeader/tools/workspace-status.sh
deleted file mode 100755
index 7d49665..0000000
--- a/example-wuiChangeScreenHeader/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUICHANGESCREENHEADER_LABEL $(rev)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/.bazelrc b/example-wuiChangeScreenHeaderRightOfButtons/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/.buckconfig b/example-wuiChangeScreenHeaderRightOfButtons/.buckconfig
deleted file mode 100644
index 4130594..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiChangeScreenHeaderRightOfButtons
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/BUCK b/example-wuiChangeScreenHeaderRightOfButtons/BUCK
deleted file mode 100644
index 030b54a..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiChangeScreenHeaderRightOfButtons',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiChangeScreenHeaderRightOfButtons',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.Module',
-    'Implementation-Title: Example Change Screen Header Extension Right Of Buttons',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiChangeScreenHeaderRightOfButtons__plugin'],
-)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/BUILD b/example-wuiChangeScreenHeaderRightOfButtons/BUILD
deleted file mode 100644
index 2c74247..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiChangeScreenHeaderRightOfButtons",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiChangeScreenHeaderRightOfButtons",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.Module",
-        "Implementation-Title: Example Change Screen Header Extension Right Of Buttons",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/LICENSE b/example-wuiChangeScreenHeaderRightOfButtons/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/WORKSPACE b/example-wuiChangeScreenHeaderRightOfButtons/WORKSPACE
deleted file mode 100644
index 45ebe0a..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiChangeScreenHeaderRightOfButtons")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/bazlets.bzl b/example-wuiChangeScreenHeaderRightOfButtons/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/lib/BUCK b/example-wuiChangeScreenHeaderRightOfButtons/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/lib/gerrit/BUCK b/example-wuiChangeScreenHeaderRightOfButtons/lib/gerrit/BUCK
deleted file mode 100644
index 06d0f74..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/lib/gwt/BUCK b/example-wuiChangeScreenHeaderRightOfButtons/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/lib/ow2/BUCK b/example-wuiChangeScreenHeaderRightOfButtons/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/pom.xml b/example-wuiChangeScreenHeaderRightOfButtons/pom.xml
deleted file mode 100644
index dcd4cd4..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiChangeScreenHeaderRightOfButtons</artifactId>
-  <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiChangeScreenHeaderRightOfButtons</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Change Screen Header Extension Right Of Buttons</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/HelloForm.gwt.xml b/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/HelloForm.gwt.xml
deleted file mode 100644
index 4d7947e..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/HelloForm.gwt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.client.ExamplePlugin"/>
-</module>
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/Module.java b/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/Module.java
deleted file mode 100644
index 25b6824..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/Module.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/client/ExamplePlugin.java b/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/client/ExamplePlugin.java
deleted file mode 100644
index e1200a3..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/client/ExamplePlugin.java
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gerrit.plugin.client.extension.Panel;
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Button;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get()
-        .panel(
-            GerritUiExtensionPoint.CHANGE_SCREEN_HEADER_RIGHT_OF_BUTTONS,
-            new Panel.EntryPoint() {
-              @Override
-              public void onLoad(Panel panel) {
-                Button b = new HighlightButton("Library-Compliance+1");
-                b.addClickHandler(
-                    new ClickHandler() {
-                      @Override
-                      public void onClick(ClickEvent event) {
-                        Window.alert("TODO");
-                      }
-                    });
-                panel.setWidget(b);
-              }
-            },
-            "library_compliance");
-  }
-}
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/client/HighlightButton.java b/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/client/HighlightButton.java
deleted file mode 100644
index a15cf17..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofbuttons/client/HighlightButton.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofbuttons.client;
-
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder;
-
-/**
- * Highlight button for header line in change screen.
- *
- * <p>This class can *only* be used within a panel that extends the header line of the change
- * screen, but will not work standalone.
- */
-public class HighlightButton extends Button {
-
-  public HighlightButton(String text) {
-    // Create Button with inner div. This is required to get proper styling
-    // in the context of the change screen.
-    super(
-        (new SafeHtmlBuilder())
-            .openDiv()
-            .appendAttribute("style", "color: #fff;")
-            .append(text)
-            .closeDiv());
-    getElement().removeClassName("gwt-Button");
-    getElement().getStyle().setBackgroundColor("#4d90fe");
-  }
-}
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/src/main/resources/Documentation/about.md b/example-wuiChangeScreenHeaderRightOfButtons/src/main/resources/Documentation/about.md
deleted file mode 100644
index 003fb08..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Sample plugin to demonstrate an extension to the Change Screen header that is right of the buttons
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/tools/bzl/BUILD b/example-wuiChangeScreenHeaderRightOfButtons/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/tools/bzl/plugin.bzl b/example-wuiChangeScreenHeaderRightOfButtons/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiChangeScreenHeaderRightOfButtons/tools/workspace-status.sh b/example-wuiChangeScreenHeaderRightOfButtons/tools/workspace-status.sh
deleted file mode 100755
index e88d7d8..0000000
--- a/example-wuiChangeScreenHeaderRightOfButtons/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUICHANGESCREENHEADERRIGHTOFBUTTONS_LABEL $(rev)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/.bazelrc b/example-wuiChangeScreenHeaderRightOfPopDowns/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/.buckconfig b/example-wuiChangeScreenHeaderRightOfPopDowns/.buckconfig
deleted file mode 100644
index 08d2259..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiChangeScreenHeaderRightOfPopDowns
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/BUCK b/example-wuiChangeScreenHeaderRightOfPopDowns/BUCK
deleted file mode 100644
index f3c0c00..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiChangeScreenHeaderRightOfPopDowns',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiChangeScreenHeaderRightOfPopDowns',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.Module',
-    'Implementation-Title: Example Change Screen Header Extension Right Of Pop Downs',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiChangeScreenHeaderRightOfPopDowns__plugin'],
-)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/BUILD b/example-wuiChangeScreenHeaderRightOfPopDowns/BUILD
deleted file mode 100644
index df1eacf..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiChangeScreenHeaderRightOfPopDowns",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiChangeScreenHeaderRightOfPopDowns",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.Module",
-        "Implementation-Title: Example Change Screen Header Extension Right Of Pop Downs",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/LICENSE b/example-wuiChangeScreenHeaderRightOfPopDowns/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/WORKSPACE b/example-wuiChangeScreenHeaderRightOfPopDowns/WORKSPACE
deleted file mode 100644
index 0b98ed8..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiChangeScreenHeaderRightOfPopDowns")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/bazlets.bzl b/example-wuiChangeScreenHeaderRightOfPopDowns/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/BUCK b/example-wuiChangeScreenHeaderRightOfPopDowns/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/gerrit/BUCK b/example-wuiChangeScreenHeaderRightOfPopDowns/lib/gerrit/BUCK
deleted file mode 100644
index 06d0f74..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/gwt/BUCK b/example-wuiChangeScreenHeaderRightOfPopDowns/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/ow2/BUCK b/example-wuiChangeScreenHeaderRightOfPopDowns/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/pom.xml b/example-wuiChangeScreenHeaderRightOfPopDowns/pom.xml
deleted file mode 100644
index be19335..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiChangeScreenHeaderRightOfPopDowns</artifactId>
-  <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiChangeScreenHeaderRightOfPopDowns</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Change Screen Header Extension Right Of Pop Downs</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/HelloForm.gwt.xml b/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/HelloForm.gwt.xml
deleted file mode 100644
index daccfe6..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/HelloForm.gwt.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.client.ExamplePlugin"/>
-  <stylesheet src="example.css"/>
-</module>
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/Module.java b/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/Module.java
deleted file mode 100644
index d9d071b..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/Module.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/BuildsDropDownPanel.java b/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/BuildsDropDownPanel.java
deleted file mode 100644
index 45a99fb..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/BuildsDropDownPanel.java
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.client;
-
-import com.google.gerrit.plugin.client.extension.Panel;
-import com.google.gwt.user.client.ui.FlowPanel;
-import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.InlineHyperlink;
-import com.google.gwt.user.client.ui.InlineLabel;
-
-/** Extension for change screen that displays a status in the header bar. */
-public class BuildsDropDownPanel extends FlowPanel {
-  static class Factory implements Panel.EntryPoint {
-    @Override
-    public void onLoad(Panel panel) {
-      panel.setWidget(new BuildsDropDownPanel());
-    }
-  }
-
-  BuildsDropDownPanel() {
-    Grid g = new Grid(3, 4);
-    g.addStyleName("infoBlock");
-    CellFormatter fmt = g.getCellFormatter();
-
-    g.setText(0, 0, "State");
-    fmt.addStyleName(0, 0, "header");
-    g.setText(0, 1, "PS");
-    fmt.addStyleName(0, 1, "header");
-    g.setText(0, 2, "Date");
-    fmt.addStyleName(0, 2, "header");
-    g.setText(0, 3, "Log");
-    fmt.addStyleName(0, 3, "header");
-
-    HorizontalPanel p = new HorizontalPanel();
-    p.add(new Image(ExamplePlugin.RESOURCES.greenCheck()));
-    p.add(new InlineLabel("OK"));
-    g.setWidget(1, 0, p);
-    g.setWidget(1, 1, new InlineLabel("2"));
-    g.setWidget(1, 2, new InlineLabel("2015-07-09 11:06:13"));
-    g.setWidget(1, 3, new InlineHyperlink("Build Log", "TODO"));
-
-    p = new HorizontalPanel();
-    p.add(new Image(ExamplePlugin.RESOURCES.redNot()));
-    p.add(new InlineLabel("FAILED"));
-    g.setWidget(2, 0, p);
-    g.setWidget(2, 1, new InlineLabel("1"));
-    g.setWidget(2, 2, new InlineLabel("2015-07-09 09:17:28"));
-    g.setWidget(2, 3, new InlineHyperlink("Build Log", "TODO"));
-
-    fmt.addStyleName(0, 0, "topmost");
-    fmt.addStyleName(0, 1, "topmost");
-    fmt.addStyleName(0, 2, "topmost");
-    fmt.addStyleName(0, 3, "topmost");
-
-    add(new PopDownButton("Builds", g));
-  }
-}
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/ExamplePlugin.java b/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/ExamplePlugin.java
deleted file mode 100644
index 582b7b6..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/ExamplePlugin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gwt.core.client.GWT;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get()
-        .panel(
-            GerritUiExtensionPoint.CHANGE_SCREEN_HEADER_RIGHT_OF_POP_DOWNS,
-            new BuildsDropDownPanel.Factory(),
-            "status");
-  }
-}
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/PopDownButton.java b/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/PopDownButton.java
deleted file mode 100644
index 6806e19..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/client/PopDownButton.java
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuichangescreenheaderrightofpopdowns.client;
-
-import com.google.gwt.dom.client.Document;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.Style.FontWeight;
-import com.google.gwt.dom.client.Style.Unit;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.logical.shared.CloseEvent;
-import com.google.gwt.event.logical.shared.CloseHandler;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.PopupPanel;
-import com.google.gwt.user.client.ui.Widget;
-import com.google.gwtexpui.globalkey.client.GlobalKey;
-import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder;
-
-/**
- * Pop down button for header line in change screen.
- *
- * <p>This class implements a button that on click opens a pop down panel with the provided widget,
- * similar to the "Patch Sets", "Download" or "Included In" pop down panels on the change screen.
- *
- * <p>This class can *only* be used within a panel that extends the header line of the change
- * screen, but will not work standalone.
- */
-public class PopDownButton extends Button {
-  private final Widget widget;
-  private PopupPanel popup;
-
-  public PopDownButton(String text, Widget widget) {
-    // Create Button with inner div. This is required to get proper styling
-    // in the context of the change screen.
-    super((new SafeHtmlBuilder()).openDiv().append(text).closeDiv());
-    getElement().removeClassName("gwt-Button");
-    addClickHandler(
-        new ClickHandler() {
-          @Override
-          public void onClick(ClickEvent event) {
-            show();
-          }
-        });
-    this.widget = widget;
-  }
-
-  private void show() {
-    if (popup != null) {
-      getElement().getStyle().clearFontWeight();
-      popup.hide();
-      return;
-    }
-
-    final Widget relativeTo = getParent();
-    final PopupPanel p =
-        new PopupPanel(true) {
-          @Override
-          public void setPopupPosition(int left, int top) {
-            top -= Document.get().getBodyOffsetTop();
-
-            int w = Window.getScrollLeft() + Window.getClientWidth();
-            int r = relativeTo.getAbsoluteLeft() + relativeTo.getOffsetWidth();
-            int right = w - r;
-            Style style = getElement().getStyle();
-            style.clearProperty("left");
-            style.setPropertyPx("right", right);
-            style.setPropertyPx("top", top);
-          }
-        };
-    Style popupStyle = p.getElement().getStyle();
-    popupStyle.setBorderWidth(0, Unit.PX);
-    popupStyle.setBackgroundColor("#EEEEEE");
-    p.addAutoHidePartner(getElement());
-    p.addCloseHandler(
-        new CloseHandler<PopupPanel>() {
-          @Override
-          public void onClose(CloseEvent<PopupPanel> event) {
-            if (popup == p) {
-              getElement().getStyle().clearFontWeight();
-              popup = null;
-            }
-          }
-        });
-    p.add(widget);
-    p.showRelativeTo(relativeTo);
-    GlobalKey.dialog(p);
-    getElement().getStyle().setFontWeight(FontWeight.BOLD);
-    popup = p;
-  }
-}
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/public/example.css b/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/public/example.css
deleted file mode 100644
index 7fa2087..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/java/com/googlesource/gerrit/plugins/examples/wuichangescreenheaderrightofpopdowns/public/example.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.example-panel {
-  border-spacing: 0px 5px;
-}
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/resources/Documentation/about.md b/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/resources/Documentation/about.md
deleted file mode 100644
index 559c6b4..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Sample plugin to demonstrate adding a Change Screen extension as a Drop Down Panel in Gerrit.
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/tools/bzl/BUILD b/example-wuiChangeScreenHeaderRightOfPopDowns/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/tools/bzl/plugin.bzl b/example-wuiChangeScreenHeaderRightOfPopDowns/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiChangeScreenHeaderRightOfPopDowns/tools/workspace-status.sh b/example-wuiChangeScreenHeaderRightOfPopDowns/tools/workspace-status.sh
deleted file mode 100755
index 22b24df..0000000
--- a/example-wuiChangeScreenHeaderRightOfPopDowns/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUICHANGESCREENHEADERRIGHTOFPOPDOWNS_LABEL $(rev)
diff --git a/example-wuiPluginScreen/.bazelrc b/example-wuiPluginScreen/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiPluginScreen/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiPluginScreen/.buckconfig b/example-wuiPluginScreen/.buckconfig
deleted file mode 100644
index 98b47af..0000000
--- a/example-wuiPluginScreen/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiPluginScreen
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiPluginScreen/BUCK b/example-wuiPluginScreen/BUCK
deleted file mode 100644
index eead9d5..0000000
--- a/example-wuiPluginScreen/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuipluginscreen.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiPluginScreen',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiPluginScreen',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuipluginscreen.Module',
-    'Implementation-Title: Example Plugin Screen Extension',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiPluginScreen__plugin'],
-)
diff --git a/example-wuiPluginScreen/BUILD b/example-wuiPluginScreen/BUILD
deleted file mode 100644
index d646b8f..0000000
--- a/example-wuiPluginScreen/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuipluginscreen.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiPluginScreen",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiPluginScreen",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuipluginscreen.Module",
-        "Implementation-Title: Example Plugin Screen Extension",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiPluginScreen/LICENSE b/example-wuiPluginScreen/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiPluginScreen/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiPluginScreen/WORKSPACE b/example-wuiPluginScreen/WORKSPACE
deleted file mode 100644
index fce842b..0000000
--- a/example-wuiPluginScreen/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiSettingsScreen")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiPluginScreen/bazlets.bzl b/example-wuiPluginScreen/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiPluginScreen/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiPluginScreen/lib/BUCK b/example-wuiPluginScreen/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiPluginScreen/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiPluginScreen/lib/gerrit/BUCK b/example-wuiPluginScreen/lib/gerrit/BUCK
deleted file mode 100644
index 802c1b7..0000000
--- a/example-wuiPluginScreen/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.14-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiPluginScreen/lib/gwt/BUCK b/example-wuiPluginScreen/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiPluginScreen/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiPluginScreen/lib/ow2/BUCK b/example-wuiPluginScreen/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiPluginScreen/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiPluginScreen/pom.xml b/example-wuiPluginScreen/pom.xml
deleted file mode 100644
index 3abddec..0000000
--- a/example-wuiPluginScreen/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiPluginScreen</artifactId>
-  <packaging>jar</packaging>
-  <version>2.14-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiPluginScreen</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuipluginscreen.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Plugin Screen Extension</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuipluginscreen.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/HelloForm.gwt.xml b/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/HelloForm.gwt.xml
deleted file mode 100644
index 767b43c..0000000
--- a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/HelloForm.gwt.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuipluginscreen.client.ExamplePlugin"/>
-  <stylesheet src="example.css"/>
-</module>
diff --git a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/HelloTopMenu.java b/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/HelloTopMenu.java
deleted file mode 100644
index 2f6dae8..0000000
--- a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/HelloTopMenu.java
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.topmenu;
-
-import com.google.common.collect.Lists;
-import com.google.gerrit.extensions.annotations.PluginName;
-import com.google.gerrit.extensions.client.MenuItem;
-import com.google.gerrit.extensions.webui.TopMenu;
-import com.google.inject.Inject;
-import java.util.List;
-
-public class HelloTopMenu implements TopMenu {
-  private final List<MenuEntry> menuEntries;
-
-  @Inject
-  public HelloTopMenu(@PluginName String pluginName) {
-    String baseUrl = "/plugins/" + pluginName + "/";
-    List<MenuItem> menuItems = Lists.newArrayListWithCapacity(2);
-    menuItems.add(new MenuItem("Greeting", "#/x/" + pluginName + "/", ""));
-    menuItems.add(new MenuItem("Documentation", baseUrl));
-    menuEntries = Lists.newArrayListWithCapacity(2);
-    menuEntries.add(new MenuEntry("Examples", menuItems));
-    menuEntries.add(
-        new MenuEntry(
-            "Projects",
-            Lists.newArrayList(
-                new MenuItem("Browse Repositories", "https://gerrit.googlesource.com/"))));
-  }
-
-  @Override
-  public List<MenuEntry> getEntries() {
-    return menuEntries;
-  }
-}
diff --git a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/Module.java b/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/Module.java
deleted file mode 100644
index 6806e8a..0000000
--- a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/Module.java
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuipluginscreen;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.TopMenu;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-import com.googlesource.gerrit.plugins.examples.topmenu.HelloTopMenu;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), TopMenu.class).to(HelloTopMenu.class);
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/client/ExamplePlugin.java b/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/client/ExamplePlugin.java
deleted file mode 100644
index 6fc3755..0000000
--- a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/client/ExamplePlugin.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuipluginscreen.client;
-
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gwt.core.client.GWT;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get().screen("", new IndexScreen.Factory());
-  }
-}
diff --git a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/client/IndexScreen.java b/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/client/IndexScreen.java
deleted file mode 100644
index 261a76a..0000000
--- a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/client/IndexScreen.java
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuipluginscreen.client;
-
-import com.google.gerrit.plugin.client.screen.Screen;
-import com.google.gwt.core.client.Scheduler;
-import com.google.gwt.core.client.Scheduler.ScheduledCommand;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.KeyPressEvent;
-import com.google.gwt.event.dom.client.KeyPressHandler;
-import com.google.gwt.user.client.Event;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Image;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.TextBox;
-import com.google.gwt.user.client.ui.VerticalPanel;
-
-class IndexScreen extends VerticalPanel {
-  static class Factory implements Screen.EntryPoint {
-    @Override
-    public void onLoad(Screen screen) {
-      screen.setPageTitle("example index");
-      screen.show(new IndexScreen());
-    }
-  }
-
-  private TextBox usernameTxt;
-  private TextArea greetingTxt;
-
-  IndexScreen() {
-    setStyleName("example-panel");
-
-    Panel labelImagePanel = new HorizontalPanel();
-    Panel usernamePanel = new VerticalPanel();
-    Image img = new Image(ExamplePlugin.RESOURCES.info());
-    img.setTitle("User to send greetings to");
-    labelImagePanel.add(new Label("Username"));
-    labelImagePanel.add(img);
-    labelImagePanel.add(new Label(":"));
-    usernamePanel.add(labelImagePanel);
-    usernameTxt =
-        new TextBox() {
-          @Override
-          public void onBrowserEvent(Event event) {
-            super.onBrowserEvent(event);
-            if (event.getTypeInt() == Event.ONPASTE) {
-              Scheduler.get()
-                  .scheduleDeferred(
-                      new ScheduledCommand() {
-                        @Override
-                        public void execute() {
-                          if (getValue().trim().length() != 0) {
-                            setEnabled(true);
-                          }
-                        }
-                      });
-            }
-          }
-        };
-    usernameTxt.addKeyPressHandler(
-        new KeyPressHandler() {
-          @Override
-          public void onKeyPress(final KeyPressEvent event) {
-            event.stopPropagation();
-          }
-        });
-    usernameTxt.sinkEvents(Event.ONPASTE);
-    usernameTxt.setVisibleLength(40);
-    usernamePanel.add(usernameTxt);
-    add(usernamePanel);
-
-    Panel messagePanel = new VerticalPanel();
-    messagePanel.add(new Label("Message:"));
-    greetingTxt = new TextArea();
-    greetingTxt.addKeyPressHandler(
-        new KeyPressHandler() {
-          @Override
-          public void onKeyPress(final KeyPressEvent event) {
-            event.stopPropagation();
-          }
-        });
-    greetingTxt.setVisibleLines(12);
-    greetingTxt.setCharacterWidth(80);
-    greetingTxt.getElement().setPropertyBoolean("spellcheck", false);
-    messagePanel.add(greetingTxt);
-    add(messagePanel);
-
-    Button helloButton = new Button("Say Hello");
-    helloButton.addStyleName("example-helloButton");
-    helloButton.addClickHandler(
-        new ClickHandler() {
-          @Override
-          public void onClick(final ClickEvent event) {
-            sayHello();
-          }
-        });
-    add(helloButton);
-    helloButton.setEnabled(true);
-  }
-
-  private void sayHello() {
-    String username = usernameTxt.getValue();
-    String greeting = greetingTxt.getText();
-    if (username == null) {
-      username = "";
-    } else {
-      username = username.trim();
-    }
-    if (greeting == null) {
-      greeting = "";
-    } else {
-      greeting = greeting.trim();
-    }
-    StringBuilder sb = new StringBuilder();
-    sb.append("Hey ");
-    sb.append(username.isEmpty() ? "Dude" : username);
-    sb.append(", ");
-    sb.append(greeting.isEmpty() ? "what's up?" : greeting);
-    Window.alert(sb.toString());
-  }
-}
diff --git a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/public/example.css b/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/public/example.css
deleted file mode 100644
index cca1597..0000000
--- a/example-wuiPluginScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuipluginscreen/public/example.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.example-panel {
-  border-spacing: 0px 5px;
-}
-
-.example-helloButton {
-  margin-left: 35px !important;
-  margin-right: 450px !important;
-}
diff --git a/example-wuiPluginScreen/src/main/resources/Documentation/about.md b/example-wuiPluginScreen/src/main/resources/Documentation/about.md
deleted file mode 100644
index e814753..0000000
--- a/example-wuiPluginScreen/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Sample plugin to demonstrate an Index Screen extension.
-
-An example Index Screen is located under the Examples (TopMenu) > Greetings section
diff --git a/example-wuiPluginScreen/tools/bzl/BUILD b/example-wuiPluginScreen/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiPluginScreen/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiPluginScreen/tools/bzl/plugin.bzl b/example-wuiPluginScreen/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiPluginScreen/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiPluginScreen/tools/workspace-status.sh b/example-wuiPluginScreen/tools/workspace-status.sh
deleted file mode 100755
index f337593..0000000
--- a/example-wuiPluginScreen/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUIPLUGINSCREEN_LABEL $(rev)
diff --git a/example-wuiPreferenceScreenBottom/.bazelrc b/example-wuiPreferenceScreenBottom/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiPreferenceScreenBottom/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiPreferenceScreenBottom/.buckconfig b/example-wuiPreferenceScreenBottom/.buckconfig
deleted file mode 100644
index e681d2b..0000000
--- a/example-wuiPreferenceScreenBottom/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiPreferenceScreenBottom
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiPreferenceScreenBottom/BUCK b/example-wuiPreferenceScreenBottom/BUCK
deleted file mode 100644
index 9668611..0000000
--- a/example-wuiPreferenceScreenBottom/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiPreferenceScreenBottom',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiPreferenceScreenBottom',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.Module',
-    'Implementation-Title: Example Preference Screen Panel Bottom',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiPreferenceScreenBottom__plugin'],
-)
diff --git a/example-wuiPreferenceScreenBottom/BUILD b/example-wuiPreferenceScreenBottom/BUILD
deleted file mode 100644
index 3ef1e83..0000000
--- a/example-wuiPreferenceScreenBottom/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiPreferenceScreenBottom",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiPreferenceScreenBottom",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.Module",
-        "Implementation-Title: Example Preference Screen Panel Bottom",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiPreferenceScreenBottom/LICENSE b/example-wuiPreferenceScreenBottom/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiPreferenceScreenBottom/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiPreferenceScreenBottom/WORKSPACE b/example-wuiPreferenceScreenBottom/WORKSPACE
deleted file mode 100644
index bbdb4df..0000000
--- a/example-wuiPreferenceScreenBottom/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiPreferenceScreenBottom")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiPreferenceScreenBottom/bazlets.bzl b/example-wuiPreferenceScreenBottom/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiPreferenceScreenBottom/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiPreferenceScreenBottom/lib/BUCK b/example-wuiPreferenceScreenBottom/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiPreferenceScreenBottom/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiPreferenceScreenBottom/lib/gerrit/BUCK b/example-wuiPreferenceScreenBottom/lib/gerrit/BUCK
deleted file mode 100644
index 06d0f74..0000000
--- a/example-wuiPreferenceScreenBottom/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiPreferenceScreenBottom/lib/gwt/BUCK b/example-wuiPreferenceScreenBottom/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiPreferenceScreenBottom/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiPreferenceScreenBottom/lib/ow2/BUCK b/example-wuiPreferenceScreenBottom/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiPreferenceScreenBottom/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiPreferenceScreenBottom/pom.xml b/example-wuiPreferenceScreenBottom/pom.xml
deleted file mode 100644
index dbc62b3..0000000
--- a/example-wuiPreferenceScreenBottom/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiPreferenceScreenBottom</artifactId>
-  <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiPreferenceScreenBottom</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Preference Screen Panel Bottom</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/.public/example.css b/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/.public/example.css
deleted file mode 100644
index cca1597..0000000
--- a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/.public/example.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.example-panel {
-  border-spacing: 0px 5px;
-}
-
-.example-helloButton {
-  margin-left: 35px !important;
-  margin-right: 450px !important;
-}
diff --git a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/HelloForm.gwt.xml b/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/HelloForm.gwt.xml
deleted file mode 100644
index 3b31233..0000000
--- a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/HelloForm.gwt.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.client.ExamplePlugin"/>
-</module>
diff --git a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/Module.java b/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/Module.java
deleted file mode 100644
index 79883b0..0000000
--- a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/Module.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/client/ChangeScreenPreferencePanel.java b/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/client/ChangeScreenPreferencePanel.java
deleted file mode 100644
index bbee10a..0000000
--- a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/client/ChangeScreenPreferencePanel.java
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.client;
-
-import com.google.gerrit.client.info.GeneralPreferences;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.extension.Panel;
-import com.google.gerrit.plugin.client.rpc.RestApi;
-import com.google.gwt.dom.client.Style.Unit;
-import com.google.gwt.event.dom.client.ChangeEvent;
-import com.google.gwt.event.dom.client.ChangeHandler;
-import com.google.gwt.user.client.Timer;
-import com.google.gwt.user.client.rpc.AsyncCallback;
-import com.google.gwt.user.client.ui.HorizontalPanel;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.ListBox;
-import com.google.gwt.user.client.ui.VerticalPanel;
-import java.util.Map;
-
-public class ChangeScreenPreferencePanel extends VerticalPanel {
-  private static final String DEFAULT = "DEFAULT";
-  private static final String EXAMPLE = "EXAMPLE";
-  private static final String OTHER = "OTHER";
-  private static final String DEFAULT_URL_MATCH = "/c/(.*)";
-  private static final String EXAMPLE_URL_TOKEN = "/x/" + Plugin.get().getName() + "/c/$1";
-
-  static class Factory implements Panel.EntryPoint {
-    @Override
-    public void onLoad(Panel panel) {
-      panel.setWidget(new ChangeScreenPreferencePanel());
-    }
-  }
-
-  private Label savedLabel;
-  private Timer hideTimer;
-
-  ChangeScreenPreferencePanel() {
-    new RestApi("accounts")
-        .id("self")
-        .view("preferences")
-        .get(
-            new AsyncCallback<GeneralPreferences>() {
-              @Override
-              public void onSuccess(GeneralPreferences result) {
-                display(result);
-              }
-
-              @Override
-              public void onFailure(Throwable caught) {
-                // never invoked
-              }
-            });
-  }
-
-  private void display(final GeneralPreferences info) {
-    Label heading = new Label(Plugin.get().getName() + " plugin");
-    heading.setStyleName("smallHeading");
-    add(heading);
-    HorizontalPanel p = new HorizontalPanel();
-    add(p);
-
-    Label label = new Label("Change Screen:");
-    p.add(label);
-    label.getElement().getStyle().setMarginRight(5, Unit.PX);
-    label.getElement().getStyle().setMarginTop(2, Unit.PX);
-    final ListBox box = new ListBox();
-    p.add(box);
-    savedLabel = new Label("Saved");
-    savedLabel.getElement().getStyle().setMarginLeft(5, Unit.PX);
-    savedLabel.getElement().getStyle().setMarginTop(2, Unit.PX);
-    savedLabel.setVisible(false);
-    p.add(savedLabel);
-
-    box.addItem(DEFAULT, DEFAULT);
-    box.addItem(EXAMPLE, EXAMPLE);
-
-    String selected = DEFAULT;
-    if (info.urlAliases().containsKey(DEFAULT_URL_MATCH)) {
-      String token = info.urlAliases().get(DEFAULT_URL_MATCH);
-      if (token.equals(EXAMPLE_URL_TOKEN)) {
-        selected = EXAMPLE;
-      } else if (!token.equals(DEFAULT_URL_MATCH)) {
-        box.addItem(OTHER, OTHER);
-        selected = OTHER;
-      }
-    }
-
-    for (int i = 0; i < box.getItemCount(); i++) {
-      if (selected.equals(box.getValue(i))) {
-        box.setSelectedIndex(i);
-        break;
-      }
-    }
-
-    box.addChangeHandler(
-        new ChangeHandler() {
-          @Override
-          public void onChange(ChangeEvent event) {
-            savedLabel.setVisible(false);
-            if (box.getSelectedValue().equals(OTHER)) {
-              return;
-            }
-
-            Map<String, String> urlAliases = info.urlAliases();
-            if (box.getSelectedValue().equals(EXAMPLE)) {
-              urlAliases.put(DEFAULT_URL_MATCH, EXAMPLE_URL_TOKEN);
-            } else {
-              urlAliases.remove(DEFAULT_URL_MATCH);
-            }
-            info.setUrlAliases(urlAliases);
-
-            new RestApi("accounts")
-                .id("self")
-                .view("preferences")
-                .put(
-                    info,
-                    new AsyncCallback<GeneralPreferences>() {
-                      @Override
-                      public void onSuccess(GeneralPreferences result) {
-                        Plugin.get().refreshUserPreferences();
-                        showSavedStatus();
-                      }
-
-                      @Override
-                      public void onFailure(Throwable caught) {
-                        // never invoked
-                      }
-                    });
-          }
-        });
-  }
-
-  private void showSavedStatus() {
-    if (hideTimer != null) {
-      hideTimer.cancel();
-      hideTimer = null;
-    }
-    savedLabel.setVisible(true);
-    hideTimer =
-        new Timer() {
-          @Override
-          public void run() {
-            savedLabel.setVisible(false);
-            hideTimer = null;
-          }
-        };
-    hideTimer.schedule(1000);
-  }
-}
diff --git a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/client/ExamplePlugin.java b/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/client/ExamplePlugin.java
deleted file mode 100644
index 2714cf6..0000000
--- a/example-wuiPreferenceScreenBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuipreferencescreenbottom/client/ExamplePlugin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuipreferencescreenbottom.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gwt.core.client.GWT;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get()
-        .panel(
-            GerritUiExtensionPoint.PREFERENCES_SCREEN_BOTTOM,
-            new ChangeScreenPreferencePanel.Factory(),
-            "change_screen_preferences");
-  }
-}
diff --git a/example-wuiPreferenceScreenBottom/src/main/resources/Documentation/about.md b/example-wuiPreferenceScreenBottom/src/main/resources/Documentation/about.md
deleted file mode 100644
index 87eea80..0000000
--- a/example-wuiPreferenceScreenBottom/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Sample plugin to demonstrate extending the Preferences under Gerrit's Settings page
diff --git a/example-wuiPreferenceScreenBottom/tools/bzl/BUILD b/example-wuiPreferenceScreenBottom/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiPreferenceScreenBottom/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiPreferenceScreenBottom/tools/bzl/plugin.bzl b/example-wuiPreferenceScreenBottom/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiPreferenceScreenBottom/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiPreferenceScreenBottom/tools/workspace-status.sh b/example-wuiPreferenceScreenBottom/tools/workspace-status.sh
deleted file mode 100755
index bb6abd1..0000000
--- a/example-wuiPreferenceScreenBottom/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUIPREFERENCESCREENBOTTOM_LABEL $(rev)
diff --git a/example-wuiProfileExtensionBottom/.bazelrc b/example-wuiProfileExtensionBottom/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiProfileExtensionBottom/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiProfileExtensionBottom/.buckconfig b/example-wuiProfileExtensionBottom/.buckconfig
deleted file mode 100644
index 53b220b..0000000
--- a/example-wuiProfileExtensionBottom/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiProfileExtensionBottom
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiProfileExtensionBottom/BUCK b/example-wuiProfileExtensionBottom/BUCK
deleted file mode 100644
index bd262fb..0000000
--- a/example-wuiProfileExtensionBottom/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiProfileExtensionBottom',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiProfileExtensionBottom',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.Module',
-    'Implementation-Title: Example Profile Extension Bottom',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiProfileExtensionBottom__plugin'],
-)
diff --git a/example-wuiProfileExtensionBottom/BUILD b/example-wuiProfileExtensionBottom/BUILD
deleted file mode 100644
index c2e0e16..0000000
--- a/example-wuiProfileExtensionBottom/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiProfileExtensionBottom",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiProfileExtensionBottom",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.Module",
-        "Implementation-Title: Example Profile Extension Bottom",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiProfileExtensionBottom/LICENSE b/example-wuiProfileExtensionBottom/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiProfileExtensionBottom/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiProfileExtensionBottom/WORKSPACE b/example-wuiProfileExtensionBottom/WORKSPACE
deleted file mode 100644
index 4b41fca..0000000
--- a/example-wuiProfileExtensionBottom/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiProfileExtensionBottom")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiProfileExtensionBottom/bazlets.bzl b/example-wuiProfileExtensionBottom/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiProfileExtensionBottom/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiProfileExtensionBottom/lib/BUCK b/example-wuiProfileExtensionBottom/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiProfileExtensionBottom/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiProfileExtensionBottom/lib/gerrit/BUCK b/example-wuiProfileExtensionBottom/lib/gerrit/BUCK
deleted file mode 100644
index 06d0f74..0000000
--- a/example-wuiProfileExtensionBottom/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiProfileExtensionBottom/lib/gwt/BUCK b/example-wuiProfileExtensionBottom/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiProfileExtensionBottom/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiProfileExtensionBottom/lib/ow2/BUCK b/example-wuiProfileExtensionBottom/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiProfileExtensionBottom/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiProfileExtensionBottom/pom.xml b/example-wuiProfileExtensionBottom/pom.xml
deleted file mode 100644
index 04621fa..0000000
--- a/example-wuiProfileExtensionBottom/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiProfileExtensionBottom</artifactId>
-  <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiProfileExtensionBottom</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Profile Extension Bottom</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/HelloForm.gwt.xml b/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/HelloForm.gwt.xml
deleted file mode 100644
index 9cebdeb..0000000
--- a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/HelloForm.gwt.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.client.ExamplePlugin"/>
-  <stylesheet src="example.css"/>
-</module>
diff --git a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/Module.java b/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/Module.java
deleted file mode 100644
index ef5d5a2..0000000
--- a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/Module.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/client/ExamplePlugin.java b/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/client/ExamplePlugin.java
deleted file mode 100644
index 2770325..0000000
--- a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/client/ExamplePlugin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gwt.core.client.GWT;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get()
-        .panel(
-            GerritUiExtensionPoint.PROFILE_SCREEN_BOTTOM,
-            new ExampleProfileExtension.Factory(),
-            "account_info");
-  }
-}
diff --git a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/client/ExampleProfileExtension.java b/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/client/ExampleProfileExtension.java
deleted file mode 100644
index 7319247..0000000
--- a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/client/ExampleProfileExtension.java
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuiprofileextensionbottom.client;
-
-import com.google.gerrit.client.GerritUiExtensionPoint;
-import com.google.gerrit.client.info.AccountInfo;
-import com.google.gerrit.plugin.client.extension.Panel;
-import com.google.gwt.user.client.ui.Grid;
-import com.google.gwt.user.client.ui.HTMLTable.CellFormatter;
-import com.google.gwt.user.client.ui.VerticalPanel;
-
-/** Extension for the user profile screen. */
-public class ExampleProfileExtension extends VerticalPanel {
-  static class Factory implements Panel.EntryPoint {
-    @Override
-    public void onLoad(Panel panel) {
-      AccountInfo accountInfo = panel.getObject(GerritUiExtensionPoint.Key.ACCOUNT_INFO).cast();
-      panel.setWidget(new ExampleProfileExtension(accountInfo));
-    }
-  }
-
-  ExampleProfileExtension(AccountInfo accountInfo) {
-    Grid g = new Grid(3, 2);
-    g.addStyleName("infoBlock");
-    g.addStyleName("accountInfoBlock");
-    CellFormatter fmt = g.getCellFormatter();
-
-    // TODO: fetch employer and department via REST from server,
-    // e.g. GET /accounts/self/example~info
-
-    g.setText(0, 0, "Employer");
-    fmt.addStyleName(0, 0, "header");
-    g.setText(0, 1, "Example Corporation");
-
-    g.setText(1, 0, "Department");
-    fmt.addStyleName(1, 0, "header");
-    g.setText(1, 1, "Cookies " + accountInfo.email());
-
-    g.setText(2, 0, "Example Email");
-    fmt.addStyleName(2, 0, "header");
-    g.setText(
-        2, 1, accountInfo.username() != null ? accountInfo.username() + "@example.com" : "N/A");
-    add(g);
-
-    fmt.addStyleName(0, 0, "topmost");
-    fmt.addStyleName(0, 1, "topmost");
-    fmt.addStyleName(2, 0, "bottomheader");
-  }
-}
diff --git a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/public/example.css b/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/public/example.css
deleted file mode 100644
index cca1597..0000000
--- a/example-wuiProfileExtensionBottom/src/main/java/com/googlesource/gerrit/plugins/examples/wuiprofileextensionbottom/public/example.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.example-panel {
-  border-spacing: 0px 5px;
-}
-
-.example-helloButton {
-  margin-left: 35px !important;
-  margin-right: 450px !important;
-}
diff --git a/example-wuiProfileExtensionBottom/src/main/resources/Documentation/about.md b/example-wuiProfileExtensionBottom/src/main/resources/Documentation/about.md
deleted file mode 100644
index 396d1fc..0000000
--- a/example-wuiProfileExtensionBottom/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Sample plugin to demonstrate extending Profile under Gerrit's Settings
diff --git a/example-wuiProfileExtensionBottom/tools/bzl/BUILD b/example-wuiProfileExtensionBottom/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiProfileExtensionBottom/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiProfileExtensionBottom/tools/bzl/plugin.bzl b/example-wuiProfileExtensionBottom/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiProfileExtensionBottom/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiProfileExtensionBottom/tools/workspace-status.sh b/example-wuiProfileExtensionBottom/tools/workspace-status.sh
deleted file mode 100755
index 6b8bd87..0000000
--- a/example-wuiProfileExtensionBottom/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUIPROFILEEXTENSIONBOTTOM_LABEL $(rev)
diff --git a/example-wuiSettingsScreen/.bazelrc b/example-wuiSettingsScreen/.bazelrc
deleted file mode 100644
index 4ed16cf..0000000
--- a/example-wuiSettingsScreen/.bazelrc
+++ /dev/null
@@ -1,2 +0,0 @@
-build --workspace_status_command=./tools/workspace-status.sh
-test --build_tests_only
diff --git a/example-wuiSettingsScreen/.buckconfig b/example-wuiSettingsScreen/.buckconfig
deleted file mode 100644
index df6df7e..0000000
--- a/example-wuiSettingsScreen/.buckconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[alias]
-  plugin = //:example-wuiSettingsScreen
-
-[java]
-  src_roots = java, resources
-  source_level = 8
-  target_level = 8
-
-[project]
-  ignore = .git
-
-[cache]
-  mode = dir
-  dir = buck-out/cache
-
diff --git a/example-wuiSettingsScreen/BUCK b/example-wuiSettingsScreen/BUCK
deleted file mode 100644
index 92e74ad..0000000
--- a/example-wuiSettingsScreen/BUCK
+++ /dev/null
@@ -1,21 +0,0 @@
-include_defs('//bucklets/gerrit_plugin.bucklet')
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuisettingsscreen.HelloForm"
-
-gerrit_plugin(
-  name = 'example-wuiSettingsScreen',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  gwt_module = MODULE,
-  manifest_entries = [
-    'Gerrit-PluginName: example-wuiSettingsScreen',
-    'Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuisettingsscreen.Module',
-    'Implementation-Title: Example Settings Screen Extension',
-    'Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples',
-  ],
-)
-
-java_library(
-  name = 'classpath',
-  deps = [':example-wuiSettingsScreen__plugin'],
-)
diff --git a/example-wuiSettingsScreen/BUILD b/example-wuiSettingsScreen/BUILD
deleted file mode 100644
index 5c953e5..0000000
--- a/example-wuiSettingsScreen/BUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-load("//tools/bzl:plugin.bzl", "gerrit_plugin")
-
-MODULE = "com.googlesource.gerrit.plugins.examples.wuisettingsscreen.HelloForm"
-
-gerrit_plugin(
-    name = "example-wuiSettingsScreen",
-    srcs = glob(["src/main/java/**/*.java"]),
-    gwt_module = MODULE,
-    manifest_entries = [
-        "Gerrit-PluginName: example-wuiSettingsScreen",
-        "Gerrit-Module: com.googlesource.gerrit.plugins.examples.wuisettingsscreen.Module",
-        "Implementation-Title: Example Settings Screen Extension",
-    ],
-    resources = glob(["src/main/**/*"]),
-)
diff --git a/example-wuiSettingsScreen/LICENSE b/example-wuiSettingsScreen/LICENSE
deleted file mode 100644
index 11069ed..0000000
--- a/example-wuiSettingsScreen/LICENSE
+++ /dev/null
@@ -1,201 +0,0 @@
-                              Apache License
-                        Version 2.0, January 2004
-                     http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-   "License" shall mean the terms and conditions for use, reproduction,
-   and distribution as defined by Sections 1 through 9 of this document.
-
-   "Licensor" shall mean the copyright owner or entity authorized by
-   the copyright owner that is granting the License.
-
-   "Legal Entity" shall mean the union of the acting entity and all
-   other entities that control, are controlled by, or are under common
-   control with that entity. For the purposes of this definition,
-   "control" means (i) the power, direct or indirect, to cause the
-   direction or management of such entity, whether by contract or
-   otherwise, or (ii) ownership of fifty percent (50%) or more of the
-   outstanding shares, or (iii) beneficial ownership of such entity.
-
-   "You" (or "Your") shall mean an individual or Legal Entity
-   exercising permissions granted by this License.
-
-   "Source" form shall mean the preferred form for making modifications,
-   including but not limited to software source code, documentation
-   source, and configuration files.
-
-   "Object" form shall mean any form resulting from mechanical
-   transformation or translation of a Source form, including but
-   not limited to compiled object code, generated documentation,
-   and conversions to other media types.
-
-   "Work" shall mean the work of authorship, whether in Source or
-   Object form, made available under the License, as indicated by a
-   copyright notice that is included in or attached to the work
-   (an example is provided in the Appendix below).
-
-   "Derivative Works" shall mean any work, whether in Source or Object
-   form, that is based on (or derived from) the Work and for which the
-   editorial revisions, annotations, elaborations, or other modifications
-   represent, as a whole, an original work of authorship. For the purposes
-   of this License, Derivative Works shall not include works that remain
-   separable from, or merely link (or bind by name) to the interfaces of,
-   the Work and Derivative Works thereof.
-
-   "Contribution" shall mean any work of authorship, including
-   the original version of the Work and any modifications or additions
-   to that Work or Derivative Works thereof, that is intentionally
-   submitted to Licensor for inclusion in the Work by the copyright owner
-   or by an individual or Legal Entity authorized to submit on behalf of
-   the copyright owner. For the purposes of this definition, "submitted"
-   means any form of electronic, verbal, or written communication sent
-   to the Licensor or its representatives, including but not limited to
-   communication on electronic mailing lists, source code control systems,
-   and issue tracking systems that are managed by, or on behalf of, the
-   Licensor for the purpose of discussing and improving the Work, but
-   excluding communication that is conspicuously marked or otherwise
-   designated in writing by the copyright owner as "Not a Contribution."
-
-   "Contributor" shall mean Licensor and any individual or Legal Entity
-   on behalf of whom a Contribution has been received by Licensor and
-   subsequently incorporated within the Work.
-
-2. Grant of Copyright License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   copyright license to reproduce, prepare Derivative Works of,
-   publicly display, publicly perform, sublicense, and distribute the
-   Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License. Subject to the terms and conditions of
-   this License, each Contributor hereby grants to You a perpetual,
-   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-   (except as stated in this section) patent license to make, have made,
-   use, offer to sell, sell, import, and otherwise transfer the Work,
-   where such license applies only to those patent claims licensable
-   by such Contributor that are necessarily infringed by their
-   Contribution(s) alone or by combination of their Contribution(s)
-   with the Work to which such Contribution(s) was submitted. If You
-   institute patent litigation against any entity (including a
-   cross-claim or counterclaim in a lawsuit) alleging that the Work
-   or a Contribution incorporated within the Work constitutes direct
-   or contributory patent infringement, then any patent licenses
-   granted to You under this License for that Work shall terminate
-   as of the date such litigation is filed.
-
-4. Redistribution. You may reproduce and distribute copies of the
-   Work or Derivative Works thereof in any medium, with or without
-   modifications, and in Source or Object form, provided that You
-   meet the following conditions:
-
-   (a) You must give any other recipients of the Work or
-       Derivative Works a copy of this License; and
-
-   (b) You must cause any modified files to carry prominent notices
-       stating that You changed the files; and
-
-   (c) You must retain, in the Source form of any Derivative Works
-       that You distribute, all copyright, patent, trademark, and
-       attribution notices from the Source form of the Work,
-       excluding those notices that do not pertain to any part of
-       the Derivative Works; and
-
-   (d) If the Work includes a "NOTICE" text file as part of its
-       distribution, then any Derivative Works that You distribute must
-       include a readable copy of the attribution notices contained
-       within such NOTICE file, excluding those notices that do not
-       pertain to any part of the Derivative Works, in at least one
-       of the following places: within a NOTICE text file distributed
-       as part of the Derivative Works; within the Source form or
-       documentation, if provided along with the Derivative Works; or,
-       within a display generated by the Derivative Works, if and
-       wherever such third-party notices normally appear. The contents
-       of the NOTICE file are for informational purposes only and
-       do not modify the License. You may add Your own attribution
-       notices within Derivative Works that You distribute, alongside
-       or as an addendum to the NOTICE text from the Work, provided
-       that such additional attribution notices cannot be construed
-       as modifying the License.
-
-   You may add Your own copyright statement to Your modifications and
-   may provide additional or different license terms and conditions
-   for use, reproduction, or distribution of Your modifications, or
-   for any such Derivative Works as a whole, provided Your use,
-   reproduction, and distribution of the Work otherwise complies with
-   the conditions stated in this License.
-
-5. Submission of Contributions. Unless You explicitly state otherwise,
-   any Contribution intentionally submitted for inclusion in the Work
-   by You to the Licensor shall be under the terms and conditions of
-   this License, without any additional terms or conditions.
-   Notwithstanding the above, nothing herein shall supersede or modify
-   the terms of any separate license agreement you may have executed
-   with Licensor regarding such Contributions.
-
-6. Trademarks. This License does not grant permission to use the trade
-   names, trademarks, service marks, or product names of the Licensor,
-   except as required for reasonable and customary use in describing the
-   origin of the Work and reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty. Unless required by applicable law or
-   agreed to in writing, Licensor provides the Work (and each
-   Contributor provides its Contributions) on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-   implied, including, without limitation, any warranties or conditions
-   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-   PARTICULAR PURPOSE. You are solely responsible for determining the
-   appropriateness of using or redistributing the Work and assume any
-   risks associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability. In no event and under no legal theory,
-   whether in tort (including negligence), contract, or otherwise,
-   unless required by applicable law (such as deliberate and grossly
-   negligent acts) or agreed to in writing, shall any Contributor be
-   liable to You for damages, including any direct, indirect, special,
-   incidental, or consequential damages of any character arising as a
-   result of this License or out of the use or inability to use the
-   Work (including but not limited to damages for loss of goodwill,
-   work stoppage, computer failure or malfunction, or any and all
-   other commercial damages or losses), even if such Contributor
-   has been advised of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability. While redistributing
-   the Work or Derivative Works thereof, You may choose to offer,
-   and charge a fee for, acceptance of support, warranty, indemnity,
-   or other liability obligations and/or rights consistent with this
-   License. However, in accepting such obligations, You may act only
-   on Your own behalf and on Your sole responsibility, not on behalf
-   of any other Contributor, and only if You agree to indemnify,
-   defend, and hold each Contributor harmless for any liability
-   incurred by, or claims asserted against, such Contributor by reason
-   of your accepting any such warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-APPENDIX: How to apply the Apache License to your work.
-
-   To apply the Apache License to your work, attach the following
-   boilerplate notice, with the fields enclosed by brackets "[]"
-   replaced with your own identifying information. (Don't include
-   the brackets!)  The text should be enclosed in the appropriate
-   comment syntax for the file format. We also recommend that a
-   file or class name and description of purpose be included on the
-   same "printed page" as the copyright notice for easier
-   identification within third-party archives.
-
-Copyright [yyyy] [name of copyright owner]
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
diff --git a/example-wuiSettingsScreen/WORKSPACE b/example-wuiSettingsScreen/WORKSPACE
deleted file mode 100644
index fce842b..0000000
--- a/example-wuiSettingsScreen/WORKSPACE
+++ /dev/null
@@ -1,33 +0,0 @@
-workspace(name = "wuiSettingsScreen")
-
-load("//:bazlets.bzl", "load_bazlets")
-
-load_bazlets(
-    commit = "1650318289e9981c01e9122c62679b814c7d7a48",
-    #    local_path = "/home/<user>/projects/bazlets",
-)
-
-# Release Plugin API
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
-)
-
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_gwt.bzl",
-    "gerrit_gwt",
-)
-
-# Load release Plugin API
-gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-gerrit_gwt()
diff --git a/example-wuiSettingsScreen/bazlets.bzl b/example-wuiSettingsScreen/bazlets.bzl
deleted file mode 100644
index 6c4fffc..0000000
--- a/example-wuiSettingsScreen/bazlets.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
-
-NAME = "com_googlesource_gerrit_bazlets"
-
-def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
diff --git a/example-wuiSettingsScreen/lib/BUCK b/example-wuiSettingsScreen/lib/BUCK
deleted file mode 100644
index d333cba..0000000
--- a/example-wuiSettingsScreen/lib/BUCK
+++ /dev/null
@@ -1,18 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-maven_jar(
-  name = 'junit',
-  id = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
-  license = 'DO_NOT_DISTRIBUTE',
-)
-
-maven_jar(
-  name = 'truth',
-  id = 'com.google.truth:truth:0.27',
-  sha1 = 'bd17774d2dc0fffa884d42c07d2537e86c67acd6',
-  license = 'DO_NOT_DISTRIBUTE',
-  exported_deps = [
-    ':junit',
-  ],
-)
diff --git a/example-wuiSettingsScreen/lib/gerrit/BUCK b/example-wuiSettingsScreen/lib/gerrit/BUCK
deleted file mode 100644
index 06d0f74..0000000
--- a/example-wuiSettingsScreen/lib/gerrit/BUCK
+++ /dev/null
@@ -1,28 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.15-SNAPSHOT'
-REPO = MAVEN_LOCAL
-
-maven_jar(
-  name = 'acceptance-framework',
-  id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'plugin-api',
-  id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-
-maven_jar(
-  name = 'gwtui-api',
-  id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
diff --git a/example-wuiSettingsScreen/lib/gwt/BUCK b/example-wuiSettingsScreen/lib/gwt/BUCK
deleted file mode 100644
index 26e55d3..0000000
--- a/example-wuiSettingsScreen/lib/gwt/BUCK
+++ /dev/null
@@ -1,73 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '2.8.0'
-
-maven_jar(
-  name = 'user',
-  id = 'com.google.gwt:gwt-user:' + VERSION,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'dev',
-  id = 'com.google.gwt:gwt-dev:' + VERSION,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
-  license = 'Apache2.0',
-  attach_source = False,
-)
-
-maven_jar(
-  name = 'javax-validation',
-  id = 'javax.validation:validation-api:1.0.0.GA',
-  bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'jsinterop-annotations',
-  id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'ant',
-  id = 'ant:ant:1.6.5',
-  bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'colt',
-  id = 'colt:colt:1.2.0',
-  attach_source = False,
-  bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'tapestry',
-  id = 'tapestry:tapestry:4.0.2',
-  attach_source = False,
-  bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  license = 'Apache2.0',
-  visibility = ['PUBLIC'],
-)
-
-maven_jar(
-  name = 'w3c-css-sac',
-  id = 'org.w3c.css:sac:1.3',
-  attach_source = False,
-  bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
-  license = 'DO_NOT_DISTRIBUTE',
-  visibility = ['PUBLIC'],
-)
diff --git a/example-wuiSettingsScreen/lib/ow2/BUCK b/example-wuiSettingsScreen/lib/ow2/BUCK
deleted file mode 100644
index 543bc09..0000000
--- a/example-wuiSettingsScreen/lib/ow2/BUCK
+++ /dev/null
@@ -1,39 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VERSION = '5.1'
-
-maven_jar(
-  name = 'ow2-asm',
-  id = 'org.ow2.asm:asm:' + VERSION,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-analysis',
-  id = 'org.ow2.asm:asm-analysis:' + VERSION,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-commons',
-  id = 'org.ow2.asm:asm-commons:' + VERSION,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
-  deps = [':ow2-asm-tree'],
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-tree',
-  id = 'org.ow2.asm:asm-tree:' + VERSION,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
-  license = 'ow2',
-)
-
-maven_jar(
-  name = 'ow2-asm-util',
-  id = 'org.ow2.asm:asm-util:' + VERSION,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
-  license = 'ow2',
-)
diff --git a/example-wuiSettingsScreen/pom.xml b/example-wuiSettingsScreen/pom.xml
deleted file mode 100644
index 55eabd0..0000000
--- a/example-wuiSettingsScreen/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Copyright (C) 2013 The Android Open Source Project
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.googlesource.gerrit.plugins</groupId>
-  <artifactId>example-wuiSettingsScreen</artifactId>
-  <packaging>jar</packaging>
-  <version>2.15-SNAPSHOT</version>
-  <properties>
-    <Gerrit-ApiType>plugin</Gerrit-ApiType>
-    <Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
-    <GWT-Version>2.8.0</GWT-Version>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.4</version>
-        <configuration>
-          <archive>
-            <manifestEntries>
-              <Gerrit-PluginName>example-wuiSettingsScreen</Gerrit-PluginName>
-              <Gerrit-Module>com.googlesource.gerrit.plugins.examples.wuisettingsscreen.Module</Gerrit-Module>
-
-              <Implementation-Vendor>Gerrit Code Review</Implementation-Vendor>
-              <Implementation-URL>https://gerrit-review.googlesource.com/#/admin/projects/plugins/examples</Implementation-URL>
-
-              <Implementation-Title>Example Settings Screen Extension</Implementation-Title>
-              <Implementation-Version>${project.version}</Implementation-Version>
-
-              <Gerrit-ApiType>${Gerrit-ApiType}</Gerrit-ApiType>
-              <Gerrit-ApiVersion>${Gerrit-ApiVersion}</Gerrit-ApiVersion>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
-          <encoding>UTF-8</encoding>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>gwt-maven-plugin</artifactId>
-        <version>${GWT-Version}</version>
-        <configuration>
-          <module>com.googlesource.gerrit.plugins.examples.wuisettingsscreen.HelloForm</module>
-          <disableClassMetadata>true</disableClassMetadata>
-          <disableCastChecking>true</disableCastChecking>
-          <webappDirectory>${project.build.directory}/classes/static</webappDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-${Gerrit-ApiType}-api</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gerrit</groupId>
-      <artifactId>gerrit-plugin-gwtui</artifactId>
-      <version>${Gerrit-ApiVersion}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.gwt</groupId>
-      <artifactId>gwt-user</artifactId>
-      <version>${GWT-Version}</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-
-  <repositories>
-    <repository>
-      <id>maven.org</id>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-</project>
diff --git a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/HelloForm.gwt.xml b/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/HelloForm.gwt.xml
deleted file mode 100644
index bf4cd41..0000000
--- a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/HelloForm.gwt.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (C) 2017 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<module rename-to="example">
-  <!-- Inherit the core Web Toolkit stuff.                        -->
-  <inherits name="com.google.gwt.user.User"/>
-  <!-- Other module inherits                                      -->
-  <inherits name="com.google.gerrit.GerritGwtUICommon"/>
-  <inherits name="com.google.gerrit.Plugin"/>
-  <inherits name="com.google.gwt.http.HTTP"/>
-  <inherits name="com.google.gwt.json.JSON"/>
-  <!-- Using GWT built-in themes adds a number of static          -->
-  <!-- resources to the plugin. No theme inherits lines were      -->
-  <!-- added in order to make this plugin as simple as possible   -->
-  <!-- Specify the app entry point class.                         -->
-  <entry-point class="com.googlesource.gerrit.plugins.examples.wuisettingsscreen.client.ExamplePlugin"/>
-  <stylesheet src="example.css"/>
-</module>
diff --git a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/Module.java b/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/Module.java
deleted file mode 100644
index bb203d2..0000000
--- a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/Module.java
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuisettingsscreen;
-
-import com.google.gerrit.extensions.registration.DynamicSet;
-import com.google.gerrit.extensions.webui.GwtPlugin;
-import com.google.gerrit.extensions.webui.WebUiPlugin;
-import com.google.inject.AbstractModule;
-
-public class Module extends AbstractModule {
-
-  @Override
-  protected void configure() {
-    DynamicSet.bind(binder(), WebUiPlugin.class).toInstance(new GwtPlugin("example"));
-  }
-}
diff --git a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/client/ExamplePlugin.java b/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/client/ExamplePlugin.java
deleted file mode 100644
index c612751..0000000
--- a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/client/ExamplePlugin.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2013 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuisettingsscreen.client;
-
-import com.google.gerrit.client.Resources;
-import com.google.gerrit.plugin.client.Plugin;
-import com.google.gerrit.plugin.client.PluginEntryPoint;
-import com.google.gwt.core.client.GWT;
-
-public class ExamplePlugin extends PluginEntryPoint {
-  public static final Resources RESOURCES = GWT.create(Resources.class);
-
-  @Override
-  public void onPluginLoad() {
-    Plugin.get()
-        .settingsScreen("preferences", "Food Preferences", new FoodPreferencesScreen.Factory());
-  }
-}
diff --git a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/client/FoodPreferencesScreen.java b/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/client/FoodPreferencesScreen.java
deleted file mode 100644
index 98ba029..0000000
--- a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/client/FoodPreferencesScreen.java
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright (C) 2015 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.googlesource.gerrit.plugins.examples.wuisettingsscreen.client;
-
-import com.google.gerrit.plugin.client.screen.Screen;
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-import com.google.gwt.event.dom.client.KeyPressEvent;
-import com.google.gwt.event.dom.client.KeyPressHandler;
-import com.google.gwt.user.client.Window;
-import com.google.gwt.user.client.ui.Button;
-import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.Panel;
-import com.google.gwt.user.client.ui.TextArea;
-import com.google.gwt.user.client.ui.VerticalPanel;
-
-class FoodPreferencesScreen extends VerticalPanel {
-  static class Factory implements Screen.EntryPoint {
-    @Override
-    public void onLoad(Screen screen) {
-      screen.setPageTitle("Settings");
-      screen.show(new FoodPreferencesScreen());
-    }
-  }
-
-  FoodPreferencesScreen() {
-    setStyleName("example-panel");
-
-    Panel messagePanel = new VerticalPanel();
-    messagePanel.add(new Label("Food Allergies or Dietary Concerns:"));
-    TextArea txt = new TextArea();
-    txt.addKeyPressHandler(
-        new KeyPressHandler() {
-          @Override
-          public void onKeyPress(final KeyPressEvent event) {
-            event.stopPropagation();
-          }
-        });
-    txt.setVisibleLines(12);
-    txt.setCharacterWidth(80);
-    txt.getElement().setPropertyBoolean("spellcheck", false);
-    messagePanel.add(txt);
-    add(messagePanel);
-
-    Button helloButton = new Button("Save");
-    helloButton.addStyleName("example-helloButton");
-    helloButton.addClickHandler(
-        new ClickHandler() {
-          @Override
-          public void onClick(final ClickEvent event) {
-            Window.alert("TODO: implement save");
-          }
-        });
-    add(helloButton);
-    helloButton.setEnabled(true);
-  }
-}
diff --git a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/public/example.css b/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/public/example.css
deleted file mode 100644
index cca1597..0000000
--- a/example-wuiSettingsScreen/src/main/java/com/googlesource/gerrit/plugins/examples/wuisettingsscreen/public/example.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.example-panel {
-  border-spacing: 0px 5px;
-}
-
-.example-helloButton {
-  margin-left: 35px !important;
-  margin-right: 450px !important;
-}
diff --git a/example-wuiSettingsScreen/src/main/resources/Documentation/about.md b/example-wuiSettingsScreen/src/main/resources/Documentation/about.md
deleted file mode 100644
index fe525a6..0000000
--- a/example-wuiSettingsScreen/src/main/resources/Documentation/about.md
+++ /dev/null
@@ -1 +0,0 @@
-Sample plugin to demonstrate adding a new section under Gerrit's Settings page
diff --git a/example-wuiSettingsScreen/tools/bzl/BUILD b/example-wuiSettingsScreen/tools/bzl/BUILD
deleted file mode 100644
index e69de29..0000000
--- a/example-wuiSettingsScreen/tools/bzl/BUILD
+++ /dev/null
diff --git a/example-wuiSettingsScreen/tools/bzl/plugin.bzl b/example-wuiSettingsScreen/tools/bzl/plugin.bzl
deleted file mode 100644
index 2b1df8c..0000000
--- a/example-wuiSettingsScreen/tools/bzl/plugin.bzl
+++ /dev/null
@@ -1,4 +0,0 @@
-load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
-)
diff --git a/example-wuiSettingsScreen/tools/workspace-status.sh b/example-wuiSettingsScreen/tools/workspace-status.sh
deleted file mode 100755
index bed9889..0000000
--- a/example-wuiSettingsScreen/tools/workspace-status.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# This script will be run by bazel when the build process starts to
-# generate key-value information that represents the status of the
-# workspace. The output should be like
-#
-# KEY1 VALUE1
-# KEY2 VALUE2
-#
-# If the script exits with non-zero code, it's considered as a failure
-# and the output will be discarded.
-
-function rev() {
-  git describe --always --match "v[0-9].*" --dirty
-}
-
-echo STABLE_BUILD_EXAMPLE-WUISETTINGSSCREEN_LABEL $(rev)
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index 2b1df8c..89a1643 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,4 +1,8 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
+    _gerrit_plugin = "gerrit_plugin",
+    _plugin_deps = "PLUGIN_DEPS",
 )
+
+gerrit_plugin = _gerrit_plugin
+PLUGIN_DEPS = _plugin_deps