Update to 3.6 Build against 3.6.0 and test against 3.6.8. Change-Id: I32579d0d894d41073c34a3b129fc189b74e43e1f
diff --git a/WORKSPACE b/WORKSPACE index ce95fe6..f9cffd9 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -5,7 +5,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "b6120a9fa50945d38f0a4d55d5879e3ec465c5e5", + commit = "ea5aa9f256fe94577accb074f1f51e12af106708", #local_path = "/home/<user>/projects/bazlets", )
diff --git a/package.json b/package.json index 82c0e23..1f3dd29 100644 --- a/package.json +++ b/package.json
@@ -1,6 +1,6 @@ { "name": "task", - "version": "3.5.0-SNAPSHOT", + "version": "3.6.0-SNAPSHOT", "description": "Task Plugin", "dependencies": { "@bazel/rollup": "~5.1.0",
diff --git a/src/test/java/com/googlesource/gerrit/plugins/task/TaskReferenceTest.java b/src/test/java/com/googlesource/gerrit/plugins/task/TaskReferenceTest.java index e08240d..f94fcb2 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/task/TaskReferenceTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/task/TaskReferenceTest.java
@@ -26,7 +26,7 @@ import com.google.gerrit.server.account.GroupCache; import com.google.gerrit.server.config.AllProjectsName; import com.google.gerrit.server.config.AllUsersName; -import java.sql.Timestamp; +import java.time.Instant; import java.util.NoSuchElementException; import java.util.Optional; import junit.framework.TestCase; @@ -51,7 +51,7 @@ public static final String TEST_USER = "testuser"; public static final int TEST_USER_ID = 100000; public static final Account TEST_USER_ACCOUNT = - Account.builder(Account.id(TEST_USER_ID), new Timestamp(0L)).build(); + Account.builder(Account.id(TEST_USER_ID), Instant.ofEpochMilli(0L)).build(); public static final String TEST_USER_REF = "refs/users/" + String.format("%02d", TEST_USER_ID % 100) + "/" + TEST_USER_ID; public static final FileKey TEST_USER_ROOT_CFG = createFileKey(ALL_USERS, TEST_USER_REF, ROOT); @@ -87,7 +87,7 @@ .setOwnerGroupUUID(uuid) .setId(id) .setVisibleToAll(true) - .setCreatedOn(new Timestamp(0L)) + .setCreatedOn(Instant.ofEpochMilli(0L)) .setMembers(ImmutableSet.of()) .setSubgroups(ImmutableSet.of()) .build();
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile index a407854..a377f74 100755 --- a/test/docker/gerrit/Dockerfile +++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.5.6-ubuntu20 +FROM gerritcodereview/gerrit:3.6.8-ubuntu20 ENV GERRIT_SITE /var/gerrit RUN git config -f "$GERRIT_SITE/etc/gerrit.config" auth.type \