Merge branch 'stable-2.11'
* stable-2.11:
Remove unused import and annotation
Put exception message to logger
Rename ChangeWorker to EventWorker
Apply multibinding to Solver
Rename RabbitMQManager to Manager
Apply Provider pattern to SessionFactory
Fix shutdown channel/connection logic
Fix close logic for session
Fix shutdown session
Apply Guice Multibinder to Section injection
Add Guice multibinding extension library
Update gradle-shadow plugin to 1.2.1 then fix build.gradle
Update git ignore pattern
Some improvements
Change Solver structure
Decoupled normalize() from fromConfig()
Structured configuration classes
Cleanup codes
Create some packages then move classes
Roughly support multi config
Add MessagePublishers to listen ChangeEvent
Add dependency: commons-io
Get plugin name then assume config filename
Remove unnecessary codes
Conflicts:
src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Properties.java
Change-Id: Ied9547428095706572f9d8fb8f08bf67b6198de4
diff --git a/gradle.properties b/gradle.properties
index 84e72a9..9d7322f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
apiType=plugin
-apiVersion=2.11-SNAPSHOT
+apiVersion=2.12-SNAPSHOT
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 29d7bb3..e6f54a3 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
@@ -46,7 +46,7 @@
) {
this.pluginName = pluginName;
this.pluginDataDir = pluginData.toPath();
- this.etcDir = sites.etc_dir.toPath();
+ this.etcDir = sites.etc_dir;
}
/**