commit d4cbfc8ce91513dbd358e8bf6ed67838d3b4fa1f
author Hongkai Liu <hongkai.liu@ericsson.com> Tue May 16 09:17:28 2017 -0400
committer Hongkai Liu <hongkai.liu@ericsson.com> Tue May 16 09:18:45 2017 -0400
tree 35ac5ed80edf681a56532ce4b078ce936f61d553
parent daf118f42c9cd49dc8a0fc394e5c3bacb5335c56
parent d89bdb77a1f600ff2cfbc449c8e610401a03c326

Merge branch 'stable-2.13'

* stable-2.13:
  Supply parent before validating project creation
  Log: Print stack trace on exception
  ReplayMessagesStep: Fix potential NullPointerException

Change-Id: Ia636b6339d4e270b5126a895a1d64f278b9d6245

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index d897745..6bcc623 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,11 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.13.1'
-REPO = MAVEN_CENTRAL
+VER = '2.13-SNAPSHOT'
+REPO = MAVEN_LOCAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = '8e12346dbb677d70987afdbec5352ff6e889a181',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',
@@ -15,7 +14,6 @@
 maven_jar(
   name = 'gwtui-api',
   id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  sha1 = '0890414f42fc1fd0fef0400a479836f558727234',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',
@@ -24,7 +22,6 @@
 maven_jar(
   name = 'acceptance-framework',
   id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
-  sha1 = 'e6565b206653d741c48348ce90116a6b22555015',
   license = 'Apache2.0',
   attach_source = False,
   repository = REPO,

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

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java b/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java
index 1b91675..07e5d8f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/AccountUtil.java
@@ -18,6 +18,7 @@
 import com.google.gerrit.common.errors.NoSuchAccountException;
 import com.google.gerrit.extensions.api.accounts.AccountInput;
 import com.google.gerrit.extensions.api.groups.GroupApi;
+import com.google.gerrit.extensions.client.AuthType;
 import com.google.gerrit.extensions.common.AccountInfo;
 import com.google.gerrit.extensions.common.SshKeyInfo;
 import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -25,7 +26,6 @@
 import com.google.gerrit.extensions.restapi.RestApiException;
 import com.google.gerrit.extensions.restapi.TopLevelResource;
 import com.google.gerrit.reviewdb.client.Account;
-import com.google.gerrit.reviewdb.client.AuthType;
 import com.google.gerrit.server.account.AccountCache;
 import com.google.gerrit.server.account.AccountException;
 import com.google.gerrit.server.account.AccountManager;