Merge branch 'stable-3.3'
* stable-3.3:
Publish metrics when producing and consuming messages
Add Gerrit-CI validation
Change-Id: I289149c980686297b8dbcbff80dd35907c550534
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 3616263..aaa2036 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -45,8 +45,8 @@
maven_jar(
name = "events-broker",
- artifact = "com.gerritforge:events-broker:3.3.1",
- sha1 = "90775e671946b20e52be3a11277d1ed33973d66e",
+ artifact = "com.gerritforge:events-broker:3.4.0-rc0",
+ sha1 = "8c34c88103d4783eb4c4decde6d93541bc1cf064",
)
maven_jar(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/pubsub/Module.java b/src/main/java/com/googlesource/gerrit/plugins/pubsub/Module.java
index 32110dd..82e6133 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/pubsub/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/pubsub/Module.java
@@ -14,11 +14,11 @@
package com.googlesource.gerrit.plugins.pubsub;
-import com.gerritforge.gerrit.eventbroker.EventGsonProvider;
import com.google.api.gax.core.CredentialsProvider;
import com.google.gerrit.extensions.config.FactoryModule;
import com.google.gerrit.extensions.events.LifecycleListener;
import com.google.gerrit.extensions.registration.DynamicSet;
+import com.google.gerrit.server.events.EventGsonProvider;
import com.google.gerrit.server.events.EventListener;
import com.google.gson.Gson;
import com.google.inject.Inject;