Adjust to renamed dependencies in core
In gerrit core change I1e75690fe dependency names were updated to
replace underscore with hyphen, i.e. jackson_core was renamed to
jackson-core, and prolog_* dependencies were renamed to prolog-*.
Update bazlets to the latest revision which includes the updated
prolog dependency names (done in change Ib2b283873).
Build with the snapshot API which uses the updated jackson-core name.
Rename the other jackson dependencies to replace underscores with
hyphen.
Change-Id: I7210b583f61290c65c4167b1e210b6583dd3c5ce
diff --git a/WORKSPACE b/WORKSPACE
index d8de9f6..07d8e34 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,17 +3,26 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "11ce7521051ca73598d099aa8a396c9ffe932a74",
+ commit = "e21be8f76d49eb4fc5209be6d88f9245d0d24861",
#local_path = "/home/<user>/projects/bazlets",
)
-# Release Plugin API
+# Snapshot Plugin API
load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
)
-gerrit_api()
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
+
+#gerrit_api()
load(":external_plugin_deps_standalone.bzl", "external_plugin_deps_standalone")
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 0f361f1..86a6e6e 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -5,26 +5,26 @@
def external_plugin_deps(omit_jackson_core = True):
if not omit_jackson_core:
maven_jar(
- name = "jackson_core",
+ name = "jackson-core",
artifact = "com.fasterxml.jackson.core:jackson-core:%s" % JACKSON_REV,
sha1 = "02eb801df67aacaf5b1deb4ac626e1964508e47b",
)
maven_jar(
- name = "jackson_databind",
+ name = "jackson-databind",
artifact = "com.fasterxml.jackson.core:jackson-databind:%s" % JACKSON_REV,
sha1 = "5108dde6049374ba980b360e1ecff49847baba4a",
)
maven_jar(
- name = "jackson_annotations",
+ name = "jackson-annotations",
artifact = "com.fasterxml.jackson.core:jackson-annotations:%s" % JACKSON_REV,
sha1 = "7ef6440e71531604aa44a5eb62d4b466ffbf7e8f",
)
maven_jar(
- name = "jackson_dataformat_yaml",
+ name = "jackson-dataformat-yaml",
artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:%s" % JACKSON_REV,
sha1 = "d5c23915aa943541c38065a72ed50941f2fd278d",
)
diff --git a/external_plugin_deps_standalone.bzl b/external_plugin_deps_standalone.bzl
index 5017f77..af0725c 100644
--- a/external_plugin_deps_standalone.bzl
+++ b/external_plugin_deps_standalone.bzl
@@ -8,7 +8,7 @@
external_plugin_deps(omit_jackson_core = False)
maven_jar(
- name = "prolog_runtime",
+ name = "prolog-runtime",
artifact = "com.googlecode.prolog-cafe:prolog-runtime:" + PROLOG_VERS,
attach_source = False,
repository = PROLOG_REPO,
@@ -16,7 +16,7 @@
)
maven_jar(
- name = "prolog_compiler",
+ name = "prolog-compiler",
artifact = "com.googlecode.prolog-cafe:prolog-compiler:" + PROLOG_VERS,
attach_source = False,
repository = PROLOG_REPO,
@@ -24,7 +24,7 @@
)
maven_jar(
- name = "prolog_io",
+ name = "prolog-io",
artifact = "com.googlecode.prolog-cafe:prolog-io:" + PROLOG_VERS,
attach_source = False,
repository = PROLOG_REPO,
diff --git a/owners-common/common.bzl b/owners-common/common.bzl
index 93c4871..f73ec46 100644
--- a/owners-common/common.bzl
+++ b/owners-common/common.bzl
@@ -1,6 +1,6 @@
EXTERNAL_DEPS = [
- '@jackson_core//jar:neverlink',
- '@jackson_databind//jar',
- '@jackson_annotations//jar',
- '@jackson_dataformat_yaml//jar'
+ '@jackson-core//jar:neverlink',
+ '@jackson-databind//jar',
+ '@jackson-annotations//jar',
+ '@jackson-dataformat-yaml//jar'
]
diff --git a/owners/BUILD b/owners/BUILD
index a8a356d..1e206be 100644
--- a/owners/BUILD
+++ b/owners/BUILD
@@ -9,7 +9,7 @@
name = "gerrit-owners-predicates",
srcs = PROLOG_PREDICATES,
deps = [
- "@prolog_runtime//jar:neverlink",
+ "@prolog-runtime//jar:neverlink",
"//owners-common:owners-common",
] + PLUGIN_DEPS_NEVERLINK,
)
