Remove jsr305 library
In d6ccccf96a
Sasa Zivkov explained OSGI runtimes do not accept the
javax.annotation.* package to be provided by the application, as part
of the package is already included with the JRE.
Now that Gerrit has its own version of the @Nullable annotation, drop
the jsr305 library dependency.
Change-Id: I253fd74af7a73c5d5bc4a0b35755cc449957e0f2
This commit is contained in:
@@ -19,7 +19,6 @@ java_library(
|
|||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:h2',
|
'//lib:h2',
|
||||||
'//lib:jsch',
|
'//lib:jsch',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib:junit',
|
'//lib:junit',
|
||||||
'//lib:servlet-api-3_0',
|
'//lib:servlet-api-3_0',
|
||||||
|
|
||||||
|
@@ -10,7 +10,6 @@ gwt_module(
|
|||||||
'//gerrit-reviewdb:client',
|
'//gerrit-reviewdb:client',
|
||||||
'//lib:gwtjsonrpc',
|
'//lib:gwtjsonrpc',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/jgit:jgit',
|
'//lib/jgit:jgit',
|
||||||
],
|
],
|
||||||
visibility = ['PUBLIC'],
|
visibility = ['PUBLIC'],
|
||||||
@@ -25,7 +24,6 @@ java_library(
|
|||||||
'//gerrit-reviewdb:server',
|
'//gerrit-reviewdb:server',
|
||||||
'//lib:gwtjsonrpc',
|
'//lib:gwtjsonrpc',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/jgit:jgit',
|
'//lib/jgit:jgit',
|
||||||
],
|
],
|
||||||
visibility = ['PUBLIC'],
|
visibility = ['PUBLIC'],
|
||||||
|
@@ -76,7 +76,6 @@ gwt_module(
|
|||||||
'//lib:gwtjsonrpc',
|
'//lib:gwtjsonrpc',
|
||||||
'//lib:gwtjsonrpc_src',
|
'//lib:gwtjsonrpc_src',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/codemirror:codemirror',
|
'//lib/codemirror:codemirror',
|
||||||
'//lib/gwt:user',
|
'//lib/gwt:user',
|
||||||
'//lib/jgit:jgit',
|
'//lib/jgit:jgit',
|
||||||
|
@@ -22,7 +22,6 @@ java_library2(
|
|||||||
'//lib:gwtjsonrpc',
|
'//lib:gwtjsonrpc',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsch',
|
'//lib:jsch',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib:mime-util',
|
'//lib:mime-util',
|
||||||
'//lib/commons:codec',
|
'//lib/commons:codec',
|
||||||
'//lib/guice:guice',
|
'//lib/guice:guice',
|
||||||
|
@@ -28,7 +28,6 @@ java_library(
|
|||||||
'//gerrit-server:server',
|
'//gerrit-server:server',
|
||||||
'//lib:guava',
|
'//lib:guava',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/guice:guice',
|
'//lib/guice:guice',
|
||||||
'//lib/guice:guice-assistedinject',
|
'//lib/guice:guice-assistedinject',
|
||||||
'//lib/jgit:jgit',
|
'//lib/jgit:jgit',
|
||||||
|
@@ -11,7 +11,6 @@ java_library2(
|
|||||||
'//gerrit-server:server',
|
'//gerrit-server:server',
|
||||||
'//lib:guava',
|
'//lib:guava',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/guice:guice',
|
'//lib/guice:guice',
|
||||||
'//lib/guice:guice-servlet',
|
'//lib/guice:guice-servlet',
|
||||||
'//lib/jgit:jgit',
|
'//lib/jgit:jgit',
|
||||||
|
@@ -16,7 +16,6 @@ java_library(
|
|||||||
deps = [
|
deps = [
|
||||||
'//gerrit-common:server',
|
'//gerrit-common:server',
|
||||||
'//gerrit-server:server',
|
'//gerrit-server:server',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/guice:guice',
|
'//lib/guice:guice',
|
||||||
'//lib/guice:guice-assistedinject',
|
'//lib/guice:guice-assistedinject',
|
||||||
'//lib/jgit:jgit',
|
'//lib/jgit:jgit',
|
||||||
@@ -67,7 +66,6 @@ java_library2(
|
|||||||
'//lib:guava',
|
'//lib:guava',
|
||||||
'//lib:gwtjsonrpc',
|
'//lib:gwtjsonrpc',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsr305',
|
|
||||||
],
|
],
|
||||||
compile_deps = ['//gerrit-launcher:launcher'],
|
compile_deps = ['//gerrit-launcher:launcher'],
|
||||||
visibility = ['//gerrit-war:'],
|
visibility = ['//gerrit-war:'],
|
||||||
|
@@ -27,7 +27,6 @@ java_library2(
|
|||||||
'//lib:gwtjsonrpc',
|
'//lib:gwtjsonrpc',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsch',
|
'//lib:jsch',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib:juniversalchardet',
|
'//lib:juniversalchardet',
|
||||||
'//lib:mime-util',
|
'//lib:mime-util',
|
||||||
'//lib:ow2-asm',
|
'//lib:ow2-asm',
|
||||||
|
@@ -16,7 +16,6 @@ java_library2(
|
|||||||
'//lib:guava',
|
'//lib:guava',
|
||||||
'//lib:gwtorm',
|
'//lib:gwtorm',
|
||||||
'//lib:jsch',
|
'//lib:jsch',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/commons:codec',
|
'//lib/commons:codec',
|
||||||
'//lib/guice:guice',
|
'//lib/guice:guice',
|
||||||
'//lib/guice:guice-assistedinject',
|
'//lib/guice:guice-assistedinject',
|
||||||
|
@@ -5,7 +5,6 @@ java_library(
|
|||||||
'//gerrit-common:server',
|
'//gerrit-common:server',
|
||||||
'//lib:args4j',
|
'//lib:args4j',
|
||||||
'//lib:guava',
|
'//lib:guava',
|
||||||
'//lib:jsr305',
|
|
||||||
'//lib/guice:guice',
|
'//lib/guice:guice',
|
||||||
'//lib/guice:guice-assistedinject',
|
'//lib/guice:guice-assistedinject',
|
||||||
],
|
],
|
||||||
|
10
lib/BUCK
10
lib/BUCK
@@ -15,7 +15,6 @@ define_license(name = 'diffy')
|
|||||||
define_license(name = 'h2')
|
define_license(name = 'h2')
|
||||||
define_license(name = 'jgit')
|
define_license(name = 'jgit')
|
||||||
define_license(name = 'jsch')
|
define_license(name = 'jsch')
|
||||||
define_license(name = 'jsr305')
|
|
||||||
define_license(name = 'ow2')
|
define_license(name = 'ow2')
|
||||||
define_license(name = 'postgresql')
|
define_license(name = 'postgresql')
|
||||||
define_license(name = 'prologcafe')
|
define_license(name = 'prologcafe')
|
||||||
@@ -120,15 +119,6 @@ maven_jar(
|
|||||||
exclude = ['META-INF/NOTICE', 'META-INF/LICENSE'],
|
exclude = ['META-INF/NOTICE', 'META-INF/LICENSE'],
|
||||||
)
|
)
|
||||||
|
|
||||||
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(
|
maven_jar(
|
||||||
name = 'args4j',
|
name = 'args4j',
|
||||||
id = 'args4j:args4j:2.0.16',
|
id = 'args4j:args4j:2.0.16',
|
||||||
|
@@ -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.
|
|
Reference in New Issue
Block a user