commit 00f2c66d46d9d14611d2455f7a73e6d88f90670b
author Sven Selberg <svense@axis.com> Wed Jun 08 15:47:25 2016 +0200
committer Sven Selberg <svense@axis.com> Tue Jun 14 13:14:57 2016 +0200
tree 77ddb55a3525ef06a0af773051bce2ec6baa93e9
parent ca93bcc8e426077ae0ceb5638c414086d1809958
parent 6dce1d7dee1a72c3e01e14809a727b143428f7b9

Merge branch stable-2.11 into stable-2.12

6dce1d7 Allow to specify amqp passwords in etc/secure.config
3f65399 Build with API version 2.11.8
5558190 Organize imports
3ed04fb Build with API version 2.11.7

Change-Id: I90b0dcadd9dea3cae356a295ca637c8974ef3ba2

BUCK

diff --git a/BUCK b/BUCK
index 4e69319..f2901e3 100644
--- a/BUCK
+++ b/BUCK
@@ -14,12 +14,12 @@
   ],
   deps = [
     ':amqp-client',
+    ':commons-io',
     ':guice-multibindings',
   ],
   provided_deps = [
     '//lib:gson',
     '//lib/commons:codec',
-    '//lib/commons:io',
     '//lib/commons:lang',
   ],
 )
@@ -39,9 +39,16 @@
 )
 
 maven_jar(
+  name = 'commons-io',
+  id = 'commons-io:commons-io:1.4',
+  sha1 = 'a8762d07e76cfde2395257a5da47ba7c1dbd3dce',
+  license = 'Apache2.0',
+)
+
+maven_jar(
   name = 'guice-multibindings',
-  id = 'com.google.inject.extensions:guice-multibindings:4.0-beta5',
-  sha1 = 'f432356db0a167127ffe4a7921238d7205b12682',
+  id = 'com.google.inject.extensions:guice-multibindings:4.0',
+  sha1 = 'f4509545b4470bbcc865aa500ad6fef2e97d28bf',
   license = 'Apache2.0',
   exclude_java_sources = True,
   exclude = [

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 8288775..1df977d 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,12 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.11.8'
+VER = '2.12.1'
 REPO = MAVEN_CENTRAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = 'e56d492428d0ae80224f6e3a47b3f53dfa0c7d22',
+  sha1 = 'd15de32f16d538e83f02a033be0667c55ec5f8df',
   license = 'Apache2.0',
   attach_source = False,
   repository = REPO,

src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java
index 3f63b79..2beee41 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java
@@ -82,7 +82,7 @@
             .setContext(new RequestContext() {
 
               @Override
-              public CurrentUser getCurrentUser() {
+              public CurrentUser getUser() {
                 return pluginUser;
               }