Merge branch 'stable-3.0' into stable-3.1
* stable-3.0:
Upgrade bazlets to latest stable-3.0 to build with 3.0.12 API
Upgrade bazlets to latest stable-2.16 to build with 2.16.22 API
Change-Id: I688b22790812931fe4c4ba14a6291af15bd55d48
diff --git a/WORKSPACE b/WORKSPACE
index c0230ee..03f81e3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "6d2b8f41ed34dad925b767399d1e4be378abb029",
+ commit = "b6cb89690a5e06261932eb30c95fd8db34a7943a",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/src/main/java/com/googlesource/gerrit/plugins/messageoftheday/GetMessage.java b/src/main/java/com/googlesource/gerrit/plugins/messageoftheday/GetMessage.java
index c0181a5..85cb1b1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/messageoftheday/GetMessage.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/messageoftheday/GetMessage.java
@@ -19,6 +19,7 @@
import com.google.common.base.Strings;
import com.google.gerrit.extensions.annotations.PluginData;
import com.google.gerrit.extensions.annotations.PluginName;
+import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestReadView;
import com.google.gerrit.server.config.ConfigResource;
import com.google.gerrit.server.config.SitePaths;
@@ -61,7 +62,7 @@
}
@Override
- public MessageOfTheDayInfo apply(ConfigResource rsrc) {
+ public Response<MessageOfTheDayInfo> apply(ConfigResource rsrc) {
MessageOfTheDayInfo motd = new MessageOfTheDayInfo();
cfg = new FileBasedConfig(cfgFile, FS.DETECTED);
try {
@@ -105,7 +106,7 @@
motd.redisplay = getRedisplay();
- return motd;
+ return Response.ok(motd);
}
private Date getRedisplay() {
