opendev/gerrit
Code Issues Proposed changes

Bump Jetty version to stable 9.1 and Servlet API to 3.1

Browse Source 
Change-Id: Ic6a374afa978e66ec1a04a2b39801da158ba31d7
This commit is contained in:
David Ostrovsky 2014-01-04 22:25:01 +01:00
parent 1bcb2ca180
commit e01d9b7f20
10 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-acceptance-tests/BUCK
View File

@ -24,7 +24,7 @@ java_library(
'//lib:h2', '//lib:h2',
'//lib:jsch', '//lib:jsch',
'//lib:junit', '//lib:junit',
'//lib:servlet-api-3_0', '//lib:servlet-api-3_1',
'//lib/commons:httpclient', '//lib/commons:httpclient',
'//lib/commons:httpcore', '//lib/commons:httpcore',

2
gerrit-extension-api/BUCK
View File

@ -20,7 +20,7 @@ java_library(
':api', ':api',
'//lib/guice:guice', '//lib/guice:guice',
'//lib/guice:guice-servlet', '//lib/guice:guice-servlet',
'//lib:servlet-api-3_0', '//lib:servlet-api-3_1',
], ],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
) )

4
gerrit-gwtexpui/BUCK
View File

@ -54,7 +54,7 @@ java_library(
java_library2( java_library2(
name = 'linker_server', name = 'linker_server',
srcs = glob([SRC + 'linker/server/*.java']), srcs = glob([SRC + 'linker/server/*.java']),
compile_deps = ['//lib:servlet-api-3_0'], compile_deps = ['//lib:servlet-api-3_1'],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
) )
@ -101,6 +101,6 @@ gwt_module(
java_library2( java_library2(
name = 'server', name = 'server',
srcs = glob([SRC + 'server/*.java']), srcs = glob([SRC + 'server/*.java']),
compile_deps = ['//lib:servlet-api-3_0'], compile_deps = ['//lib:servlet-api-3_1'],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
) )

4
gerrit-httpd/BUCK
View File

@ -35,7 +35,7 @@ java_library2(
'//lib/log:api', '//lib/log:api',
'//lib/lucene:core', '//lib/lucene:core',
], ],
compile_deps = ['//lib:servlet-api-3_0'], compile_deps = ['//lib:servlet-api-3_1'],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
) )
@ -59,7 +59,7 @@ java_test(
'//lib:gson', '//lib:gson',
'//lib:gwtorm', '//lib:gwtorm',
'//lib:guava', '//lib:guava',
'//lib:servlet-api-3_0', '//lib:servlet-api-3_1',
'//lib/guice:guice', '//lib/guice:guice',
'//lib/jgit:jgit', '//lib/jgit:jgit',
'//lib/jgit:junit', '//lib/jgit:junit',

2
gerrit-openid/BUCK
View File

@ -18,6 +18,6 @@ java_library2(
'//lib/log:api', '//lib/log:api',
'//lib/openid:consumer', '//lib/openid:consumer',
], ],
compile_deps = ['//lib:servlet-api-3_0'], compile_deps = ['//lib:servlet-api-3_1'],
visibility = ['PUBLIC'], visibility = ['PUBLIC'],
) )

2
gerrit-pgm/BUCK
View File

