Merge branch 'stable-2.9'

* stable-2.9:
  Include gerrit.war in api_{install,deploy}

Change-Id: I5f9222d82ec252a3cc3ee00b7e5a0f1feec64d2b

tools/build.defs

@@ -78,7 +78,7 @@ def war(
     visibility = visibility,
   )
 
-def gerrit_war(name, ui = 'ui_optdbg', context = [], docs = False):
+def gerrit_war(name, ui = 'ui_optdbg', context = [], docs = False, visibility = []):
   war(
     name = name,
     libs = LIBS + ['//gerrit-war:version'],
@@ -89,4 +89,5 @@ def gerrit_war(name, ui = 'ui_optdbg', context = [], docs = False):
       '//gerrit-gwtui:' + ui + '.zip',
     ] + context,
     docs = docs,
+    visibility = visibility,
   )

tools/maven/BUCK

@@ -22,6 +22,7 @@ maven_package(
     'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-javadoc',
     'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-javadoc',
   },
+  war = {'gerrit-war': '//:release'},
 )
 
 python_binary(

tools/maven/package.defs

@@ -18,11 +18,12 @@ def maven_package(
     url = None,
     jar = {},
     src = {},
-    doc = {}):
+    doc = {},
+    war = {}):
   cmd = ['$(exe //tools/maven:mvn)', '-v', version, '-o', '$OUT']
   dep = []
 
-  for type,d in [('jar', jar), ('java-source', src), ('javadoc', doc)]:
+  for type,d in [('jar', jar), ('java-source', src), ('javadoc', doc), ('war', war)]:
     for a,t in d.iteritems():
       cmd.append('-s %s:%s:$(location %s)' % (a,type,t))
       dep.append(t)