Merge "Use BrokerApi dynamic item definition from events-broker" into stable-3.0
diff --git a/BUILD b/BUILD
index eb2eeba..ec555d5 100644
--- a/BUILD
+++ b/BUILD
@@ -19,10 +19,16 @@
deps = [
"@global-refdb//jar",
"@events-broker//jar",
- "//plugins/replication",
+ ":replication-neverlink",
],
)
+java_library(
+ name = "replication-neverlink",
+ neverlink = 1,
+ exports = ["//plugins/replication"],
+)
+
junit_tests(
name = "multi_site_tests",
srcs = glob(["src/test/java/**/*.java"]),
@@ -45,5 +51,6 @@
"@wiremock//jar",
"@global-refdb//jar",
"@events-broker//jar",
+ "//plugins/replication",
],
)
diff --git a/setup_local_env/setup.sh b/setup_local_env/setup.sh
index 5ff28e4..c920c66 100755
--- a/setup_local_env/setup.sh
+++ b/setup_local_env/setup.sh
@@ -288,7 +288,7 @@
REPLICATION_SSH_USER=${REPLICATION_SSH_USER:-$(whoami)}
export REPLICATION_DELAY_SEC=${REPLICATION_DELAY_SEC:-"5"}
export SSH_ADVERTISED_PORT=${SSH_ADVERTISED_PORT:-"29418"}
-HTTPS_ENABLED=${HTTPS_ENABLED:-"true"}
+HTTPS_ENABLED=${HTTPS_ENABLED:-"false"}
COMMON_LOCATION=$DEPLOYMENT_LOCATION/gerrit_setup
LOCATION_TEST_SITE_1=$COMMON_LOCATION/instance-1