@ -110,7 +110,7 @@ java_library2(
'//lib:guava', '//lib:guava',
'//lib:gwtorm', '//lib:gwtorm',
'//lib:h2', '//lib:h2',
'//lib:servlet-api-3_0', '//lib:servlet-api-3_1',
'//lib/guice:guice', '//lib/guice:guice',
'//lib/guice:guice-servlet', '//lib/guice:guice-servlet',
'//lib/jetty:server', '//lib/jetty:server',

2
gerrit-plugin-api/BUCK
View File

@ -28,7 +28,7 @@ java_library(
'//lib:guava', '//lib:guava',
'//lib:gwtorm', '//lib:gwtorm',
'//lib:jsch', '//lib:jsch',
'//lib:servlet-api-3_0', '//lib:servlet-api-3_1',
'//lib/guice:guice', '//lib/guice:guice',
'//lib/guice:guice-assistedinject', '//lib/guice:guice-assistedinject',
'//lib/guice:guice-servlet', '//lib/guice:guice-servlet',

2
gerrit-war/BUCK
View File

@ -22,7 +22,7 @@ java_library2(
'//lib/log:api', '//lib/log:api',
'//lib/jgit:jgit', '//lib/jgit:jgit',
], ],
compile_deps = ['//lib:servlet-api-3_0'], compile_deps = ['//lib:servlet-api-3_1'],
visibility = [ visibility = [
'//:', '//:',
'//gerrit-gwtdebug:gwtdebug', '//gerrit-gwtdebug:gwtdebug',

6
lib/BUCK
View File

@ -112,9 +112,9 @@ maven_jar(
) )
maven_jar( maven_jar(
name = 'servlet-api-3_0', name = 'servlet-api-3_1',
id = 'org.apache.tomcat:tomcat-servlet-api:7.0.32', id = 'org.apache.tomcat:tomcat-servlet-api:8.0.0-RC10',
sha1 = 'e2f21e9868414122e6dd23ac66cf304d4290642c', sha1 = '975935b6203073938dfeeb28e4effc3b094c4fc4',
license = 'Apache2.0', license = 'Apache2.0',
exclude = ['META-INF/NOTICE', 'META-INF/LICENSE'], exclude = ['META-INF/NOTICE', 'META-INF/LICENSE'],
) )

18
lib/jetty/BUCK
View File

@ -1,16 +1,16 @@
include_defs('//lib/maven.defs') include_defs('//lib/maven.defs')
VERSION = '9.0.6.v20130930' VERSION = '9.1.0.v20131115'
EXCLUDE = ['about.html'] EXCLUDE = ['about.html']
maven_jar( maven_jar(
name = 'servlet', name = 'servlet',
id = 'org.eclipse.jetty:jetty-servlet:' + VERSION, id = 'org.eclipse.jetty:jetty-servlet:' + VERSION,
sha1 = 'b6953af6f857e78fe3c46935fa96f9c80a9cbefd', sha1 = 'bf92dbb4426e5d14973726861accda38d93baa64',
license = 'Apache2.0', license = 'Apache2.0',
deps = [ deps = [
':security', ':security',
'//lib:servlet-api-3_0', '//lib:servlet-api-3_1',
], ],
exclude = EXCLUDE, exclude = EXCLUDE,
) )
@ -18,7 +18,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'security', name = 'security',
id = 'org.eclipse.jetty:jetty-security:' + VERSION, id = 'org.eclipse.jetty:jetty-security:' + VERSION,
sha1 = 'b16cd29ad9d3d3cca8176a654adf4b2ddca0eb3e', sha1 = '0ec8b3000720c746ba03d96a2172c88124509c57',
license = 'Apache2.0', license = 'Apache2.0',
deps = [':server'], deps = [':server'],
exclude = EXCLUDE, exclude = EXCLUDE,
@ -28,7 +28,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'server', name = 'server',
id = 'org.eclipse.jetty:jetty-server:' + VERSION, id = 'org.eclipse.jetty:jetty-server:' + VERSION,
sha1 = 'd89016c2bcd380f548530fa049295e62601dc564', sha1 = 'c64cb3ab62ff32fcd8b838369a426c688d901103',
license = 'Apache2.0', license = 'Apache2.0',
exported_deps = [ exported_deps = [
':continuation', ':continuation',
@ -40,7 +40,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'continuation', name = 'continuation',
id = 'org.eclipse.jetty:jetty-continuation:' + VERSION, id = 'org.eclipse.jetty:jetty-continuation:' + VERSION,
sha1 = '4f942a52a3e996634ff302ab98f46d224b0db9d2', sha1 = '5751f7ea38488dd32180bd3273f7f8591928aee3',
license = 'Apache2.0', license = 'Apache2.0',
exclude = EXCLUDE, exclude = EXCLUDE,
) )
@ -48,7 +48,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'http', name = 'http',
id = 'org.eclipse.jetty:jetty-http:' + VERSION, id = 'org.eclipse.jetty:jetty-http:' + VERSION,
sha1 = 'b3a2302717ac1889b4a17ed03e2555f8291121b9', sha1 = '1ee35683e75298b3fe246befd1cd88b6e6087427',
license = 'Apache2.0', license = 'Apache2.0',
exported_deps = [':io'], exported_deps = [':io'],
exclude = EXCLUDE, exclude = EXCLUDE,
@ -57,7 +57,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'io', name = 'io',
id = 'org.eclipse.jetty:jetty-io:' + VERSION, id = 'org.eclipse.jetty:jetty-io:' + VERSION,
sha1 = 'f3a66e0507d963c51e280243f0472a5b2eadc8b1', sha1 = '99e4632a0760f5fb2a110d25df992faf959700d6',
license = 'Apache2.0', license = 'Apache2.0',
exported_deps = [':util'], exported_deps = [':util'],
exclude = EXCLUDE, exclude = EXCLUDE,
@ -67,7 +67,7 @@ maven_jar(
maven_jar( maven_jar(
name = 'util', name = 'util',
id = 'org.eclipse.jetty:jetty-util:' + VERSION, id = 'org.eclipse.jetty:jetty-util:' + VERSION,
sha1 = 'f36c9e61559d1154be9b52803ef4f586e401dac6', sha1 = '440fc44218366a7b58739aef4402b4927e135b9c',
license = 'Apache2.0', license = 'Apache2.0',
exclude = EXCLUDE, exclude = EXCLUDE,
visibility = [], visibility = [],