Merge branch 'stable-3.9' * stable-3.9: Consume global-refdb directly from source Fix errorprone Flogger error Change-Id: Ia5bc550e0d2bcec84fe21d2b305059e54fca88d6
diff --git a/BUILD b/BUILD index c5f1e4f..5bd8d41 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-buffer//jar", "@netty-codec//jar", "@netty-common//jar", @@ -50,11 +50,18 @@ ) 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 + [ ":zookeeper-refdb__plugin", + "//plugins/global-refdb", "@curator-client//jar", "@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 ea28507..726a563 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -106,12 +106,6 @@ sha1 = "3fa5f9d04b6b782d869d6e0657d896eeadca5866", ) - maven_jar( - name = "global-refdb", - artifact = "com.gerritforge:global-refdb:3.7.4", - sha1 = "a5f3fcdbc04b7e98c52ecd50d2a56424e60b0575", - ) - JACKSON_VER = "2.15.2" maven_jar(