commit | 5fa621ebaa1afc03c9cad2f76a82792a50013e8e | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Fri Jul 17 10:04:05 2020 -0400 |
committer | Marco Miller <marco.miller@ericsson.com> | Fri Jul 17 10:04:05 2020 -0400 |
tree | 7cf310f3cdf3b69b3d2ce7376a24bc06a2850314 | |
parent | 6eac64586394fc4a2884f7c837de54d92c8d9177 [diff] | |
parent | 25cb81395baff69aeb86c7b69d1f967ecb1e70a7 [diff] |
Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Bump Bazel version to 3.4.1 e2e-tests: Replace hardcoded scheme with property Change-Id: I6f0d68b658e18ae05a133602fcaf0b2b9864616e
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/" } ]