Merge branch 'stable-3.0'
* stable-3.0:
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Upgrade bazlets to latest stable-3.0 to build with 3.0.2 API
Upgrade bazlets to latest stable-2.16 to build with 2.16.11.1 API
Upgrade bazlets to latest stable-2.15 to build with 2.15.16 API
Upgrade wiremock to 2.24.1
Rename test for projects cache eviction test
Upgrade bazlets to latest stable-2.15 to build with 2.15.15 API
Change-Id: I6d411ae3326d22de442b952db0037b71f7ea3a6c
diff --git a/BUILD b/BUILD
index 6d0c450..c3f5a11 100644
--- a/BUILD
+++ b/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
load("//tools/bzl:junit.bzl", "junit_tests")
load(
"//tools/bzl:plugin.bzl",
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 65e9c44..c757e36 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.24.0",
- sha1 = "b74b930abed3eb856b711800209c34d12c8d0f14",
+ artifact = "com.github.tomakehurst:wiremock-standalone:2.24.1",
+ sha1 = "52c100df7c31c06e5209a77b85d4f695d40ba76a",
)
maven_jar(
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
index a3c8412..12aa4cb 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/cache/CacheEvictionIT.java
@@ -59,7 +59,7 @@
@UseLocalDisk
@GlobalPluginConfig(pluginName = "high-availability", name = "peerInfo.static.url", value = URL)
@GlobalPluginConfig(pluginName = "high-availability", name = "http.retryInterval", value = "100")
- public void flushAndSendPost() throws Exception {
+ public void flushProjectsCacheShouldSendPostForEvictingRemoteCache() throws Exception {
final String flushRequest = "/plugins/high-availability/cache/" + Constants.PROJECTS;
final CountDownLatch expectedRequestLatch = new CountDownLatch(1);
wireMockRule.addMockServiceRequestListener(
