commit 535a475295bde881f61934d7bfd7f3a532e15d93
author Edwin Kempin <ekempin@google.com> Fri Aug 19 10:29:42 2016 +0200
committer Edwin Kempin <ekempin@google.com> Fri Aug 19 10:29:55 2016 +0200
tree ffdbb73401eb1bbfacbef246b4bb129b5dfa96b2
parent 453e4aeceba9a9a093c3a40de90b6fd99b5b2068
parent 2b230c6cb8230d2d29dbe1df3c39ce9d9ee306ef

Merge branch 'stable-2.12'

* stable-2.12:
  Add a test for Asciidoctor document titles / sections
  Add correct license for asciidoctor
  Make the basicTextFormattingWorks() test more strict
  Add tests to check that empty input renders to empty output
  AsciidoctorFormatterTest: Fix order of expected and actual results
  AsciidoctorFormatterTest: Do not pass baseDir to AsciidoctorFormatter()
  AsciidoctorFormatter: Simplify code by using the Asciidoctor >= 1.5 API
  Upgrade asciidoctor and its jruby dependency
  Add a unit test for the AsciidoctorFormatter
  Upgrade asciidoctor and its jruby dependency
  MarkdownFormatterTest: Fix order of expected and actual results
  MarkdownFormatterTest: Make a few member variables local ones
  xdocs: Add a unit test for the MarkdownFormatter

Change-Id: I99578f15906a3fa7a75d9ea500d502f1948b8720

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index f1ab768..7571746 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,11 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.12'
-REPO = MAVEN_CENTRAL
+VER = '2.13-SNAPSHOT'
+REPO = MAVEN_LOCAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = '8ce1f6e65078bbcf03a1758f96b3ebca19b7fe3c',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',
@@ -15,7 +14,6 @@
 maven_jar(
   name = 'gwtui-api',
   id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
-  sha1 = 'a7e7d82746b847678022242ec9eb44d1f16e8639',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',

src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java b/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java
index b90db61..ee029e3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/xdocs/Module.java
@@ -18,6 +18,7 @@
 import com.google.gerrit.extensions.annotations.Exports;
 import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.client.GerritTopMenu;
+import com.google.gerrit.extensions.client.MenuItem;
 import com.google.gerrit.extensions.config.FactoryModule;
 import com.google.gerrit.extensions.registration.DynamicMap;
 import com.google.gerrit.extensions.registration.DynamicSet;