Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Upgrade bazlets to latest stable-2.15 to build with 2.15.12 API
Upgrade bazlets to latest stable-2.14 to build with 2.14.19 API
Maven: Build with 2.15.11
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Update bazlets to fix build with bazel 0.23
Upgrade bazlets to latest stable-2.15 to build with 2.15.11 API
WORKSPACE: Make heading comment space indent consistent
Maven: Build with Gerrit 2.15.10 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.10 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.9 API
Maven: Build with 2.15.8 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.8 API
Maven: Build with 2.14.18 API
Upgrade bazlets to latest stable-2.14 to build with 2.14.18 API
Bazel: Include eclipse-out directory in .bazelignore
Bazel: Migrate `tools/bazel.rc` to `.bazelrc`
Upgrade bazlets to latest stable-2.15 to build with 2.15.7 API
Upgrade bazlets to latest stable-2.14 to build with 2.14.17 API
PublishEventListener: Don't hard-code "All-Projects"
PublishEventListener: Inject PluginConfigFactory via constructor
UnsupportedMessageGenerator: Remove unused ProjectConfig member
Maven: Build with API 2.15.6
Maven: Build with API 2.14.16
Upgrade bazlets to latest stable-2.15 to build with 2.15.6 API
WORKSPACE: Replace custom local_path with template
WORKSPACE: Replace custom local_path with template
Upgrade bazlets to latest stable-2.14 to build with 2.14.16 API
WebhookClient: Add missing @Override annotation
Open auto-closeable resources in try-with-resource
Align Eclipse compiler settings with core Gerrit's
bazlets: Replace native.git_repository with skylark rule
Maven: Format pom.xml with xmllint
Maven: Remove commented-out plugins
Maven: Upgrade maven-compiler-plugin to 3.8.0
Maven: Build with 2.14.15 API
bazlets: Replace native.git_repository with skylark rule
Format all Bazel build files with buildifier
Format all Java files with google-java-format
Format all Bazel build files with buildifier
Format all Java files with google-java-format
Upgrade bazlets to latest stable-2.15 to build with 2.15.5 API
Upgrade bazlets to latest stable-2.14 to build with 2.14.15 API
Maven: Build with 2.14.13 API
Bazel: Migrate `tools/bazel.rc` to `.bazelrc`
Bazel: Update bazlets to latest stable-2.14 to build with 2.14.13 API
Restores missing proxy config assignments
Adds proxy support
Adds proxy support
Maven: Upgrade maven-jar-plugin to 3.1.0
Maven: Build with 2.14.8 API
Bazel: Upgrade bazlets to latest stable-2.14 revision to use 2.14.8 API
Format all Java files with google-java-format
Optionally ignore wip/private patch sets and notify on state change
Bazel: Update bazlets to latest stable-2.15 to use 2.15-rc3 API
Format WORKSPACE with buildifier
Format all Java files with google-java-format
Format WORKSPACE with buildifier
Add Bazel build
WebhookClient: Simplify getResponse method
WebhookClient: Simplify getResponse method
Add Bazel build
Build with 2.14.7 API
Add Eclipse generated files to .gitignore
Add Eclipse generated files to .gitignore
Upgrade maven-compiler-plugin to 3.7.0 and build with Java 8
Upgrade maven-compiler-plugin to 3.7.0 and build with Java 8
Build with API version 2.14.6
Ignore no code change and rebase patch sets
Update API dependency to 2.15-rc3
Puts more emphasis on the commit title in published messages
Updates unit tests for fallback message changes
Adds commit message to the attachment fallback
Reworks message generation
Change-Id: I789407949a7d3347ff41d639d31eda43ff284ef6
diff --git a/WORKSPACE b/WORKSPACE
index acb7f8e..a204f3c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "f4fcc606a6afa8ce27a013bcf62e495a5ec2505c",
+ commit = "5c1e201c6835e56a69a980c72206431e2a9d7d80",
#local_path = "/home/<user>/projects/bazlets"
)
diff --git a/pom.xml b/pom.xml
index e46f766..f0ed5d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<groupId>com.cisco.gerrit.plugins</groupId>
<artifactId>slack-integration</artifactId>
<packaging>jar</packaging>
- <version>2.15.11</version>
+ <version>2.16.6</version>
<name>Slack Integration Plugin</name>
<properties>
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;
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);
