Set version to 3.1.0-SNAPSHOT for Gerrit master Build with Gerrit master and consume its SNAPSHOT artifact, so that the plugin development can go side-by-side with the Gerrit development. Adapt to the latest changes on master, including the auto value for Project.NameKey. Change-Id: I98b61de51aabe80528b2dd03e663ad4abeb0af1b
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 1144901..75ac467 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
@@ -41,7 +41,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 =>