Merge branch 'stable-2.15' into stable-2.16
* stable-2.15:
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Change-Id: I60868e4ffa9bf2103124baecc14a04de4d74505f
diff --git a/.bazelversion b/.bazelversion
index 9084fa2..227cea2 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-1.1.0
+2.0.0
diff --git a/WORKSPACE b/WORKSPACE
index a5ac350..2de9b45 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "f53f51fb660552d0581aa0ba52c3836ed63d56a3",
+ commit = "59529f046a5cb855d9fe3ee87110d53305ec69b9",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index ceca8a6..d1d0c14 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -92,22 +92,22 @@
maven_jar(
name = "guava",
- artifact = "com.google.guava:guava:25.1-jre",
- sha1 = "6c57e4b22b44e89e548b5c9f70f0c45fe10fb0b4",
+ artifact = "com.google.guava:guava:26.0-jre",
+ sha1 = "6a806eff209f36f635f943e16d97491f00f6bfab",
)
- GUICE_VERS = "4.2.0"
+ GUICE_VERS = "4.2.1"
maven_jar(
name = "guice",
artifact = "com.google.inject:guice:" + GUICE_VERS,
- sha1 = "25e1f4c1d528a1cffabcca0d432f634f3132f6c8",
+ sha1 = "f77dfd89318fe3ff293bafceaa75fbf66e4e4b10",
)
maven_jar(
name = "guice-assistedinject",
artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
- sha1 = "e7270305960ad7db56f7e30cb9df6be9ff1cfb45",
+ sha1 = "d327e4aee7c96f08cd657c17da231a1f4a8999ac",
)
maven_jar(
@@ -125,8 +125,8 @@
maven_jar(
name = "jgit",
artifact =
- "org.eclipse.jgit:org.eclipse.jgit:4.11.9.201909030838-r",
- sha1 = "3bc74ffed6186bf2fc37404216e5ef16f904d0b0",
+ "org.eclipse.jgit:org.eclipse.jgit:5.1.11.201909031202-r",
+ sha1 = "5aa0e29d7b4db4e6c17e3ddee9bdc8d578f02ef0",
)
maven_jar(
@@ -153,28 +153,28 @@
sha1 = "ed8b772eb077a9cb50e44e90899c66a9a6c00e67",
)
- TESTCONTAINERS_VERS = "1.12.3"
+ TESTCONTAINERS_VERS = "1.12.4"
maven_jar(
name = "testcontainers",
artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERS,
- sha1 = "e424a4549640e120acceac641ac909fcda58bf62",
+ sha1 = "456b6facac12c4b67130d9056a43c011679e9f0c",
)
maven_jar(
name = "testcontainers-database-commons",
artifact = "org.testcontainers:database-commons:" + TESTCONTAINERS_VERS,
- sha1 = "69a857af8c90be1f2ba6d7f70a59bd5687854e8f",
+ sha1 = "b17f35b4f0c33b01b1331c96c8a1c68afd916248",
)
maven_jar(
name = "testcontainers-jdbc",
artifact = "org.testcontainers:jdbc:" + TESTCONTAINERS_VERS,
- sha1 = "8f86e3ebf31b3a0439ba537bba770b5be219b55b",
+ sha1 = "35bbc7be152486fac7f76aa53bf1753c18020a67",
)
maven_jar(
name = "testcontainers-postgres",
artifact = "org.testcontainers:postgresql:" + TESTCONTAINERS_VERS,
- sha1 = "946fc6dc021b0b760da3fd005d2fd871fce10be4",
+ sha1 = "4c3758244ec33ad2aee885fb204bb73ab586a244",
)
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java
index e8aba71..43803e4 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/EvaluationTask.java
@@ -197,7 +197,7 @@
private Collection<Ref> getAllRefs(FileRepository repo) throws IOException {
RefDatabase refdb = repo.getRefDatabase();
- Collection<Ref> refs = refdb.getRefs(RefDatabase.ALL).values();
+ Collection<Ref> refs = refdb.getRefs();
List<Ref> addl = refdb.getAdditionalRefs();
if (!addl.isEmpty()) {
List<Ref> all = new ArrayList<>(refs.size() + addl.size());
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
index fe41af0..4cd7417 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/ShowQueue.java
@@ -19,9 +19,9 @@
import com.ericsson.gerrit.plugins.gcconductor.GcQueue;
import com.ericsson.gerrit.plugins.gcconductor.RepositoryInfo;
import com.google.common.base.Strings;
-import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
+import com.google.gerrit.server.util.time.TimeUtil;
import com.google.gerrit.sshd.AdminHighPriorityCommand;
import com.google.gerrit.sshd.CommandMetaData;
import com.google.gerrit.sshd.SshCommand;
