Update to 3.8 Build against 3.8.0 and test against 3.8.3. Change-Id: I9c9003586373b817ce617dadc7f716fb58409b2f
diff --git a/WORKSPACE b/WORKSPACE index cea2614..3480f97 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -5,7 +5,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "4b1d0d1c0ec0c27db25eaf111c7ea07aecb13742", + commit = "e977766e5670dca125c502c37339e9f3da9b329b", #local_path = "/home/<user>/projects/bazlets", ) @@ -24,8 +24,8 @@ load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "yarn_install") node_repositories( - node_version = "16.15.0", - yarn_version = "1.22.18", + node_version = "17.9.1", + yarn_version = "1.22.19", ) yarn_install(
diff --git a/package.json b/package.json index 1b90c13..7d0ce15 100644 --- a/package.json +++ b/package.json
@@ -1,6 +1,6 @@ { "name": "task", - "version": "3.7.0-SNAPSHOT", + "version": "3.8.0-SNAPSHOT", "description": "Task Plugin", "dependencies": { "@bazel/rollup": "^5.5.0",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java b/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java index 4f47100..32641bd 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java +++ b/src/main/java/com/googlesource/gerrit/plugins/task/PredicateCache.java
@@ -24,9 +24,9 @@ import com.google.gerrit.server.CurrentUser; import com.google.gerrit.server.config.GerritServerConfig; import com.google.gerrit.server.index.change.ChangeField; +import com.google.gerrit.server.query.change.BranchSetIndexPredicate; import com.google.gerrit.server.query.change.ChangeData; import com.google.gerrit.server.query.change.ChangeIndexPredicate; -import com.google.gerrit.server.query.change.DestinationPredicate; import com.google.gerrit.server.query.change.RegexProjectPredicate; import com.google.gerrit.server.query.change.RegexRefPredicate; import com.google.gerrit.server.query.change.SubmitRequirementChangeQueryBuilder; @@ -122,14 +122,14 @@ } return true; } - if (predicate instanceof DestinationPredicate + if (predicate instanceof BranchSetIndexPredicate || predicate instanceof RegexProjectPredicate || predicate instanceof RegexRefPredicate) { return true; } if (predicate instanceof ChangeIndexPredicate) { SchemaField<ChangeData, ?> field = ((ChangeIndexPredicate) predicate).getField(); - if (field.equals(ChangeField.PROJECT) || field.equals(ChangeField.REF)) { + if (field.equals(ChangeField.PROJECT_FIELD) || field.equals(ChangeField.REF_FIELD)) { return true; } }
diff --git a/test/docker/gerrit/Dockerfile b/test/docker/gerrit/Dockerfile index 3bbf507..1b2e071 100755 --- a/test/docker/gerrit/Dockerfile +++ b/test/docker/gerrit/Dockerfile
@@ -1,4 +1,4 @@ -FROM gerritcodereview/gerrit:3.7.6-ubuntu20 +FROM gerritcodereview/gerrit:3.8.3-ubuntu22 ENV GERRIT_SITE /var/gerrit RUN git config -f "$GERRIT_SITE/etc/gerrit.config" auth.type \