commit 7239ac50bfe6ceda5fa82a37b57ed9b7a6aa7139
author David Pursehouse <dpursehouse@collab.net> Fri Sep 30 15:59:45 2016 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri Sep 30 15:59:45 2016 +0900
tree 4b78a91fb7abaabaf4ea147507448a6579a0c944
parent b9a2cef6b5985bb6f93aeb5273d7226fa1679c50
parent f31d0c7991131a7021509fe97f9194273d85b4d7

Merge branch 'stable-2.13'

* stable-2.13:
  Fix build: upgrade commonmark dependency to 0.6.0

Change-Id: I76641814f303e26688b1ae15e98517bc6f176b05

BUCK

diff --git a/BUCK b/BUCK
index d81cf11..ceb6b29 100644
--- a/BUCK
+++ b/BUCK
@@ -25,9 +25,6 @@
 
     # Deps only needed by Gitiles.
     ':commons-lang3',
-    ':guice-multibindings',
-    ':nullable-jsr305',
-    ':soy',
     ':commonmark',
     ':cm-autolink',
     ':gfm-tables',
@@ -83,49 +80,6 @@
   visibility = [],
 )
 
-# soy version must match version used in Gitiles
-maven_jar(
-  name = 'soy',
-  id = 'com.google.template:soy:2015-04-10',
-  sha1 = 'f2a260c0eafbc5756ccec546efd2ffd5b0a583cb',
-  deps = [':icu4j'],
-  license = 'Apache2.0',
-  visibility = [],
-)
-
-maven_jar(
-  name = 'icu4j',
-  id = 'com.ibm.icu:icu4j:51.1',
-  sha1 = '8ce396c4aed83c0c3de9158dc72c834fd283d5a4',
-  license = 'Apache2.0',
-)
-
-# guice-multibindings must match Guice version used in Gerrit
-maven_jar(
-  name = 'guice-multibindings',
-  id = 'com.google.inject.extensions:guice-multibindings:4.0',
-  sha1 = 'f4509545b4470bbcc865aa500ad6fef2e97d28bf',
-  license = 'Apache2.0',
-  exclude_java_sources = True,
-  exclude = [
-    'META-INF/DEPENDENCIES',
-    'META-INF/LICENSE',
-    'META-INF/NOTICE',
-    'META-INF/maven/com.google.guava/guava/pom.properties',
-    'META-INF/maven/com.google.guava/guava/pom.xml',
-  ],
-  visibility = [],
-)
-
-maven_jar(
-  name = 'nullable-jsr305',
-  id = 'com.google.code.findbugs:jsr305:3.0.0',
-  sha1 = '5871fb60dc68d67da54a663c3fd636a10a532948',
-  license = 'Apache2.0',
-  exclude_java_sources = True,
-  visibility = [],
-)
-
 COMMONMARK_VERSION = '0.6.0'
 maven_jar(
   name = 'commonmark',
@@ -145,7 +99,7 @@
     ':commonmark',
     ':autolink',
   ],
-  )
+)
 
 maven_jar(
   name = 'autolink',

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index a7ab54e..62a2d27 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,11 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.13'
-REPO = MAVEN_CENTRAL
+VER = '2.14-SNAPSHOT'
+REPO = MAVEN_LOCAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = 'e25d55b8f41627c4ae6b9d2069ec398638b219a3',
   attach_source = False,
   repository = REPO,
   license = 'Apache2.0',