Merge "Update cookbook plugin to latest revision"
diff --git a/gerrit-acceptance-tests/BUCK b/gerrit-acceptance-tests/BUCK
index fc65f2c..f762c1e 100644
--- a/gerrit-acceptance-tests/BUCK
+++ b/gerrit-acceptance-tests/BUCK
@@ -19,7 +19,6 @@
'//lib:gwtorm',
'//lib:h2',
'//lib:jsch',
- '//lib:jsr305',
'//lib:junit',
'//lib:servlet-api-3_0',
diff --git a/gerrit-common/BUCK b/gerrit-common/BUCK
index a79930b..94b0a01 100644
--- a/gerrit-common/BUCK
+++ b/gerrit-common/BUCK
@@ -10,7 +10,6 @@
'//gerrit-reviewdb:client',
'//lib:gwtjsonrpc',
'//lib:gwtorm',
- '//lib:jsr305',
'//lib/jgit:jgit',
],
visibility = ['PUBLIC'],
@@ -25,7 +24,6 @@
'//gerrit-reviewdb:server',
'//lib:gwtjsonrpc',
'//lib:gwtorm',
- '//lib:jsr305',
'//lib/jgit:jgit',
],
visibility = ['PUBLIC'],
diff --git a/gerrit-gwtui/BUCK b/gerrit-gwtui/BUCK
index f3c8a25..6024481 100644
--- a/gerrit-gwtui/BUCK
+++ b/gerrit-gwtui/BUCK
@@ -76,7 +76,6 @@
'//lib:gwtjsonrpc',
'//lib:gwtjsonrpc_src',
'//lib:gwtorm',
- '//lib:jsr305',
'//lib/codemirror:codemirror',
'//lib/gwt:user',
'//lib/jgit:jgit',
diff --git a/gerrit-httpd/BUCK b/gerrit-httpd/BUCK
index c906459..512e6e6 100644
--- a/gerrit-httpd/BUCK
+++ b/gerrit-httpd/BUCK
@@ -22,7 +22,6 @@
'//lib:gwtjsonrpc',
'//lib:gwtorm',
'//lib:jsch',
- '//lib:jsr305',
'//lib:mime-util',
'//lib/commons:codec',
'//lib/guice:guice',
diff --git a/gerrit-lucene/BUCK b/gerrit-lucene/BUCK
index c21ce4e..5a907eb 100644
--- a/gerrit-lucene/BUCK
+++ b/gerrit-lucene/BUCK
@@ -28,7 +28,6 @@
'//gerrit-server:server',
'//lib:guava',
'//lib:gwtorm',
- '//lib:jsr305',
'//lib/guice:guice',
'//lib/guice:guice-assistedinject',
'//lib/jgit:jgit',
diff --git a/gerrit-openid/BUCK b/gerrit-openid/BUCK
index 0801534..8da83c3 100644
--- a/gerrit-openid/BUCK
+++ b/gerrit-openid/BUCK
@@ -11,7 +11,6 @@
'//gerrit-server:server',
'//lib:guava',
'//lib:gwtorm',
- '//lib:jsr305',
'//lib/guice:guice',
'//lib/guice:guice-servlet',
'//lib/jgit:jgit',
diff --git a/gerrit-pgm/BUCK b/gerrit-pgm/BUCK
index d13406b..d3a8408 100644
--- a/gerrit-pgm/BUCK
+++ b/gerrit-pgm/BUCK
@@ -16,7 +16,6 @@
deps = [
'//gerrit-common:server',
'//gerrit-server:server',
- '//lib:jsr305',
'//lib/guice:guice',
'//lib/guice:guice-assistedinject',
'//lib/jgit:jgit',
@@ -67,7 +66,6 @@
'//lib:guava',
'//lib:gwtjsonrpc',
'//lib:gwtorm',
- '//lib:jsr305',
],
compile_deps = ['//gerrit-launcher:launcher'],
visibility = ['//gerrit-war:'],
diff --git a/gerrit-server/BUCK b/gerrit-server/BUCK
index 5232f41..8181fe3 100644
--- a/gerrit-server/BUCK
+++ b/gerrit-server/BUCK
@@ -27,7 +27,6 @@
'//lib:gwtjsonrpc',
'//lib:gwtorm',
'//lib:jsch',
- '//lib:jsr305',
'//lib:juniversalchardet',
'//lib:mime-util',
'//lib:ow2-asm',
diff --git a/gerrit-sshd/BUCK b/gerrit-sshd/BUCK
index 7a8610d..93a3ef7 100644
--- a/gerrit-sshd/BUCK
+++ b/gerrit-sshd/BUCK
@@ -16,7 +16,6 @@
'//lib:guava',
'//lib:gwtorm',
'//lib:jsch',
- '//lib:jsr305',
'//lib/commons:codec',
'//lib/guice:guice',
'//lib/guice:guice-assistedinject',
diff --git a/gerrit-util-cli/BUCK b/gerrit-util-cli/BUCK
index 7c56cd1..7e43cc4 100644
--- a/gerrit-util-cli/BUCK
+++ b/gerrit-util-cli/BUCK
@@ -5,7 +5,6 @@
'//gerrit-common:server',
'//lib:args4j',
'//lib:guava',
- '//lib:jsr305',
'//lib/guice:guice',
'//lib/guice:guice-assistedinject',
],
diff --git a/lib/BUCK b/lib/BUCK
index d9f1ecf..51a2609 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -15,7 +15,6 @@
define_license(name = 'h2')
define_license(name = 'jgit')
define_license(name = 'jsch')
-define_license(name = 'jsr305')
define_license(name = 'ow2')
define_license(name = 'postgresql')
define_license(name = 'prologcafe')
@@ -121,15 +120,6 @@
)
maven_jar(
- name = 'jsr305',
- id = 'com.google.code.findbugs:jsr305:1.3.9',
- sha1 = '40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf',
- license = 'jsr305',
- attach_source = False,
- exclude_java_sources = True,
-)
-
-maven_jar(
name = 'args4j',
id = 'args4j:args4j:2.0.16',
sha1 = '9f00fb12820743b9e05c686eba543d64dd43f2b1',
diff --git a/lib/LICENSE-jsr305 b/lib/LICENSE-jsr305
deleted file mode 100644
index cf30ea2..0000000
--- a/lib/LICENSE-jsr305
+++ /dev/null
@@ -1,28 +0,0 @@
-Copyright (c) 2007-2009, JSR305 expert group
-All rights reserved.
-
-http://www.opensource.org/licenses/bsd-license.php
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of the JSR305 expert group nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
