Merge branch 'stable-2.15'
* stable-2.15: Add optional dir_name argument to gerrit_plugin Format WORKSPACE and BUILD files with buildifier version 0.12.0 Move commons-io from lib/BUILD to lib/commons/BUILD Change-Id: I63bf9cec7e81f3f0f7ef88addf99e544bc1d7479
This commit is contained in:
		@@ -1,7 +1,7 @@
 | 
			
		||||
workspace(name = "gerrit")
 | 
			
		||||
 | 
			
		||||
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 | 
			
		||||
load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_LOCAL")
 | 
			
		||||
load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_LOCAL", "maven_jar")
 | 
			
		||||
load("//lib/codemirror:cm.bzl", "CM_VERSION", "DIFF_MATCH_PATCH_VERSION")
 | 
			
		||||
load("//plugins:external_plugin_deps.bzl", "external_plugin_deps")
 | 
			
		||||
 | 
			
		||||
@@ -220,7 +220,7 @@ maven_jar(
 | 
			
		||||
    sha1 = "8c3492f7662fa1cbf8ca76a0f5eb1146f7725acd",
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
load("//lib:guava.bzl", "GUAVA_VERSION", "GUAVA_BIN_SHA1")
 | 
			
		||||
load("//lib:guava.bzl", "GUAVA_BIN_SHA1", "GUAVA_VERSION")
 | 
			
		||||
 | 
			
		||||
maven_jar(
 | 
			
		||||
    name = "guava",
 | 
			
		||||
@@ -946,7 +946,7 @@ maven_jar(
 | 
			
		||||
    sha1 = "65bd0cacc9c79a21c6ed8e9f588577cd3c2f85b9",
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
load("//tools/bzl:js.bzl", "npm_binary", "bower_archive")
 | 
			
		||||
load("//tools/bzl:js.bzl", "bower_archive", "npm_binary")
 | 
			
		||||
 | 
			
		||||
npm_binary(
 | 
			
		||||
    name = "bower",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user