| commit | dac81a61057ad6a95db0934ec23ea3ecedfcaacc | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Fri Jul 17 12:00:27 2020 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Fri Jul 17 12:00:27 2020 -0400 |
| tree | 414f930f676cd50f7b9be1c996b5649666e1fbbc | |
| parent | 1253e3c61b8002fd235889b6f4a86492f9f67a9a [diff] | |
| parent | 5fa621ebaa1afc03c9cad2f76a82792a50013e8e [diff] |
Merge branch 'stable-3.1' * stable-3.1: Bump Bazel version to 3.4.1 e2e-tests: Replace hardcoded scheme with property Change-Id: I220a2f370f19f448411698bc0a4c9c521dafdf81
diff --git a/.bazelversion b/.bazelversion index fd2a018..47b322c 100644 --- a/.bazelversion +++ b/.bazelversion
@@ -1 +1 @@ -3.1.0 +3.4.1
diff --git a/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CheckProjectStatisticsUpToGc.json b/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CheckProjectStatisticsUpToGc.json index e9df002..349c5b1 100644 --- a/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CheckProjectStatisticsUpToGc.json +++ b/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CheckProjectStatisticsUpToGc.json
@@ -1,5 +1,5 @@ [ { - "url": "http://HOSTNAME:HTTP_PORT/a/projects/PROJECT/statistics.git" + "url": "HTTP_SCHEME://HOSTNAME:HTTP_PORT/a/projects/PROJECT/statistics.git" } ]
diff --git a/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.json b/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.json index b4ee549..70e79ca 100644 --- a/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.json +++ b/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/CreateChangesTriggeringGc.json
@@ -1,6 +1,6 @@ [ { - "url": "http://HOSTNAME:HTTP_PORT/a/changes/", + "url": "HTTP_SCHEME://HOSTNAME:HTTP_PORT/a/changes/", "project": "PROJECT" } ]
diff --git a/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.json b/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.json index a371757..301c65b 100644 --- a/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.json +++ b/src/test/resources/com/ericsson/gerrit/plugins/gcconductor/scenarios/DeleteChangesAfterGc.json
@@ -1,5 +1,5 @@ [ { - "url": "http://HOSTNAME:HTTP_PORT/a/changes/" + "url": "HTTP_SCHEME://HOSTNAME:HTTP_PORT/a/changes/" } ]