From 1787db106d0d10a99c5c7864563753d0b9a5bd19 Mon Sep 17 00:00:00 2001 From: guyben Date: Thu, 10 May 2018 09:28:17 -0700 Subject: [PATCH] Fix "one version" error Jetty conflicts with appengine-integration-testing. Replaced one with the other. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=196126483 --- javatests/google/registry/server/BUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/javatests/google/registry/server/BUILD b/javatests/google/registry/server/BUILD index a235ef8a3..f570f708d 100644 --- a/javatests/google/registry/server/BUILD +++ b/javatests/google/registry/server/BUILD @@ -18,11 +18,12 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/google/registry/util", - "//third_party/java/jetty/v6_1_22", + "@com_google_appengine_tools_sdk", "@com_google_auto_value", "@com_google_code_findbugs_jsr305", "@com_google_guava", "@javax_servlet_api", + "@org_mortbay_jetty", ], )