Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Set version to 3.0.2 Amend 'get' method adding Class type as parameter Ignore Eclipse IDE files Change-Id: Icc7f62e11527a113e2ff5abfb408567446bb72e4
diff --git a/pom.xml b/pom.xml index 44ed04d..35733e1 100644 --- a/pom.xml +++ b/pom.xml
@@ -4,7 +4,7 @@ <groupId>com.gerritforge</groupId> <artifactId>global-refdb</artifactId> - <version>3.0.2</version> + <version>3.1.1</version> <packaging>jar</packaging> <name>global-refdb</name> @@ -38,7 +38,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <gerrit.version>3.0.2</gerrit.version> + <gerrit.version>3.1.0-rc1</gerrit.version> </properties> <dependencies>
diff --git a/src/main/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabase.java b/src/main/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabase.java index ef5d5df..d1b6d53 100644 --- a/src/main/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabase.java +++ b/src/main/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabase.java
@@ -14,7 +14,7 @@ package com.gerritforge.gerrit.globalrefdb; -import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.entities.Project; import java.util.Optional; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Ref;
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/FakeGlobalRefDatabase.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/FakeGlobalRefDatabase.java index 77b5af5..44c4fbb 100644 --- a/src/test/java/com/gerritforge/gerrit/globalrefdb/FakeGlobalRefDatabase.java +++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/FakeGlobalRefDatabase.java
@@ -15,7 +15,7 @@ package com.gerritforge.gerrit.globalrefdb; import com.google.common.collect.MapMaker; -import com.google.gerrit.reviewdb.client.Project; +import com.google.gerrit.entities.Project; import java.util.Optional; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicReference;
diff --git a/src/test/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabaseTest.java b/src/test/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabaseTest.java index de67975..bb5ad8d 100644 --- a/src/test/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabaseTest.java +++ b/src/test/java/com/gerritforge/gerrit/globalrefdb/GlobalRefDatabaseTest.java
@@ -15,9 +15,10 @@ package com.gerritforge.gerrit.globalrefdb; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.fail; import com.google.gerrit.acceptance.AbstractDaemonTest; -import com.google.gerrit.reviewdb.client.RefNames; +import com.google.gerrit.entities.RefNames; import java.util.Optional; import java.util.concurrent.Executor; import java.util.concurrent.Executors;