Merge branch 'stable-3.1'
* stable-3.1:
Upgrade bazlets to latest stable-3.1 to build with 3.1.7 API
Upgrade bazlets to latest stable-3.0 to build with 3.0.11 API
Remove the commented-out snapshot plugin api lines
Adapt SNAPSHOT plugin api example to the 3.1 version
Upgrade bazlets to latest stable-3.1
Prepare for new gerrit_api snapshot version usage
Upgrade bazlets to latest stable-3.0
Adapt to changed signature of apply(...) methods
Upgrade bazlets to latest stable-3.0
Change-Id: Id24cf0dcdd25689a60781405fb6908221b739db4
diff --git a/WORKSPACE b/WORKSPACE
index f0522bf..88d0986 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -7,24 +7,13 @@
#local_path = "/home/<user>/projects/bazlets",
)
-# Release Plugin API
load(
"@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
"gerrit_api",
)
-# Snapshot Plugin API
-#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
-#)
-
-# Load release Plugin API
gerrit_api()
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
load(":external_plugin_deps.bzl", "external_plugin_deps")
external_plugin_deps()
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsGlobalConfig.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsGlobalConfig.java
index 3f92417..1db9358 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsGlobalConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsGlobalConfig.java
@@ -36,7 +36,7 @@
}
@Override
- public Response apply(ProjectResource resource) throws RestApiException {
+ public Response<LfsGlobalConfigInfo> apply(ProjectResource resource) throws RestApiException {
adminView.validate(resource);
LfsGlobalConfigInfo info = new LfsGlobalConfigInfo();
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsProjectConfig.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsProjectConfig.java
index aedfad1..c445d77 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsProjectConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/GetLfsProjectConfig.java
@@ -32,7 +32,7 @@
}
@Override
- public Response apply(ProjectResource resource) throws RestApiException {
+ public Response<LfsProjectConfigInfo> apply(ProjectResource resource) throws RestApiException {
LfsProjectConfigInfo info = new LfsProjectConfigInfo();
LfsProjectConfigSection config =
lfsConfigFactory.getProjectsConfig().getForProject(resource.getNameKey());
diff --git a/src/main/java/com/googlesource/gerrit/plugins/lfs/PutLfsGlobalConfig.java b/src/main/java/com/googlesource/gerrit/plugins/lfs/PutLfsGlobalConfig.java
index 8a5457a..de66bbb 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/lfs/PutLfsGlobalConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/lfs/PutLfsGlobalConfig.java
@@ -64,7 +64,7 @@
}
@Override
- public Response apply(ProjectResource resource, LfsGlobalConfigInput input)
+ public Response<LfsGlobalConfigInfo> apply(ProjectResource resource, LfsGlobalConfigInput input)
throws RestApiException {
adminView.validate(resource);
Project.NameKey projectName = resource.getNameKey();
