Move backported JUnit file to third_party (part 2)

Last commit did not pick up all the changes because MOE incorrectly attributed some changes to the wrong commit. This commit should reconcile these. Also picked up some changes to how hamcrest library is depended upon in BUILD file, which should have been included in previous commits.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=177637931
This commit is contained in:
jianglai 2017-11-27 09:30:15 -08:00
parent 8ef4fbe9d5
commit 1c1f95992a
64 changed files with 57 additions and 61 deletions

View file

@ -16,7 +16,7 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/request/auth",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_appengine_tools_appengine_mapreduce",

View file

@ -21,7 +21,7 @@ java_library(
"//java/google/registry/request:modules",
"//java/google/registry/request/auth",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_bigquery",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",

View file

@ -12,7 +12,7 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/request/auth",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_code_findbugs_jsr305",
"@com_google_dagger",

View file

@ -28,7 +28,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/request/lock",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_auto_value",
"@com_google_code_findbugs_jsr305",

View file

@ -19,7 +19,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/storage/drive",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_api_client",
"@com_google_apis_google_api_services_bigquery",
"@com_google_apis_google_api_services_drive",

View file

@ -14,7 +14,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/request/lock",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_api_client",
"@com_google_apis_google_api_services_sheets",
"@com_google_appengine_api_1_0_sdk",

View file

@ -35,7 +35,7 @@ java_library(
"//java/google/registry/tmch",
"//java/google/registry/util",
"//java/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_auto_value",
"@com_google_code_findbugs_jsr305",

View file

@ -12,7 +12,7 @@ java_library(
"//java/google/registry/keyring/api",
"//java/google/registry/model",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_api_client",
"@com_google_apis_google_api_services_cloudkms",
"@com_google_auto_value",

View file

@ -14,7 +14,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/security",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_dagger",
"@com_google_guava",

View file

@ -12,7 +12,7 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/request",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_mapreduce",
"@com_google_appengine_tools_appengine_pipeline",

View file

@ -10,7 +10,7 @@ java_library(
deps = [
"//java/google/registry/model",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_mapreduce",
"@com_google_appengine_tools_appengine_pipeline",

View file

@ -17,7 +17,7 @@ java_library(
"//java/google/registry/monitoring/metrics",
"//java/google/registry/util",
"//java/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_auto_value",
"@com_google_code_findbugs_jsr305",

View file

@ -16,7 +16,7 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/request/auth",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_api_client",
"@com_google_apis_google_api_services_bigquery",
"@com_google_apis_google_api_services_monitoring",

View file

@ -10,7 +10,7 @@ java_library(
deps = [
"//java/google/registry/model",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_code_findbugs_jsr305",
"@com_google_dagger",
"@com_google_guava",

View file

@ -16,7 +16,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/ui/server/registrar",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_auto_value",
"@com_google_code_findbugs_jsr305",
"@com_google_dagger",

View file

@ -21,8 +21,8 @@ java_library(
"//java/google/registry/util",
"//java/google/registry/xjc",
"//java/google/registry/xml",
"//third_party/java/jsch/v0_1_53",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/jsch/v0_1_53",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_appengine_tools_appengine_mapreduce",

View file

@ -20,7 +20,7 @@ java_library(
"//java/google/registry/util",
"//java/google/registry/xjc",
"//java/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_appengine_tools_appengine_mapreduce",

View file

@ -13,7 +13,7 @@ java_library(
deps = [
"//java/google/registry/model",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_code_findbugs_jsr305",
"@com_google_guava",

View file

@ -10,7 +10,7 @@ java_library(
resources = glob(["*.txt"]),
deps = [
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_code_findbugs_jsr305",
"@com_google_guava",
"@com_google_re2j",

View file

@ -20,7 +20,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/util",
"//java/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_code_findbugs_jsr305",
"@com_google_dagger",

View file

@ -65,7 +65,7 @@ java_library(
"//java/google/registry/whois",
"//java/google/registry/xjc",
"//java/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_beust_jcommander",
"@com_google_api_client",
"@com_google_apis_google_api_services_bigquery",

View file

@ -20,7 +20,7 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/request/auth",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_beust_jcommander",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_tools_appengine_gcs_client",

View file

@ -25,7 +25,7 @@ java_library(
"//java/google/registry/ui/soy:soy_java_wrappers",
"//java/google/registry/ui/soy/registrar:soy_java_wrappers",
"//java/google/registry/util",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_braintreepayments_gateway_braintree_java",
"@com_google_appengine_api_1_0_sdk",
"@com_google_code_findbugs_jsr305",

View file

@ -8,7 +8,7 @@ java_library(
name = "util",
srcs = glob(["*.java"]),
deps = [
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_code_findbugs_jsr305",
"@com_google_dagger",

View file

@ -15,7 +15,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/util",
"//java/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_auto_value",
"@com_google_code_findbugs_jsr305",

View file

@ -17,7 +17,7 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_code_findbugs_jsr305",

View file

@ -19,7 +19,7 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_bigquery",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_api_stubs",

View file

@ -15,7 +15,7 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_api_stubs",
"@com_google_appengine_testing",

View file

@ -22,7 +22,7 @@ java_library(
"//java/google/registry/request",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_api_stubs",
"@com_google_code_findbugs_jsr305",

View file

@ -15,7 +15,7 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_dns",
"@com_google_code_findbugs_jsr305",
"@com_google_guava",

View file

@ -14,7 +14,7 @@ java_library(
"//java/google/registry/dns/writer/dnsupdate",
"//java/google/registry/model",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_code_findbugs_jsr305",
"@com_google_dagger",
"@com_google_guava",

View file

@ -27,7 +27,7 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_bigquery",
"@com_google_apis_google_api_services_drive",
"@com_google_appengine_api_1_0_sdk//:testonly",

View file

@ -13,7 +13,7 @@ java_library(
"//java/google/registry/export/sheet",
"//java/google/registry/model",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_sheets",
"@com_google_code_findbugs_jsr305",
"@com_google_guava",

View file

@ -39,7 +39,7 @@ java_library(
"//javatests/google/registry/model",
"//javatests/google/registry/testing",
"//javatests/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_testing",
"@com_google_code_findbugs_jsr305",

View file

@ -19,7 +19,6 @@ java_library(
"@junit",
"@org_bouncycastle_bcpg_jdk15on",
"@org_bouncycastle_bcpkix_jdk15on",
"@org_hamcrest_library",
"@org_mockito_all",
],
)

View file

@ -20,7 +20,7 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_api_client",
"@com_google_apis_google_api_services_cloudkms",
"@com_google_code_findbugs_jsr305",

View file

@ -16,7 +16,7 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_testing",
"@com_google_appengine_tools_appengine_mapreduce",

View file

@ -28,7 +28,7 @@ java_library(
"//java/google/registry/xml",
"//javatests/google/registry/testing",
"//javatests/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_testing",
"@com_google_code_findbugs_jsr305",

View file

@ -19,7 +19,7 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_apis_google_api_services_bigquery",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_api_stubs",

View file

@ -21,7 +21,7 @@ java_library(
"//java/google/registry/ui/server/registrar",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_code_findbugs_jsr305",
"@com_google_dagger",

View file

@ -27,8 +27,8 @@ java_library(
"//javatests/google/registry/testing/mapreduce",
"//javatests/google/registry/testing/sftp",
"//javatests/google/registry/xml",
"//third_party/java/jsch/v0_1_53",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/jsch/v0_1_53",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_code_findbugs_jsr305",
@ -42,7 +42,6 @@ java_library(
"@org_apache_ftpserver_core",
"@org_bouncycastle_bcpg_jdk15on",
"@org_bouncycastle_bcpkix_jdk15on",
"@org_hamcrest_library",
"@org_joda_money",
"@org_mockito_all",
],

View file

@ -22,7 +22,7 @@ java_library(
"//java/google/registry/xjc",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_code_findbugs_jsr305",

View file

@ -16,7 +16,7 @@ java_library(
"//java/google/registry/request/auth",
"//java/google/registry/security",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_appengine_tools_sdk",

View file

@ -15,7 +15,7 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/request/lock",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_appengine_tools_sdk",

View file

@ -32,7 +32,7 @@ java_library(
deps = [
"//java/google/registry/model",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_guava",
"@joda_time",
@ -51,7 +51,7 @@ java_library(
"//java/google/registry/model",
"//java/google/registry/module/backend",
"//java/google/registry/module/frontend",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_code_findbugs_jsr305",
"@com_google_guava",
"@javax_servlet_api",

View file

@ -34,7 +34,7 @@ java_library(
"//java/google/registry/tmch",
"//java/google/registry/util",
"//java/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_api_stubs",
"@com_google_appengine_testing",

View file

@ -23,7 +23,7 @@ java_library(
"//java/google/registry/tmch",
"//java/google/registry/util",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_code_findbugs_jsr305",
"@com_google_guava",

View file

@ -36,7 +36,7 @@ java_library(
"//javatests/google/registry/testing",
"//javatests/google/registry/tools/server",
"//javatests/google/registry/xml",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_beust_jcommander",
"@com_google_api_client",
"@com_google_apis_google_api_services_dns",

View file

@ -22,7 +22,7 @@ java_library(
"//javatests/google/registry/model",
"//javatests/google/registry/testing",
"//javatests/google/registry/testing/mapreduce",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_appengine_tools_appengine_gcs_client",
"@com_google_appengine_tools_appengine_mapreduce",

View file

@ -19,7 +19,6 @@ java_library(
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@junit",
"@org_hamcrest_library",
"@org_mockito_all",
],
)

View file

@ -24,7 +24,7 @@ java_library(
"//java/google/registry/util",
"//javatests/google/registry/security",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_braintreepayments_gateway_braintree_java",
"@com_google_appengine_api_1_0_sdk//:testonly",
"@com_google_guava",

View file

@ -18,7 +18,7 @@ java_library(
"//java/google/registry/util",
"//java/google/registry/whois",
"//javatests/google/registry/testing",
"//third_party/java/objectify:objectify-v4_1",
"//third_party/objectify:objectify-v4_1",
"@com_google_appengine_api_1_0_sdk",
"@com_google_appengine_testing",
"@com_google_dagger",

View file

@ -20,7 +20,6 @@ java_library(
"@com_google_truth",
"@com_google_truth_extensions_truth_java8_extension",
"@junit",
"@org_hamcrest_library",
],
)

View file

@ -4,5 +4,5 @@ licenses(["notice"]) # BSD
java_library(
name = "jsch",
exports = ["//third_party/java/jsch/v0_1_53"],
exports = ["//third_party/jsch/v0_1_53"],
)

View file

@ -1,6 +1,6 @@
package_group(
name = "specific_version",
packages = ["//third_party/java/jsch"],
packages = ["//third_party/jsch"],
)
package(default_visibility = ["//visibility:public"])

View file

@ -4,5 +4,5 @@ licenses(["notice"]) # MIT/X11
java_library(
name = "objectify-v4_1",
exports = ["//third_party/java/objectify/v4_1"],
exports = ["//third_party/objectify/v4_1"],
)

View file

@ -1,6 +1,6 @@
package_group(
name = "specific_version",
packages = ["//third_party/java/objectify"],
packages = ["//third_party/objectify"],
)
package(default_visibility = ["//visibility:public"])