Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Do not use Jenkins pipeline default checkout Adapt Jenkinsfile to the new project name and build Change-Id: I56cb9d5af650e96aed7d1eaa0628183e87b82213
diff --git a/README.md b/README.md index 563236f..74ba043 100644 --- a/README.md +++ b/README.md
@@ -5,12 +5,12 @@ Requirements for using this plugin are: -- Gerrit v3.0 or later +- Gerrit v3.1 or later - Apache Zookeeper v3.4 or later ## Typical use-case The global ref-db is a typical use-case of a Gerrit multi-master scenario in a multi-site setup. Refer to the -[Gerrit multi-site plugin](https://gerrit.googlesource.com/plugins/multi-site/+/stable-3.0/DESIGN.md) +[Gerrit multi-site plugin](https://gerrit.googlesource.com/plugins/multi-site/+/stable-3.1/DESIGN.md) for more details on the high level architecture.
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index c9905be..5280f73 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:3.0.2", - sha1 = "293a807bd82a284c215213b442b3930258e01f5e", + artifact = "com.gerritforge:global-refdb:3.1.2", + sha1 = "6ddee3de0f3fe9254453118ae1eca481ec03e957", )
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 ed71fd7..7def5f2 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 java.util.Optional;
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 aa7f748..440aa51 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,8 +16,8 @@ import static com.google.common.truth.Truth.assertThat; +import com.google.gerrit.entities.Project; import com.google.gerrit.extensions.registration.DynamicSet; -import com.google.gerrit.reviewdb.client.Project; import java.util.Optional; import org.apache.curator.retry.RetryNTimes; import org.eclipse.jgit.lib.ObjectId;
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 b948886..59b7afd 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;