commit 6d2c897f216d5fef78d93c27daa930bff4b3da7a
author Edwin Kempin <ekempin@google.com> Thu Feb 18 08:52:21 2016 +0100
committer Edwin Kempin <ekempin@google.com> Thu Feb 18 08:53:31 2016 +0100
tree a36c00bc798c6ed600f75357353a53a0cfe89eb9
parent 7a8f8912d47e08166f94770e51f500356d49d463
parent 8f35c6cd1be33afd7a5574661c9ee5fa3b442d76

Merge branch 'stable-2.12'

* stable-2.12:
  ConfigureProjectStep: Use Provider for MetaDataUpdate.User
  Build with API version 2.11.7
  Remove VERSION

Change-Id: I43498b7da642167bca53652e0e064845799c1609

VERSION

diff --git a/VERSION b/VERSION
deleted file mode 100644
index 9df7bf7..0000000
--- a/VERSION
+++ /dev/null
@@ -1,5 +0,0 @@
-# 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.12-SNAPSHOT'
-

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureProjectStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureProjectStep.java
index 6aefa97..9497262 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureProjectStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ConfigureProjectStep.java
@@ -22,6 +22,7 @@
 import com.google.gerrit.server.git.ProjectConfig;
 import com.google.gerrit.server.project.ProjectCache;
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
 import org.eclipse.jgit.lib.ProgressMonitor;
@@ -31,13 +32,13 @@
 @Singleton
 class ConfigureProjectStep {
   private final ProjectCache projectCache;
-  private final MetaDataUpdate.User metaDataUpdateFactory;
+  private final Provider<MetaDataUpdate.User> metaDataUpdateFactory;
   private final AllProjectsName allProjectsName;
 
   @Inject
   ConfigureProjectStep(
       ProjectCache projectCache,
-      MetaDataUpdate.User metaDataUpdateFactory,
+      Provider<MetaDataUpdate.User> metaDataUpdateFactory,
       AllProjectsName allProjectsName) {
     this.projectCache = projectCache;
     this.metaDataUpdateFactory = metaDataUpdateFactory;
@@ -51,7 +52,7 @@
     Project p = projectConfig.getProject();
     if (!p.getParent(allProjectsName).equals(parentName)) {
       p.setParentName(parentName);
-      MetaDataUpdate md = metaDataUpdateFactory.create(name);
+      MetaDataUpdate md = metaDataUpdateFactory.get().create(name);
       md.setMessage("Set Parent\n");
       projectConfig.commit(md);
       projectCache.evict(p);