Merge branch 'stable-2.11'
* stable-2.11:
Include '/a' into HTTP repository URLs to trigger authentication
Change-Id: Id6ba565097571a77f611e402282f03eafdfad381
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureRepositoryStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureRepositoryStep.java
index 9031dc4..f15a3ec 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureRepositoryStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureRepositoryStep.java
@@ -52,7 +52,7 @@
StoredConfig config = repo.getConfig();
if (originUrl != null) {
config.setString("remote", "origin", "url", originUrl
- .concat("/")
+ .concat("/a/")
.concat(name.get()));
} else {
config.setString("remote", "origin", "url",
diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java
index b8e1cf2..e2c63d1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java
@@ -96,7 +96,7 @@
}
private static Logger log = LoggerFactory.getLogger(ImportProject.class);
- private static Version v2_11 = new Version("2.11");
+ private static Version v2_11_2 = new Version("2.11.2");
private final ProjectCache projectCache;
private final OpenRepositoryStep openRepoStep;
@@ -212,11 +212,11 @@
} else {
input.validateImport();
Version v = api.getVersion();
- if (v.compareTo(v2_11) < 0) {
+ if (v.compareTo(v2_11_2) < 0) {
throw new BadRequestException(String.format(
"The version of the source Gerrit server %s is too old. "
+ "Its version is %s, but required is a version >= %s.",
- input.from, v.formatted, v2_11));
+ input.from, v.formatted, v2_11_2));
}
}
