Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
Change-Id: Ib9e3242c294372673439de2ecc82a9eb8ae6281d
diff --git a/BUILD b/BUILD
index 77c1348..cb02518 100644
--- a/BUILD
+++ b/BUILD
@@ -71,7 +71,7 @@
)
junit_tests(
- name = "gc_conductor_tests",
+ name = "gc-conductor_tests",
srcs = glob(["src/test/java/**/*.java"]),
resources = glob(["src/test/resources/**/*"]),
tags = [
diff --git a/WORKSPACE b/WORKSPACE
index c6885c3..66461e4 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "b750c0adec6deebb1063219787a97fab1d32724b",
+ commit = "4b3ce19d8d18d9f7df56a06532723b91ea6949d0",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 49754b5..ba8d1a7 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@
def external_plugin_deps():
maven_jar(
name = "mockito",
- artifact = "org.mockito:mockito-core:2.27.0",
- sha1 = "835fc3283b481f4758b8ef464cd560c649c08b00",
+ artifact = "org.mockito:mockito-core:2.28.2",
+ sha1 = "91110215a8cb9b77a46e045ee758f77d79167cc0",
deps = [
"@byte-buddy//jar",
"@byte-buddy-agent//jar",
@@ -125,8 +125,8 @@
maven_jar(
name = "jgit",
artifact =
- "org.eclipse.jgit:org.eclipse.jgit:4.7.7.201812240805-r",
- sha1 = "d2358e838084d2482d51b51b70fd34a356495925",
+ "org.eclipse.jgit:org.eclipse.jgit:4.9.8.201812241815-r",
+ sha1 = "dedb5d05a952551dc465611ebde3819d86bb22fc",
)
maven_jar(
@@ -153,28 +153,28 @@
sha1 = "ed8b772eb077a9cb50e44e90899c66a9a6c00e67",
)
- TEST_CONTAINERS_VERS = "1.11.2"
+ TEST_CONTAINERS_VERS = "1.12.0"
maven_jar(
name = "testcontainers",
artifact = "org.testcontainers:testcontainers:" + TEST_CONTAINERS_VERS,
- sha1 = "eae47ed24bb07270d4b60b5e2c3444c5bf3c8ea9",
+ sha1 = "ac89643ce1ddde504da09172086aba0c7df10bff",
)
maven_jar(
name = "testcontainers-database-commons",
artifact = "org.testcontainers:database-commons:" + TEST_CONTAINERS_VERS,
- sha1 = "f49cf9cd5f9c484f7c4cb24270d7cc8aae0bb188",
+ sha1 = "9b0b00bd65f59f36e804ecbe68e9ce64dbfeae64",
)
maven_jar(
name = "testcontainers-jdbc",
artifact = "org.testcontainers:jdbc:" + TEST_CONTAINERS_VERS,
- sha1 = "eaa9b0fa7a31bbfa03ad3c6d51808397b1fbdc40",
+ sha1 = "3379c6bfa85e61b88f8e1cc2192954d3ff6ea48f",
)
maven_jar(
name = "testcontainers-postgres",
artifact = "org.testcontainers:postgresql:" + TEST_CONTAINERS_VERS,
- sha1 = "a48ea341efa0ec078ae4a717459252aebc7bff5d",
+ sha1 = "6d8c31394aa019f4dc6b19de39556cce4bc551c4",
)
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorExecutorProvider.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorExecutorProvider.java
index 7cf13af..67b6958 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorExecutorProvider.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorExecutorProvider.java
@@ -20,11 +20,11 @@
import com.google.inject.Inject;
import com.google.inject.Provider;
import com.google.inject.Singleton;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ExecutorService;
@Singleton
-class EvaluatorExecutorProvider implements Provider<ScheduledThreadPoolExecutor>, ShutdownListener {
- private WorkQueue.Executor executor;
+class EvaluatorExecutorProvider implements Provider<ExecutorService>, ShutdownListener {
+ private ExecutorService executor;
@Inject
EvaluatorExecutorProvider(
@@ -35,12 +35,11 @@
@Override
public void onShutdown() {
executor.shutdownNow();
- executor.unregisterWorkQueue();
executor = null;
}
@Override
- public ScheduledThreadPoolExecutor get() {
+ public ExecutorService get() {
return executor;
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorModule.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorModule.java
index 8ef2a6b..a421ebe 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorModule.java
@@ -25,7 +25,7 @@
import com.google.gerrit.server.git.validators.UploadValidationListener;
import com.google.inject.Provides;
import com.google.inject.internal.UniqueAnnotations;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ExecutorService;
import org.eclipse.jgit.transport.PostUploadHook;
/** Configures bindings of the evaluator. */
@@ -35,7 +35,7 @@
install(new CommonModule(EvaluatorConfig.class));
listener().to(OnPluginLoadUnload.class);
- bind(ScheduledThreadPoolExecutor.class)
+ bind(ExecutorService.class)
.annotatedWith(EvaluatorExecutor.class)
.toProvider(EvaluatorExecutorProvider.class);
bind(ShutdownListener.class)
