Merge branch 'stable-3.1'
* stable-3.1:
e2e-tests: Update Dockerfile gatling_git_version to 1.0.10
e2e-tests: Align gatling version with gatling-git
e2e-tests: Introduce reused gatling version constant
Set version to 3.1.5-SNAPSHOT
Set version to 3.1.4
Change-Id: Iaf4e8d788b98b26142dd9d4aa94f08f872a8d507
diff --git a/e2e-tests/Dockerfile b/e2e-tests/Dockerfile
index ceae672..17c001b 100644
--- a/e2e-tests/Dockerfile
+++ b/e2e-tests/Dockerfile
@@ -1,6 +1,6 @@
FROM denvazh/gatling:3.2.1
-ARG gatling_git_version=1.0.9
+ARG gatling_git_version=1.0.10
RUN apk add --no-cache maven
RUN mvn dependency:get \
-DgroupId=com.gerritforge \
diff --git a/e2e-tests/build.sbt b/e2e-tests/build.sbt
index 685db37..9c49ed2 100644
--- a/e2e-tests/build.sbt
+++ b/e2e-tests/build.sbt
@@ -13,6 +13,6 @@
name := "gerrit",
libraryDependencies ++=
gatling ++
- Seq("io.gatling" % "gatling-core" % "3.1.1") ++
- Seq("io.gatling" % "gatling-app" % "3.1.1")
+ Seq("io.gatling" % "gatling-core" % GatlingVersion) ++
+ Seq("io.gatling" % "gatling-app" % GatlingVersion)
) dependsOn gatlingGitExtension
diff --git a/e2e-tests/project/Dependencies.scala b/e2e-tests/project/Dependencies.scala
index 72d2ac2..63328f9 100644
--- a/e2e-tests/project/Dependencies.scala
+++ b/e2e-tests/project/Dependencies.scala
@@ -1,8 +1,10 @@
import sbt._
object Dependencies {
+ val GatlingVersion = "3.2.0"
+
lazy val gatling = Seq(
"io.gatling.highcharts" % "gatling-charts-highcharts",
"io.gatling" % "gatling-test-framework",
- ).map(_ % "3.1.1" % Test)
+ ).map(_ % GatlingVersion % Test)
}
