Merge branch 'stable-2.8' into stable-2.9

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

Change-Id: I7c4b47f1023b9db24d7742e3cf56d5b734184188

tools/maven/package.defs

diff --git a/tools/maven/package.defs b/tools/maven/package.defs
index 3171a31..9e5a144 100644
--- a/tools/maven/package.defs
+++ b/tools/maven/package.defs
@@ -18,11 +18,12 @@
     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)