Build with API version 2.12-SNAPSHOT and adapt to changes Path is now used instead of File. Change-Id: Ie88f57eb7c152f08b5c60fbcbce28acea4084e86
diff --git a/BUCK b/BUCK index 3cca9ac..5003c2a 100644 --- a/BUCK +++ b/BUCK
@@ -19,7 +19,7 @@ manifest_entries = [ 'Gerrit-PluginName: xdocs', 'Gerrit-ApiType: plugin', - 'Gerrit-ApiVersion: 2.11', + 'Gerrit-ApiVersion: 2.12-SNAPSHOT', 'Gerrit-HttpModule: com.googlesource.gerrit.plugins.xdocs.HttpModule', 'Gerrit-Module: com.googlesource.gerrit.plugins.xdocs.Module', 'Gerrit-InitStep: com.googlesource.gerrit.plugins.xdocs.XDocInit',
diff --git a/VERSION b/VERSION index 920fe49..9df7bf7 100644 --- a/VERSION +++ b/VERSION
@@ -1,5 +1,5 @@ # Used by BUCK to include "Implementation-Version" in plugin Manifest. # If this file doesn't exist the output of 'git describe' is used # instead. -PLUGIN_VERSION = '2.11' +PLUGIN_VERSION = '2.12-SNAPSHOT'
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK index b8298c6..ae59eba 100644 --- a/lib/gerrit/BUCK +++ b/lib/gerrit/BUCK
@@ -1,7 +1,7 @@ include_defs('//bucklets/maven_jar.bucklet') -VER = '2.11' -REPO = MAVEN_CENTRAL +VER = '2.12-SNAPSHOT' +REPO = MAVEN_LOCAL maven_jar( name = 'plugin-api',
diff --git a/pom.xml b/pom.xml index a322717..590bf98 100644 --- a/pom.xml +++ b/pom.xml
@@ -21,7 +21,7 @@ <groupId>com.googlesource.gerrit.plugins.xdocs</groupId> <artifactId>xdocs</artifactId> <packaging>jar</packaging> - <version>2.11</version> + <version>2.12-SNAPSHOT</version> <name>xdocs</name> <properties>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocInit.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocInit.java index 0a3323b..d916d1d 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocInit.java +++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/XDocInit.java
@@ -44,7 +44,8 @@ @Override public void run() throws Exception { - File pluginConfig = new File(sitePaths.etc_dir, pluginName + ".config"); + File pluginConfig = new File( + sitePaths.etc_dir.toFile(), pluginName + ".config"); if (!pluginConfig.exists()) { ui.message("\n"); ui.header("%s plugin", pluginName); @@ -57,11 +58,14 @@ pluginConfig.getAbsolutePath()); } - extract(new File(sitePaths.static_dir, "xdocs/css/unified.css"), + extract(new File(sitePaths.static_dir.toFile(), + "xdocs/css/unified.css").toPath(), XDocInit.class, "diff/unified.css"); - extract(new File(sitePaths.static_dir, "xdocs/css/sidebyside-a.css"), + extract(new File(sitePaths.static_dir.toFile(), + "xdocs/css/sidebyside-a.css").toPath(), XDocInit.class, "diff/sidebyside-a.css"); - extract(new File(sitePaths.static_dir, "xdocs/css/sidebyside-b.css"), + extract(new File(sitePaths.static_dir.toFile(), + "xdocs/css/sidebyside-b.css").toPath(), XDocInit.class, "diff/sidebyside-b.css"); }