Merge branch stable-2.13
* stable-2.13:
Build with API version 2.13
Change-Id: I681fd49d49e9fb8d83723d63839b7c77fcd25f3f
diff --git a/.buckconfig b/.buckconfig
index 36c84eb..daef711 100644
--- a/.buckconfig
+++ b/.buckconfig
@@ -4,6 +4,8 @@
[java]
src_roots = java, resources
+ source_level = 8
+ target_level = 8
[project]
ignore = .git
diff --git a/BUCK b/BUCK
index 0160c15..547d0e8 100644
--- a/BUCK
+++ b/BUCK
@@ -21,7 +21,6 @@
name = 'cookbook_tests',
srcs = glob(['src/test/java/**/*IT.java']),
labels = ['cookbook-plugin'],
- source_under_test = [':cookbook-plugin__plugin'],
deps = GERRIT_PLUGIN_API + GERRIT_TESTS + [
':cookbook-plugin__plugin',
],
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 2e795df..802c1b7 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 = 'acceptance-framework',
id = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
- sha1 = 'a6913a61196a8fccdb45e761f43a0b7e21867c90',
license = 'Apache2.0',
attach_source = False,
repository = REPO,
@@ -15,7 +14,6 @@
maven_jar(
name = 'plugin-api',
id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = 'e25d55b8f41627c4ae6b9d2069ec398638b219a3',
license = 'Apache2.0',
attach_source = False,
repository = REPO,
@@ -24,7 +22,6 @@
maven_jar(
name = 'gwtui-api',
id = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
- sha1 = '0890414f42fc1fd0fef0400a479836f558727234',
license = 'Apache2.0',
attach_source = False,
repository = REPO,
diff --git a/lib/gwt/BUCK b/lib/gwt/BUCK
index 394ed92..bd3953a 100644
--- a/lib/gwt/BUCK
+++ b/lib/gwt/BUCK
@@ -1,27 +1,21 @@
include_defs('//bucklets/maven_jar.bucklet')
-VER = '2.7.0'
+VERSION = '2.8.0-rc2'
maven_jar(
name = 'user',
- id = 'com.google.gwt:gwt-user:' + VER,
- sha1 = 'bdc7af42581745d3d79c2efe0b514f432b998a5b',
+ id = 'com.google.gwt:gwt-user:' + VERSION,
+ sha1 = 'ad99b09a626c20cce2bdacf3726a51b2cd16b99e',
license = 'Apache2.0',
attach_source = False,
- deps = [
- ':javax-validation',
- ':javax-validation_src',
- ]
)
maven_jar(
name = 'dev',
- id = 'com.google.gwt:gwt-dev:' + VER,
- sha1 = 'c2c3dd5baf648a0bb199047a818be5e560f48982',
+ id = 'com.google.gwt:gwt-dev:' + VERSION,
+ sha1 = 'd70a6feb4661c07488090cb81303415e9110b15a',
license = 'Apache2.0',
attach_source = False,
- exclude = ['org/eclipse/jetty/*'],
- deps = [':json'],
)
maven_jar(
@@ -30,14 +24,50 @@
bin_sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
license = 'Apache2.0',
- visibility = [],
+ visibility = ['PUBLIC'],
)
maven_jar(
- name = 'json',
- id = 'org.json:json:20140107',
- sha1 = 'd1ffca6e2482b002702c6a576166fd685e3370e3',
- license = 'DO_NOT_DISTRIBUTE',
+ name = 'jsinterop-annotations',
+ id = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
+ bin_sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
+ src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
+ license = 'Apache2.0',
+ visibility = ['PUBLIC'],
+)
+
+maven_jar(
+ name = 'ant',
+ id = 'ant:ant:1.6.5',
+ bin_sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
+ src_sha1 = '9e0a847494563f35f9b02846a1c1eb4aa2ee5a9a',
+ license = 'Apache2.0',
+ visibility = ['PUBLIC'],
+)
+
+maven_jar(
+ name = 'colt',
+ id = 'colt:colt:1.2.0',
attach_source = False,
- visibility = [],
+ bin_sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
+ license = 'DO_NOT_DISTRIBUTE',
+ visibility = ['PUBLIC'],
+)
+
+maven_jar(
+ name = 'tapestry',
+ id = 'tapestry:tapestry:4.0.2',
+ attach_source = False,
+ bin_sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
+ license = 'Apache2.0',
+ visibility = ['PUBLIC'],
+)
+
+maven_jar(
+ name = 'w3c-css-sac',
+ id = 'org.w3c.css:sac:1.3',
+ attach_source = False,
+ bin_sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
+ license = 'DO_NOT_DISTRIBUTE',
+ visibility = ['PUBLIC'],
)
diff --git a/lib/ow2/BUCK b/lib/ow2/BUCK
index db6c76c..543bc09 100644
--- a/lib/ow2/BUCK
+++ b/lib/ow2/BUCK
@@ -1,32 +1,39 @@
include_defs('//bucklets/maven_jar.bucklet')
-VERSION = '5.0.3'
+VERSION = '5.1'
maven_jar(
name = 'ow2-asm',
id = 'org.ow2.asm:asm:' + VERSION,
- sha1 = 'dcc2193db20e19e1feca8b1240dbbc4e190824fa',
+ sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
license = 'ow2',
)
maven_jar(
name = 'ow2-asm-analysis',
id = 'org.ow2.asm:asm-analysis:' + VERSION,
- sha1 = 'c7126aded0e8e13fed5f913559a0dd7b770a10f3',
+ sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
+ license = 'ow2',
+)
+
+maven_jar(
+ name = 'ow2-asm-commons',
+ id = 'org.ow2.asm:asm-commons:' + VERSION,
+ sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
+ deps = [':ow2-asm-tree'],
license = 'ow2',
)
maven_jar(
name = 'ow2-asm-tree',
id = 'org.ow2.asm:asm-tree:' + VERSION,
- sha1 = '287749b48ba7162fb67c93a026d690b29f410bed',
+ sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
license = 'ow2',
)
maven_jar(
name = 'ow2-asm-util',
id = 'org.ow2.asm:asm-util:' + VERSION,
- sha1 = '1512e5571325854b05fb1efce1db75fcced54389',
+ sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
license = 'ow2',
)
-
diff --git a/pom.xml b/pom.xml
index a36df53..2287a84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
<groupId>com.googlesource.gerrit.plugins</groupId>
<artifactId>cookbook-plugin</artifactId>
<packaging>jar</packaging>
- <version>2.13</version>
+ <version>2.14-SNAPSHOT</version>
<properties>
<Gerrit-ApiType>plugin</Gerrit-ApiType>
<Gerrit-ApiVersion>${project.version}</Gerrit-ApiVersion>
@@ -60,8 +60,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
@@ -69,7 +69,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>gwt-maven-plugin</artifactId>
- <version>2.7.0</version>
+ <version>2.8.0-rc2</version>
<configuration>
<module>com.googlesource.gerrit.plugins.cookbook.HelloForm</module>
<disableClassMetadata>true</disableClassMetadata>
