From d3b80b951c0bf995f7d210710e3d31e9d529efe2 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sun, 26 Feb 2017 15:09:04 -0800 Subject: [PATCH] Update Jetty to 9.4.1.v20170120 in buck build 5e8e2179b218ede7d14b69dc5149b0691b5859cf (Update Jetty to 9.4.1.v201470120, 2017-01-26) updated Jetty in the maven build. Update the buck build to match so buck builds work again. The buck build will go away soon, but in the meantime (until the bazel build gets the same level of support) it is convenient as a faster way of running tests than using maven. The bazel build doesn't need this change since it doesn't build or run http tests yet. Change-Id: Ibbdaf2880e76b32fc9f6b5605a2ff29e3deffda2 (cherry picked from commit 2470f01d0f8bca4c8c754475846c83b9f99c93b8) --- lib/jetty/BUCK | 26 +++++++++++++------------- org.eclipse.jgit.junit.http/BUCK | 1 + 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/jetty/BUCK b/lib/jetty/BUCK index 6e7dec306..c75b278f7 100644 --- a/lib/jetty/BUCK +++ b/lib/jetty/BUCK @@ -1,10 +1,10 @@ -VERSION = '9.2.13.v20150730' +VERSION = '9.4.1.v20170120' GROUP = 'org.eclipse.jetty' maven_jar( name = 'servlet', - bin_sha1 = '5ad6e38015a97ae9a60b6c2ad744ccfa9cf93a50', - src_sha1 = '78fbec19321150552d91f9e079c2f2ca33222b01', + bin_sha1 = '406a6edc22311629b41e98ab26901574d243d408', + src_sha1 = '57cf143c4110e0d43635406a1052013bbf29a4da', group = GROUP, artifact = 'jetty-servlet', version = VERSION, @@ -12,8 +12,8 @@ maven_jar( maven_jar( name = 'security', - bin_sha1 = 'cc7c7f27ec4cc279253be1675d9e47e58b995943', - src_sha1 = '75632ebdf8bd651faafb97106c92496db59e165d', + bin_sha1 = '677aa94298f42d322e2f19045693a233613537b6', + src_sha1 = '933928163506a8d366652fb895e770fcf3f9e8fe', group = GROUP, artifact = 'jetty-security', version = VERSION, @@ -21,8 +21,8 @@ maven_jar( maven_jar( name = 'server', - bin_sha1 = '5be7d1da0a7abffd142de3091d160717c120b6ab', - src_sha1 = '203e123f83efe2a5b8a9c74854c7897fe3563302', + bin_sha1 = '4cf4bea26592de98b9126ac60bc91fb669176a63', + src_sha1 = '2035ab117da534f9a525adfaa9f3a5634d202707', group = GROUP, artifact = 'jetty-server', version = VERSION, @@ -30,8 +30,8 @@ maven_jar( maven_jar( name = 'http', - bin_sha1 = '23a745d9177ef67ef53cc46b9b70c5870082efc2', - src_sha1 = '5f87f7ff2057cd4b0995bc4fffe17b2aff64c130', + bin_sha1 = 'c9c9d5b15b3bb41ae9ae588b7aede301b42186f6', + src_sha1 = 'f1cbf0e1329ed722bf8eba74e4c4b94619dfe8a8', group = GROUP, artifact = 'jetty-http', version = VERSION, @@ -39,8 +39,8 @@ maven_jar( maven_jar( name = 'io', - bin_sha1 = '7a351e6a1b63dfd56b6632623f7ca2793ffb67ad', - src_sha1 = 'bbd61a84b748fc295456e1c5c3070aaf40a68f62', + bin_sha1 = '6d2d7c82a4b5306ec7bf2d6eb4b67460fce77240', + src_sha1 = '404b560a0d289c904b72d02e2dbb3b9ad73db219', group = GROUP, artifact = 'jetty-io', version = VERSION, @@ -48,8 +48,8 @@ maven_jar( maven_jar( name = 'util', - bin_sha1 = 'c101476360a7cdd0670462de04053507d5e70c97', - src_sha1 = '15ceecce141971b4e0facb861b3d10120ad6ce03', + bin_sha1 = '810c4e4275e399feaf6e8bc51aa72645bdc06205', + src_sha1 = 'b0dea459e5646e9ccf250a236718d720fba7717c', group = GROUP, artifact = 'jetty-util', version = VERSION, diff --git a/org.eclipse.jgit.junit.http/BUCK b/org.eclipse.jgit.junit.http/BUCK index 68976a68a..d7eaa4879 100644 --- a/org.eclipse.jgit.junit.http/BUCK +++ b/org.eclipse.jgit.junit.http/BUCK @@ -8,6 +8,7 @@ java_library( '//org.eclipse.jgit.junit:junit', '//lib:junit', '//lib:servlet-api', + '//lib:slf4j-api', '//lib/jetty:http', '//lib/jetty:server', '//lib/jetty:servlet',