Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  Set project and Gerrit version to v3.5.6
  Remove Maven legacy pom.xml
  Make events-broker a Gerrit plugin
  Provide subscribers with consumer's group id
  Remove actual implementation of InProcessBrokerApi
  Set event-broker and gerrit version to v3.4.8
  Add interface ExtendedBrokerApi to consume messages with groupId

Change-Id: I9f487679f9363081c86272a27bc88e10e8af9101
diff --git a/BUILD b/BUILD
index 86e9d62..2d0d9ae 100644
--- a/BUILD
+++ b/BUILD
@@ -1,11 +1,9 @@
 package(default_visibility = ["//visibility:public"])
 
-load("@rules_java//java:defs.bzl", "java_library")
 load("//tools/bzl:junit.bzl", "junit_tests")
 load(
     "//tools/bzl:plugin.bzl",
     "PLUGIN_DEPS",
-    "PLUGIN_DEPS_NEVERLINK",
     "PLUGIN_TEST_DEPS",
     "gerrit_plugin",
 )
@@ -22,6 +20,6 @@
     srcs = glob(["src/test/java/**/*.java"]),
     tags = ["events-broker"],
     deps = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
-        ":events-broker",
+        ":events-broker__plugin",
     ],
 )