Update Gitiles blame_cache to v0.2-3 Change-Id: If144db0ed5b28d5dbfd02cf3e42788246be0421b
diff --git a/WORKSPACE b/WORKSPACE index 69a23a0..57066a1 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -581,10 +581,10 @@ maven_jar( name = "blame_cache", - artifact = "com/google/gitiles:blame-cache:0.2-2", + artifact = "com/google/gitiles:blame-cache:0.2-3", attach_source = False, repository = GERRIT, - sha1 = "ac8693b319b3e70506fb27df1b77b598cfdcd00f", + sha1 = "fc31fb07fab42b2b4f645e80449fae403e83bcb6", ) # Keep this version of Soy synchronized with the version used in Gitiles.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java index d6d0acc..4702b5a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java
@@ -30,8 +30,8 @@ import com.google.gerrit.server.git.MergeUtil; import com.google.gerrit.server.patch.AutoMerger; import com.google.gerrit.server.project.InvalidChangeOperationException; -import com.google.gitiles.blame.BlameCache; -import com.google.gitiles.blame.Region; +import com.google.gitiles.blame.cache.BlameCache; +import com.google.gitiles.blame.cache.Region; import com.google.gwtorm.server.OrmException; import com.google.inject.Inject; import java.io.IOException;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java index c7edc24..e58ab74 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/config/GerritGlobalModule.java
@@ -181,8 +181,8 @@ import com.google.gerrit.server.validators.HashtagValidationListener; import com.google.gerrit.server.validators.OutgoingEmailValidationListener; import com.google.gerrit.server.validators.ProjectCreationValidationListener; -import com.google.gitiles.blame.BlameCache; -import com.google.gitiles.blame.BlameCacheImpl; +import com.google.gitiles.blame.cache.BlameCache; +import com.google.gitiles.blame.cache.BlameCacheImpl; import com.google.inject.Inject; import com.google.inject.TypeLiteral; import com.google.inject.internal.UniqueAnnotations;