Merge branch 'stable-2.11'
* stable-2.11:
Remove VERSION file
Solver V1: Check for file/directory existence before operations
AMQProperties: Fix IllegalArgumentException when setting properties
Catch explicit exceptions instead of Exception
Use AtomicInteger instead of volatile int
Prevent potential null-pointer access
Remove unnecessary constructor invocations
Remove unnecessary casts
Add missing @Override annotations
Change logging message and level for closed connection.
Create new AMQP properties for each publication
Bump AMQP client to 3.5.2
Fall back to loading only base config if no site configs are found
Change logging message and level for failed connection.
Add timestamp on messages
Use API version 2.10.4
Implement standalone Buck build
Remove Gradle build
Implement Buck build
Better usage of builder patten in AMQProperties.getBasicProperties
Build with API version 2.11
Change-Id: Ia9235595fd810e01e7749a31265ab1233f7d7206
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 96d016a..85b90a8 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,11 @@
include_defs('//bucklets/maven_jar.bucklet')
-VER = '2.11'
-REPO = MAVEN_CENTRAL
+VER = '2.12-SNAPSHOT'
+REPO = MAVEN_LOCAL
maven_jar(
name = 'plugin-api',
id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = 'be80ff991f7b9f8669b7a2a399003ec1ae69ed31',
license = 'Apache2.0',
attach_source = False,
repository = REPO,
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/solver/version/V1.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/solver/version/V1.java
index ebcec00..0b91423 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/solver/version/V1.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/solver/version/V1.java
@@ -47,7 +47,7 @@
) {
this.pluginName = pluginName;
this.pluginDataDir = pluginData.toPath();
- this.etcDir = sites.etc_dir.toPath();
+ this.etcDir = sites.etc_dir;
}
/**
