Merge changes Id48002b9,I7b818125 into stable-2.14 * changes: Sample Gerrit HA with docker-compose Add general introduction to HA
diff --git a/.gitignore b/.gitignore index 0f6afe5..30da2c2 100644 --- a/.gitignore +++ b/.gitignore
@@ -4,7 +4,6 @@ /.settings/ /.primary_build_tool /bazel-bin -/bazel-genfiles /bazel-out /bazel-reviewers /bazel-testlogs
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index 1f65ede..fc6118e 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@ def external_plugin_deps(): maven_jar( name = "wiremock", - artifact = "com.github.tomakehurst:wiremock-standalone:2.23.2", - sha1 = "4a920d6c04fd2444c7bc94880adc8313f5b31ba3", + artifact = "com.github.tomakehurst:wiremock-standalone:2.25.1", + sha1 = "bf46d41a76c274522a8b88eb5b054edca630b089", ) maven_jar(
diff --git a/src/main/resources/Documentation/build.md b/src/main/resources/Documentation/build.md index 585244f..38084d6 100644 --- a/src/main/resources/Documentation/build.md +++ b/src/main/resources/Documentation/build.md
@@ -20,7 +20,7 @@ The output is created in ``` - bazel-genfiles/@PLUGIN@.jar + bazel-bin/@PLUGIN@.jar ``` To package the plugin sources run: @@ -68,7 +68,7 @@ The output is created in ``` - bazel-genfiles/plugins/@PLUGIN@/@PLUGIN@.jar + bazel-bin/plugins/@PLUGIN@/@PLUGIN@.jar ``` This project can be imported into the Eclipse IDE: