Merge branch 'stable-3.0'
* stable-3.0:
Promote aggregation key to case class
Add ability to ignore specific files suffixes
Change-Id: Id83be727f627232863b6bc897a597b04adce0b17
diff --git a/build.sbt b/build.sbt
index 59d1b6a..ba0d2a5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,6 +1,6 @@
enablePlugins(GitVersioning)
-val gerritApiVersion = "3.0.0"
+val gerritApiVersion = "3.1.0-SNAPSHOT"
val pluginName = "analytics"
@@ -26,7 +26,7 @@
"joda-time" % "joda-time" % "2.9.9",
"com.google.gerrit" % "gerrit-acceptance-framework" % gerritApiVersion % Test,
- "org.bouncycastle" % "bcprov-jdk15on" % "1.60" % Test,
+ "org.bouncycastle" % "bcpg-jdk15on" % "1.60" % Test,
"org.scalatest" %% "scalatest" % "3.0.1" % Test,
"net.codingwell" %% "scala-guice" % "4.1.0" % Test),
diff --git a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala
index 8025922..98d591d 100644
--- a/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala
+++ b/src/main/scala/com/googlesource/gerrit/plugins/analytics/common/CommitsStatisticsLoader.scala
@@ -42,7 +42,7 @@
import RevisionBrowsingSupport._
val objectId = cacheKey.commitId
- val nameKey = new Project.NameKey(cacheKey.projectName)
+ val nameKey = Project.nameKey(cacheKey.projectName)
val commentInfoList: Seq[CommentLinkInfo] =
if(config.isExtractIssues) projectCache.get(nameKey).getCommentLinks.asScala else Seq.empty
val replacers = commentInfoList.map(info =>
