Merge "Include replication-api.jar in release.war"
diff --git a/plugins/BUILD b/plugins/BUILD
index b9c51e3..c4acd92 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -20,7 +20,7 @@
 
 genrule2(
     name = "core",
-    srcs = ["//plugins/%s:%s.jar" % (n, n) for n in CORE_PLUGINS + CUSTOM_PLUGINS],
+    srcs = ["//plugins/%s.jar" % (n if ":" in n else "%s:%s" % (n, n)) for n in CORE_PLUGINS + CUSTOM_PLUGINS],
     outs = ["core.zip"],
     cmd = "mkdir -p $$TMP/WEB-INF/plugins;" +
           "for s in $(SRCS) ; do " +
diff --git a/tools/bzl/plugins.bzl b/tools/bzl/plugins.bzl
index adde59e..9c67c8a 100644
--- a/tools/bzl/plugins.bzl
+++ b/tools/bzl/plugins.bzl
@@ -7,6 +7,7 @@
     "hooks",
     "plugin-manager",
     "replication",
+    "replication:replication-api",
     "reviewnotes",
     "singleusergroup",
     "webhooks",
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index c1d8095..2c70939 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -36,7 +36,7 @@
     name = "main_classpath_collect",
     testonly = True,
     deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + TEST_DEPS_GENERATED +
-           ["//plugins/%s:%s__plugin" % (n, n) for n in CORE_PLUGINS + CUSTOM_PLUGINS] +
+           ["//plugins/%s__plugin" % (n if ":" in n else "%s:%s" % (n, n)) for n in CORE_PLUGINS + CUSTOM_PLUGINS] +
            ["//plugins/%s:%s__plugin_test_deps" % (n, n) for n in CUSTOM_PLUGINS_TEST_DEPS],
 )