Adapt to gerrit v3.1-rc1 - Rename `review.client` package to `entities` - Depend on global-refdb v3.1-rc1 Change-Id: Ieba8a7933d9dccae16ba86c098cb0949ea5b9d17
diff --git a/Jenkinsfile b/Jenkinsfile index c555bcf..1d67234 100644 --- a/Jenkinsfile +++ b/Jenkinsfile
@@ -20,7 +20,7 @@ stage('build') { steps { gerritReview labels: [Verified: 0], message: "Build started: ${env.BUILD_URL}" - sh "git clone --recursive -b stable-3.0 https://gerrit.googlesource.com/gerrit" + sh "git clone --recursive -b stable-3.1 https://gerrit.googlesource.com/gerrit" sh 'cd gerrit/plugins && ln -sf ../../zookeeper . && ln -sf zookeeper/external_plugin_deps.bzl .' sh 'cd gerrit && bazel build plugins/zookeeper && bazel test plugins/zookeeper:zookeeper_tests' }
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index 2f83eec..058fbe7 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -35,6 +35,6 @@ maven_jar( name = "global-refdb", - artifact = "com.gerritforge:global-refdb:0.1.1", - sha1 = "d6ab59906db7b20a52c8994502780b2a6ab23872", + artifact = "com.gerritforge:global-refdb:3.1.0-rc1", + sha1 = "61fc8defaed9c364e6bfa101563e434fcc70038f", )
diff --git a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java index 5378879..01d19f2 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java +++ b/src/main/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabase.java
@@ -20,7 +20,7 @@ import com.gerritforge.gerrit.globalrefdb.GlobalRefDbLockException; import com.gerritforge.gerrit.globalrefdb.GlobalRefDbSystemError; import com.google.common.flogger.FluentLogger; -import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.entities.Project; import com.google.inject.Inject; import java.nio.charset.StandardCharsets; import org.apache.curator.RetryPolicy;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/RefFixture.java b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/RefFixture.java index da79b3c..24a2f23 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/RefFixture.java +++ b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/RefFixture.java
@@ -14,8 +14,8 @@ package com.googlesource.gerrit.plugins.validation.dfsrefdb.zookeeper; -import com.google.gerrit.reviewdb.client.Project; -import com.google.gerrit.reviewdb.client.RefNames; +import com.google.gerrit.entities.Project; +import com.google.gerrit.entities.RefNames; import org.eclipse.jgit.lib.ObjectId; import org.junit.Ignore; @@ -23,7 +23,7 @@ public interface RefFixture { String A_TEST_PROJECT_NAME = "A_TEST_PROJECT_NAME"; - Project.NameKey A_TEST_PROJECT_NAME_KEY = new Project.NameKey(A_TEST_PROJECT_NAME); + Project.NameKey A_TEST_PROJECT_NAME_KEY = Project.nameKey(A_TEST_PROJECT_NAME); ObjectId AN_OBJECT_ID_1 = new ObjectId(1, 2, 3, 4, 5); ObjectId AN_OBJECT_ID_2 = new ObjectId(1, 2, 3, 4, 6); ObjectId AN_OBJECT_ID_3 = new ObjectId(1, 2, 3, 4, 7);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java index db7024b..fd7b3c0 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZkSharedRefDatabaseTest.java
@@ -16,7 +16,7 @@ import static com.google.common.truth.Truth.assertThat; -import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.entities.Project; import org.apache.curator.retry.RetryNTimes; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.ObjectIdRef;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java index 3955644..066aeb7 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java +++ b/src/test/java/com/googlesource/gerrit/plugins/validation/dfsrefdb/zookeeper/ZookeeperTestContainerSupport.java
@@ -19,7 +19,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.entities.Project; import com.google.gerrit.server.config.PluginConfigFactory; import org.apache.curator.framework.CuratorFramework; import org.eclipse.jgit.lib.Config;