Merge branch 'stable-3.4' into stable-3.5 * stable-3.4: Consume global-refdb directly from source Change-Id: I5a16bd070fa7e98a73286ad30497118f31b6513d
diff --git a/BUILD b/BUILD index c099b7c..fe0e909 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 fda417f..7082b78 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -54,12 +54,6 @@ ) maven_jar( - name = "global-refdb", - artifact = "com.gerritforge:global-refdb:3.4.0", - sha1 = "a1c7b02ddabe0dd0a989fb30ca18b61fe95ee894", - ) - - maven_jar( name = "jackson-annotations", artifact = "com.fasterxml.jackson.core:jackson-annotations:2.10.3", sha1 = "0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7",