Merge branch 'stable-2.14'

* stable-2.14:
  List{Branches,Tags}: Use "-S' as alias for "--start" instead of "-s"
  Export commons:dbcp in gerrit-plugin-api
  Improve documentation of list plugins 'all' option

Change-Id: I0b43b0d0bcd6afbe9e22ef9c8413b6cdfb7918a4

Documentation/rest-api-projects.txt

@@ -1182,7 +1182,7 @@ Limit the number of branches to be included in the results.
   ]
 ----
 
-Skip(s)::
+Skip(S)::
 Skip the given number of branches from the beginning of the list.
 +
 .Request
@@ -1860,7 +1860,7 @@ Limit the number of tags to be included in the results.
   ]
 ----
 
-Skip(s)::
+Skip(S)::
 Skip the given number of tags from the beginning of the list.
 +
 .Request

gerrit-gwtui/src/main/java/com/google/gerrit/client/projects/ProjectApi.java

@@ -49,7 +49,7 @@ public class ProjectApi {
       Project.NameKey name, String viewName, int limit, int start, String match) {
     RestApi call = project(name).view(viewName);
     call.addParameter("n", limit);
-    call.addParameter("s", start);
+    call.addParameter("S", start);
     if (match != null) {
       if (match.startsWith("^")) {
         call.addParameter("r", match);

gerrit-plugin-api/BUILD

@@ -20,6 +20,7 @@ EXPORTS = [
     "//gerrit-gwtexpui:server",
     "//gerrit-reviewdb:server",
     "//gerrit-server:prolog-common",
+    "//lib/commons:dbcp",
     "//lib/commons:lang",
     "//lib/commons:lang3",
     "//lib/dropwizard:dropwizard-core",

gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java

@@ -69,7 +69,7 @@ public class ListBranches implements RestReadView<ProjectResource> {
 
   @Option(
     name = "--start",
-    aliases = {"-s"},
+    aliases = {"-S"},
     metaVar = "CNT",
     usage = "number of branches to skip"
   )

gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java

@@ -67,7 +67,7 @@ public class ListTags implements RestReadView<ProjectResource> {
 
   @Option(
     name = "--start",
-    aliases = {"-s"},
+    aliases = {"-S"},
     metaVar = "CNT",
     usage = "number of tags to skip"
   )