commit c0546cd772511b4f901ce09ac6ba082fed35ce5e
author Edwin Kempin <edwin.kempin@gmail.com> Tue Jul 21 10:40:54 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 21 10:40:54 2015 +0000
tree 95e6c558dba660bb72c66550770372f692a8d34f
parent c5848585544e1fa806c20177cd86f1bf0ab5e300
parent 8cf18b92ae339cd094587d32c4d486e29092cf17

Merge "Include '/a' into HTTP repository URLs to trigger authentication" into stable-2.11

BUCK

diff --git a/BUCK b/BUCK
index 8151afb..e37deb4 100644
--- a/BUCK
+++ b/BUCK
@@ -15,7 +15,7 @@
   manifest_entries = [
     'Gerrit-PluginName: importer',
     'Gerrit-ApiType: plugin',
-    'Gerrit-ApiVersion: 2.11.1',
+    'Gerrit-ApiVersion: 2.11.2',
     'Gerrit-Module: com.googlesource.gerrit.plugins.importer.Module',
     'Gerrit-SshModule: com.googlesource.gerrit.plugins.importer.SshModule',
     'Gerrit-HttpModule: com.googlesource.gerrit.plugins.importer.HttpModule',

VERSION

diff --git a/VERSION b/VERSION
index 55773d3..9e1a35c 100644
--- a/VERSION
+++ b/VERSION
@@ -1,5 +1,5 @@
 # Used by BUCK to include "Implementation-Version" in plugin Manifest.
 # If this file doesn't exist the output of 'git describe' is used
 # instead.
-PLUGIN_VERSION = '2.11.1'
+PLUGIN_VERSION = '2.11.2'
 

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 65d5618..513f901 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,11 +1,12 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.11.1'
+VER = '2.11.2'
 REPO = MAVEN_CENTRAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
+  sha1 = '1d45b5fd8d3f436e34e1a11d3adc07d61717d427',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',
@@ -14,6 +15,7 @@
 maven_jar(
   name = 'gwtui-api',
   id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
+  sha1 = 'a2262a4d3d12fe4ea1e67d849d4112f222a1b2b0',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',

pom.xml

diff --git a/pom.xml b/pom.xml
index 9dc460a..5d7e185 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
   <groupId>com.googlesource.gerrit.plugins.importer</groupId>
   <artifactId>importer</artifactId>
   <packaging>jar</packaging>
-  <version>2.11.1</version>
+  <version>2.11.2</version>
   <name>importer</name>
 
   <properties>

src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureRepositoryStep.java

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 8d8b776..7a93521 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureRepositoryStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureRepositoryStep.java
@@ -50,7 +50,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",

src/main/java/com/googlesource/gerrit/plugins/importer/ImportProject.java

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));
       }
     }