Merge branch 'stable-3.5' into stable-3.6
* stable-3.5:
Consume global-refdb directly from source
Fix errorprone Flogger error
Change-Id: I004cdffa14035a5f75fb01b366c12e7926bf6a4a
diff --git a/BUILD b/BUILD
index 0751458..335c2da 100644
--- a/BUILD
+++ b/BUILD
@@ -18,10 +18,10 @@
],
resources = glob(["src/main/resources/**/*"]),
deps = [
+ ":global-refdb-neverlink",
"@curator-client//jar",
"@curator-framework//jar",
"@curator-recipes//jar",
- "@global-refdb//jar",
"@netty-all//jar",
"@zookeeper-jute_3.5//jar",
"@zookeeper_3.5//jar",
@@ -40,10 +40,10 @@
],
resources = glob(["src/main/resources/**/*"]),
deps = [
+ ":global-refdb-neverlink",
"@curator-client//jar",
"@curator-framework//jar",
"@curator-recipes//jar",
- "@global-refdb//jar",
"@zookeeper_3.4//jar",
],
)
@@ -62,10 +62,17 @@
)
java_library(
+ name = "global-refdb-neverlink",
+ neverlink = 1,
+ exports = ["//plugins/global-refdb"],
+)
+
+java_library(
name = "zookeeper-refdb__plugin_test_deps",
testonly = 1,
visibility = ["//visibility:public"],
exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
+ "//plugins/global-refdb",
":zookeeper-refdb-zk-3.5__plugin",
"@curator-framework//jar",
"@curator-recipes//jar",
diff --git a/Jenkinsfile b/Jenkinsfile
index 25b721e..459753c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,2 +1,3 @@
pluginPipeline(formatCheckId: 'gerritforge:zookeeper-refdb-format-8b1e7fb8ce34448cc425',
- buildCheckId: 'gerritforge:zookeeper-refdb-8b1e7fb8ce34448cc425')
+ buildCheckId: 'gerritforge:zookeeper-refdb-8b1e7fb8ce34448cc425',
+ extraModules: [ 'global-refdb' ])
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 1a3fc2b..b50d3bf 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -51,12 +51,6 @@
sha1 = "c114c1e1c8172a7cd3f6ae39209a635f7a06c1a1",
)
- maven_jar(
- name = "global-refdb",
- artifact = "com.gerritforge:global-refdb:3.6.0-rc3.1",
- sha1 = "9e28fdc65dcdecefd852f6c24dd7eec339a01870",
- )
-
JACKSON_VER = "2.10.4"
maven_jar(
