commit 3d424908cbbf7a3134cb40fe6e149531821f9243
author Hugo Arès <hugo.ares@ericsson.com> Tue Mar 28 08:20:47 2017 -0400
committer Hugo Arès <hugo.ares@ericsson.com> Tue Mar 28 08:21:36 2017 -0400
tree 5ee96c9cca5d96f22b8250d1fca72932d406d270
parent c801bc6497ae1b46f05ea790ffbbb1049e189d12
parent 7d2fd82a545507b9f1e65af7b61607d3265b2c91

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Cancel periodic cleanup task on plugin unload
  Remove source_under_test to comply with new BUCK version

Change-Id: I0d4f1a0bc274b3f58f1fdb1f8d9dfb8d1bfa46e2

.gitignore

diff --git a/.gitignore b/.gitignore
index 46def34..d7fe8e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 bucklets
 eclipse-out
 target/
+.buckd/
 .buckversion
 .classpath
 .project

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 9915de7..9a18ddd 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,12 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.12'
+VER = '2.13'
 REPO = MAVEN_CENTRAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = '8ce1f6e65078bbcf03a1758f96b3ebca19b7fe3c',
+  sha1 = 'e25d55b8f41627c4ae6b9d2069ec398638b219a3',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',
@@ -15,6 +15,7 @@
 maven_jar(
   name = 'acceptance-framework',
   id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
+  sha1 = 'a6913a61196a8fccdb45e761f43a0b7e21867c90',
   license = 'Apache2.0',
   attach_source = False,
   repository = REPO,