commit 5b39ed151660f6912e6c63f270d93a6d0e8c6d66
author Claudio Pacchiega <claudio.pacchiega@gmail.com> Thu Oct 20 22:36:53 2016 +0200
committer Luca Milanesio <luca.milanesio@gmail.com> Tue Dec 13 09:19:52 2016 +0000
tree 2c835b62c5697330916098ca3cd1065558fb97c8
parent dc612f7f54bab77bedbdc90bd66004287caabe66

Make plugin compile under stable-2.11

BUCK targets fixed to resume a green build on the stable-2.11
branch.

Change-Id: I6b12fa9a5a5d83ae08fb1a3d3c4007e73223d6de

common.defs

diff --git a/common.defs b/common.defs
index a717515..45a7f6a 100644
--- a/common.defs
+++ b/common.defs
@@ -2,7 +2,7 @@
 include_defs('//lib/prolog/prolog.defs')
 
 EXTERNAL_DEPS = [
-  '//plugins/gerrit-owners/gerrit-owners-common' + i for i in [
+  '//plugins/owners/gerrit-owners-common' + i for i in [
     ':gitective-core',
     ':jackson-core',
     ':jackson-databind',

gerrit-owners-autoassign/BUCK

diff --git a/gerrit-owners-autoassign/BUCK b/gerrit-owners-autoassign/BUCK
index 516426f..f1b033a 100644
--- a/gerrit-owners-autoassign/BUCK
+++ b/gerrit-owners-autoassign/BUCK
@@ -1,4 +1,4 @@
-include_defs('//plugins/gerrit-owners/common.defs')
+include_defs('//plugins/owners/common.defs')
 include_defs('//lib/maven.defs')
 include_defs('//lib/prolog/prolog.defs')
 
@@ -14,6 +14,6 @@
     'Gerrit-Module: com.vmware.gerrit.owners.common.AutoassignModule',
   ],
   deps = [
-    '//plugins/gerrit-owners/gerrit-owners-common:common',
+    '//plugins/owners/gerrit-owners-common:common',
   ] + EXTERNAL_DEPS,
 )

gerrit-owners-common/BUCK

diff --git a/gerrit-owners-common/BUCK b/gerrit-owners-common/BUCK
index 61f5e60..92492e4 100644
--- a/gerrit-owners-common/BUCK
+++ b/gerrit-owners-common/BUCK
@@ -1,4 +1,4 @@
-include_defs('//plugins/gerrit-owners/common.defs')
+include_defs('//plugins/owners/common.defs')
 include_defs('//lib/maven.defs')
 include_defs('//lib/prolog/prolog.defs')
 

gerrit-owners/BUCK

diff --git a/gerrit-owners/BUCK b/gerrit-owners/BUCK
index 009de04..8d4ab25 100644
--- a/gerrit-owners/BUCK
+++ b/gerrit-owners/BUCK
@@ -1,6 +1,6 @@
-include_defs('//plugins/gerrit-owners/common.defs')
-include_defs('//lib/maven.defs')
+include_defs('//bucklets/gerrit_plugin.bucklet')
 include_defs('//lib/prolog/prolog.defs')
+include_defs('//plugins/owners/common.defs')
 
 # buck is unhappy to build a gerrit_plugin with no source files.
 # On the other side, gerrit-owners-prolog-rules needs to be built after all the java files have been
@@ -13,7 +13,7 @@
     'src/main/java/**/*.java',
   ], excludes=COMPILE_STUB),
   deps = [
-    '//plugins/gerrit-owners/gerrit-owners-common:common',
+    '//plugins/owners/gerrit-owners-common:common',
   ] + COMPILE_DEPS + EXTERNAL_DEPS,
 )