commit e19d88ac3fc7999e014d25931d9bf53484d66e97
author Marco Miller <marco.miller@ericsson.com> Thu Sep 12 16:03:54 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Thu Sep 12 16:03:54 2019 -0400
tree 93f8869dae25c468130bafa62d93514c877cb27e
parent 4ad1772808fd6d5bbc66da86bc3bd96251102f4b
parent 5a7dfb996fcdbe0458f7dd3567ca38920b95d9b3

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade bazlets to latest stable-2.15
  Bump required bazel version to 1.0.0rc2
  Upgrade bazlets to latest stable-2.14

Change-Id: I8566c68c4e2cf777aafa7602e69d00618e583b19

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index a2ec773..09c2e90 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "5f03aec7c72e743079ea2ecad5530f4684ca7d45",
+    commit = "3df1fac2202ac2a42cec61fac8c502178c9af391",
     #local_path = "/home/<user>/projects/bazlets"
 )
 

src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java

diff --git a/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java b/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
index f0988d1..148d15a 100644
--- a/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
+++ b/src/main/java/com/cisco/gerrit/plugins/slack/PublishEventListener.java
@@ -21,13 +21,13 @@
 import com.cisco.gerrit.plugins.slack.config.ProjectConfig;
 import com.cisco.gerrit.plugins.slack.message.MessageGenerator;
 import com.cisco.gerrit.plugins.slack.message.MessageGeneratorFactory;
-import com.google.gerrit.common.EventListener;
 import com.google.gerrit.extensions.annotations.Listen;
 import com.google.gerrit.server.config.AllProjectsName;
 import com.google.gerrit.server.config.PluginConfigFactory;
 import com.google.gerrit.server.events.ChangeMergedEvent;
 import com.google.gerrit.server.events.CommentAddedEvent;
 import com.google.gerrit.server.events.Event;
+import com.google.gerrit.server.events.EventListener;
 import com.google.gerrit.server.events.PatchSetCreatedEvent;
 import com.google.gerrit.server.events.ReviewerAddedEvent;
 import com.google.gerrit.server.events.WorkInProgressStateChangedEvent;

src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java

diff --git a/src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java b/src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java
index d672922..c5ab66a 100644
--- a/src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java
+++ b/src/test/java/com/cisco/gerrit/plugins/slack/PublishEventListenerTest.java
@@ -22,14 +22,10 @@
 
 import com.google.gerrit.server.config.AllProjectsName;
 import com.google.gerrit.server.config.PluginConfigFactory;
-import com.google.gerrit.server.events.ChangeMergedEvent;
-import com.google.gerrit.server.events.PatchSetCreatedEvent;
 import org.junit.Before;
 import org.junit.Test;
 
 public class PublishEventListenerTest {
-  private PatchSetCreatedEvent mockPatchSetCreatedEvent = mock(PatchSetCreatedEvent.class);
-  private ChangeMergedEvent mockChangeMergedEvent = mock(ChangeMergedEvent.class);
   private PluginConfigFactory mockConfigFactory = mock(PluginConfigFactory.class);
   private AllProjectsName mockAllProjectsName = mock(AllProjectsName.class);