Merge branch stable-2.12 into HEAD
* stable-2.12:
Add sha1 for the Gerrit plugin api dependency
Fix stable-2.12 build and tests
Change-Id: I89d4ae72bb09a0bcb1ff8a7bd3341521b3f6fff9
diff --git a/lib/easymock/BUCK b/lib/easymock/BUCK
index 3cf45ae..0a4eb4d 100644
--- a/lib/easymock/BUCK
+++ b/lib/easymock/BUCK
@@ -2,8 +2,8 @@
maven_jar(
name = 'easymock',
- id = 'org.easymock:easymock:3.2',
- sha1 = '00c82f7fa3ef377d8954b1db25123944b5af2ba4',
+ id = 'org.easymock:easymock:3.4',
+ sha1 = '9fdeea183a399f25c2469497612cad131e920fa3',
license = 'DO_NOT_DISTRIBUTE',
attach_source = False,
deps = [
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 86cef3d..4179430 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,11 +1,12 @@
include_defs('//bucklets/maven_jar.bucklet')
-VER = '2.12-SNAPSHOT'
-REPO = MAVEN_LOCAL
+VER = '2.12.2'
+REPO = MAVEN_CENTRAL
maven_jar(
name = 'plugin-api',
id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
+ sha1 = '621012e67c64774d9743d7c7c8b0cae0998fae0d',
attach_source = False,
repository = REPO,
license = 'Apache2.0',
diff --git a/pom.xml b/pom.xml
index 8f3f043..4bf0f74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<groupId>com.googlesource.gerrit.plugins.quota</groupId>
<artifactId>quota</artifactId>
<packaging>jar</packaging>
- <version>2.12-SNAPSHOT</version>
+ <version>2.12.2</version>
<name>quota</name>
<properties>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.2</version>
+ <version>3.4</version>
<scope>test</scope>
</dependency>
<dependency>
