Merge branch 'stable-2.11'
* stable-2.11:
Bump plugin API to 2.11.6
Bump plugin API to 2.10.7
Change-Id: Ia1c11b077486b52f896ece4e3557b405ea777d63
Signed-off-by: Edwin Kempin <ekempin@google.com>
diff --git a/pom.xml b/pom.xml
index 9978bcd..32d698b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<properties>
<Gerrit-ApiType>plugin</Gerrit-ApiType>
- <Gerrit-ApiVersion>2.11.6</Gerrit-ApiVersion>
+ <Gerrit-ApiVersion>2.12</Gerrit-ApiVersion>
</properties>
<build>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java b/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java
index 83badb8..6aa29a0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/menuextender/GetMenus.java
@@ -52,7 +52,7 @@
@Inject
public GetMenus(@PluginName String pluginName, SitePaths sitePaths) {
- this.cfgFile = new File(sitePaths.etc_dir, pluginName + ".config");
+ this.cfgFile = sitePaths.etc_dir.resolve(pluginName + ".config").toFile();
}
@Override
diff --git a/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java b/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java
index fa58db8..0f5629b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/menuextender/PutMenus.java
@@ -63,7 +63,8 @@
throws IOException, ConfigInvalidException {
FileBasedConfig cfg =
new FileBasedConfig(
- new File(sitePaths.etc_dir, pluginName + ".config"), FS.DETECTED);
+ sitePaths.etc_dir.resolve(pluginName + ".config").toFile(),
+ FS.DETECTED);
cfg.load();
cfg.clear();
if (input.menus != null) {
