Upgrade bazlets to latest master to build with 3.1.0-SNAPSHOT API
Change-Id: Ic10c6b9d5b067c02500c827fff00e7232c531cd0
diff --git a/WORKSPACE b/WORKSPACE
index 255f3b4..1e6dde3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "51049da0140c58ee26f8285bca4393c5e43ce4a1",
+ commit = "d826d85285bb22d3fe817fe165a7e1d3472f65fa",
#local_path = "/home/<user>/projects/bazlets",
)
# Snapshot Plugin API
-#load(
-# "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-# "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
load(
- "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
- "gerrit_api",
+ "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+ "gerrit_api_maven_local",
)
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+# "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+# "gerrit_api",
+#)
+
# Load release Plugin API
-gerrit_api()
+#gerrit_api()
load("//:external_plugin_deps.bzl", "external_plugin_deps")
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/AddToQueue.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/AddToQueue.java
index d9fe107..49ecb62 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/AddToQueue.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/command/AddToQueue.java
@@ -85,7 +85,7 @@
throw die("Unable to resolve path to " + repository);
}
String projectName = extractFrom(repository);
- Project.NameKey nameKey = new Project.NameKey(projectName);
+ Project.NameKey nameKey = Project.nameKey(projectName);
if (projectCache.get(nameKey) == null) {
throw die(String.format("Repository %s not found", repository));
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/Evaluator.java b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/Evaluator.java
index 5ae7fac..52cf01e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/Evaluator.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/Evaluator.java
@@ -109,7 +109,7 @@
@Override
public void onGitReferenceUpdated(Event event) {
String projectName = event.getProjectName();
- Project.NameKey projectNameKey = new Project.NameKey(projectName);
+ Project.NameKey projectNameKey = Project.nameKey(projectName);
try (Repository repository = repoManager.openRepository(projectNameKey)) {
String repositoryPath = repository.getDirectory().getAbsolutePath();
queueEvaluationIfNecessary(repositoryPath);
diff --git a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorTest.java b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorTest.java
index 7dc403b..905d737 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/gcconductor/evaluator/EvaluatorTest.java
@@ -43,7 +43,7 @@
public class EvaluatorTest {
private static final String REPOSITORY_PATH = "/path/someRepo.git";
private static final String REPOSITORY_PATH_OTHER = "/path/otherRepo.git";
- private static final Project.NameKey NAME_KEY = new Project.NameKey("testProject");
+ private static final Project.NameKey NAME_KEY = Project.nameKey("testProject");
@Mock private GitReferenceUpdatedListener.Event event;
@Mock private GitRepositoryManager repoManager;
