Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
GitilesWeblinks: Update file's google-java-format
Format all Bazel build files with buildifier
Migrate (i.e. move) `tools/bazel.rc` to `.bazelrc`
Update bazlets to latest stable-2.14 to build with 2.14.14 API
Update bazlets to latest stable-2.14 to build with 2.14.13 API
Update bazlets to latest stable-2.14 to use 2.14.12 API
Update bazlets to latest stable-2.14 to use 2.14.11 API
Update bazlets to latest stable-2.14 to use 2.14.10 API
Update bazlets to latest stable-2.14 and switch to released 2.14.9 API
Harmonize names of external repositories
Build with 2.14.9-SNAPSHOT
Change-Id: I6b399913012d6b29f4a976d660c9845f47c9be1f
diff --git a/tools/bazel.rc b/.bazelrc
similarity index 100%
rename from tools/bazel.rc
rename to .bazelrc
diff --git a/BUILD b/BUILD
index c11b095..116cd88 100644
--- a/BUILD
+++ b/BUILD
@@ -4,7 +4,7 @@
name = "gitiles",
srcs = [
":gitiles__base",
- "@gitiles_servlet//jar",
+ "@gitiles-servlet//jar",
],
outs = ["gitiles.jar"],
cmd = " && ".join([
@@ -12,7 +12,7 @@
"TMP=$$(mktemp -d || mktemp -d -t bazel-tmp)",
"cp $(location :gitiles__base) $@",
"chmod +w $@",
- "unzip -qd $$TMP $(location @gitiles_servlet//jar) \"com/google/gitiles/static/*\"",
+ "unzip -qd $$TMP $(location @gitiles-servlet//jar) \"com/google/gitiles/static/*\"",
"cd $$TMP/com/google/gitiles",
"mv static +static",
"zip -Drq $$ROOT/$@ -g . -i \"+static/*\"",
@@ -45,12 +45,12 @@
visibility = ["//visibility:public"],
exports = [
"@autolink//jar",
- "@cm_autolink//jar",
- "@commons-lang3//jar",
+ "@cm-autolink//jar",
"@commonmark//jar",
- "@gfm_strikethrough//jar",
- "@gfm_tables//jar",
- "@gitiles_servlet//jar",
+ "@commons-lang3//jar",
+ "@gfm-strikethrough//jar",
+ "@gfm-tables//jar",
+ "@gitiles-servlet//jar",
"@prettify//jar",
],
)
diff --git a/bazlets.bzl b/bazlets.bzl
index e14e488..f97b72c 100644
--- a/bazlets.bzl
+++ b/bazlets.bzl
@@ -1,17 +1,16 @@
NAME = "com_googlesource_gerrit_bazlets"
def load_bazlets(
- commit,
- local_path = None
- ):
- if not local_path:
- native.git_repository(
- name = NAME,
- remote = "https://gerrit.googlesource.com/bazlets",
- commit = commit,
- )
- else:
- native.local_repository(
- name = NAME,
- path = local_path,
- )
+ commit,
+ local_path = None):
+ if not local_path:
+ native.git_repository(
+ name = NAME,
+ remote = "https://gerrit.googlesource.com/bazlets",
+ commit = commit,
+ )
+ else:
+ native.local_repository(
+ name = NAME,
+ path = local_path,
+ )
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 9564d14..d30b0e7 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -1,55 +1,55 @@
-load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL")
+load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL", "maven_jar")
-COMMONMARK_VERSION = '0.9.0'
+COMMONMARK_VERSION = "0.9.0"
def external_plugin_deps():
- maven_jar(
- name = 'gitiles_servlet',
- artifact = 'com.google.gitiles:gitiles-servlet:0.2-5',
- sha1 = '18186bd83a8c52a4a965472fcb9b4ea87862eb35',
- repository = GERRIT,
- )
+ maven_jar(
+ name = "gitiles-servlet",
+ artifact = "com.google.gitiles:gitiles-servlet:0.2-5",
+ sha1 = "18186bd83a8c52a4a965472fcb9b4ea87862eb35",
+ repository = GERRIT,
+ )
- # prettify must match the version used in Gitiles
- maven_jar(
- name = 'prettify',
- artifact = 'com.github.twalcari:java-prettify:1.2.2',
- sha1 = 'b8ba1c1eb8b2e45cfd465d01218c6060e887572e',
- )
+ # prettify must match the version used in Gitiles
+ maven_jar(
+ name = "prettify",
+ artifact = "com.github.twalcari:java-prettify:1.2.2",
+ sha1 = "b8ba1c1eb8b2e45cfd465d01218c6060e887572e",
+ )
- maven_jar(
- name = 'commons-lang3',
- artifact = 'org.apache.commons:commons-lang3:3.7',
- sha1 = '557edd918fd41f9260963583ebf5a61a43a6b423',
- )
+ maven_jar(
+ name = "commons-lang3",
+ artifact = "org.apache.commons:commons-lang3:3.7",
+ sha1 = "557edd918fd41f9260963583ebf5a61a43a6b423",
+ )
- # commonmark must match the version used in Gitiles
- maven_jar(
- name = 'commonmark',
- artifact = 'com.atlassian.commonmark:commonmark:' + COMMONMARK_VERSION,
- sha1 = '4eb11e3f9aaecafc6073b84c15f66376ef8dc5d3',
- )
+ # commonmark must match the version used in Gitiles
+ maven_jar(
+ name = "commonmark",
+ artifact = "com.atlassian.commonmark:commonmark:" + COMMONMARK_VERSION,
+ sha1 = "4eb11e3f9aaecafc6073b84c15f66376ef8dc5d3",
+ )
- maven_jar(
- name = 'cm_autolink',
- artifact = 'com.atlassian.commonmark:commonmark-ext-autolink:' + COMMONMARK_VERSION,
- sha1 = 'b81d7f0e2bdb987d3f447f3e92756bcdbb5ff537',
- )
+ maven_jar(
+ name = "cm-autolink",
+ artifact = "com.atlassian.commonmark:commonmark-ext-autolink:" + COMMONMARK_VERSION,
+ sha1 = "b81d7f0e2bdb987d3f447f3e92756bcdbb5ff537",
+ )
- maven_jar(
- name = 'autolink',
- artifact = 'org.nibor.autolink:autolink:0.6.0',
- sha1 = '3986d016a14e8c81afeec752f19af29b20e8367b',
- )
+ maven_jar(
+ name = "autolink",
+ artifact = "org.nibor.autolink:autolink:0.6.0",
+ sha1 = "3986d016a14e8c81afeec752f19af29b20e8367b",
+ )
- maven_jar(
- name = 'gfm_strikethrough',
- artifact = 'com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:' + COMMONMARK_VERSION,
- sha1 = 'd6814aac1a6aaa473c0c3ef0a23bfff8836d1e67',
- )
+ maven_jar(
+ name = "gfm-strikethrough",
+ artifact = "com.atlassian.commonmark:commonmark-ext-gfm-strikethrough:" + COMMONMARK_VERSION,
+ sha1 = "d6814aac1a6aaa473c0c3ef0a23bfff8836d1e67",
+ )
- maven_jar(
- name = 'gfm_tables',
- artifact = 'com.atlassian.commonmark:commonmark-ext-gfm-tables:' + COMMONMARK_VERSION,
- sha1 = '4c8a93ef905ef8fc35d6379965641a980d67e304',
- )
+ maven_jar(
+ name = "gfm-tables",
+ artifact = "com.atlassian.commonmark:commonmark-ext-gfm-tables:" + COMMONMARK_VERSION,
+ sha1 = "4c8a93ef905ef8fc35d6379965641a980d67e304",
+ )
diff --git a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java
index 267c435..b4a206c 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/gitiles/GitilesWeblinks.java
@@ -63,8 +63,9 @@
Config config = configFactory.getGlobalPluginConfig("gitiles");
name = MoreObjects.firstNonNull(config.getString("gerrit", null, "linkname"), "browse");
- baseUrl = MoreObjects.firstNonNull(config.getString("gerrit", null, "baseUrl"),
- baseGerritUrl + "plugins/" + pluginName);
+ baseUrl =
+ MoreObjects.firstNonNull(
+ config.getString("gerrit", null, "baseUrl"), baseGerritUrl + "plugins/" + pluginName);
target = MoreObjects.firstNonNull(config.getString("gerrit", null, "target"), Target.BLANK);
}
diff --git a/tools/bzl/maven_jar.bzl b/tools/bzl/maven_jar.bzl
index 71f45ec..21fb670 100644
--- a/tools/bzl/maven_jar.bzl
+++ b/tools/bzl/maven_jar.bzl
@@ -1 +1 @@
-load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL")
+load("@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl", "GERRIT", "MAVEN_CENTRAL", "MAVEN_LOCAL", "maven_jar")
diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index 956dd59..c157125 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,5 +1,5 @@
load(
"@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
- "gerrit_plugin",
"PLUGIN_DEPS",
+ "gerrit_plugin",
)
