Merge "Fix e2e test compilation failure" into stable-3.7
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala
index 53f942d..5885fb0 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala
@@ -14,7 +14,7 @@
package com.google.gerrit.scenarios
-import static java.nio.charset.StandardCharsets.UTF_8
+import java.nio.charset.StandardCharsets.UTF_8
import java.io.{File, IOException}
import java.net.URLEncoder
diff --git a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala
index f0c6f68..3802cea 100644
--- a/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala
+++ b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ProjectSimulation.scala
@@ -14,13 +14,13 @@
package com.google.gerrit.scenarios
-import static java.nio.charset.StandardCharsets.UTF_8
+import java.nio.charset.StandardCharsets.UTF_8
import java.net.URLEncoder
class ProjectSimulation extends GerritSimulation {
projectName = "defaultTestProject"
override def replaceOverride(in: String): String = {
- replaceProperty("project", URLEncoder.encode(getFullProjectName(projectName), UTF_8, in)
+ replaceProperty("project", URLEncoder.encode(getFullProjectName(projectName), UTF_8), in)
}
}
