diff --git a/java/google/registry/model/BUILD b/java/google/registry/model/BUILD index 5f8434e48..73bfe0a0a 100644 --- a/java/google/registry/model/BUILD +++ b/java/google/registry/model/BUILD @@ -16,6 +16,7 @@ java_library( "//java/google/registry/config", "//java/google/registry/util", "//java/google/registry/xml", + "//third_party/jaxb", "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_auto_value", diff --git a/java/google/registry/rde/BUILD b/java/google/registry/rde/BUILD index e47c654f3..78454b222 100644 --- a/java/google/registry/rde/BUILD +++ b/java/google/registry/rde/BUILD @@ -21,6 +21,7 @@ java_library( "//java/google/registry/util", "//java/google/registry/xjc", "//java/google/registry/xml", + "//third_party/jaxb", "//third_party/jsch/v0_1_53", "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", diff --git a/java/google/registry/rde/imports/BUILD b/java/google/registry/rde/imports/BUILD index 57aa56fb1..42dd253f3 100644 --- a/java/google/registry/rde/imports/BUILD +++ b/java/google/registry/rde/imports/BUILD @@ -20,6 +20,7 @@ java_library( "//java/google/registry/util", "//java/google/registry/xjc", "//java/google/registry/xml", + "//third_party/jaxb", "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_appengine_tools_appengine_gcs_client", diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index ebccaed7d..8478eb543 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -95,6 +95,7 @@ def domain_registry_repositories( omit_com_squareup_javawriter=False, omit_com_sun_xml_bind_jaxb_core=False, omit_com_sun_xml_bind_jaxb_impl=False, + omit_com_sun_xml_bind_jaxb_jxc=False, omit_com_sun_xml_bind_jaxb_xjc=False, omit_com_thoughtworks_paranamer=False, omit_commons_codec=False, @@ -303,6 +304,8 @@ def domain_registry_repositories( com_sun_xml_bind_jaxb_impl() if not omit_com_sun_xml_bind_jaxb_xjc: com_sun_xml_bind_jaxb_xjc() + if not omit_com_sun_xml_bind_jaxb_jxc: + com_sun_xml_bind_jaxb_jxc() if not omit_com_thoughtworks_paranamer: com_thoughtworks_paranamer() if not omit_commons_codec: @@ -1617,6 +1620,17 @@ def com_sun_xml_bind_jaxb_impl(): licenses = ["reciprocal"], # CDDL 1.1 or GPLv2 (We choo-choo-choose the CDDL) ) +def com_sun_xml_bind_jaxb_jxc(): + java_import_external( + name = "com_sun_xml_bind_jaxb_jxc", + licenses = ["restricted"], # CDDL+GPL License + jar_sha256 = "25cbca594ec0682a1d0287c4a2fcb5f6a2a9718229d54a0ad09daf5cff180b4e", + jar_urls = [ + "http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-jxc/2.2.11/jaxb-jxc-2.2.11.jar", + "http://maven.ibiblio.org/maven2/com/sun/xml/bind/jaxb-jxc/2.2.11/jaxb-jxc-2.2.11.jar", + ], + ) + def com_sun_xml_bind_jaxb_xjc(): java_import_external( name = "com_sun_xml_bind_jaxb_xjc", diff --git a/java/google/registry/tools/BUILD b/java/google/registry/tools/BUILD index edaf5f4f1..b1d1d4f6b 100644 --- a/java/google/registry/tools/BUILD +++ b/java/google/registry/tools/BUILD @@ -66,6 +66,7 @@ java_library( "//java/google/registry/whois", "//java/google/registry/xjc", "//java/google/registry/xml", + "//third_party/jaxb", "//third_party/objectify:objectify-v4_1", "@com_beust_jcommander", "@com_google_api_client", diff --git a/java/google/registry/util/BUILD b/java/google/registry/util/BUILD index b25751b5b..77516b9c2 100644 --- a/java/google/registry/util/BUILD +++ b/java/google/registry/util/BUILD @@ -8,6 +8,7 @@ java_library( name = "util", srcs = glob(["*.java"]), deps = [ + "//third_party/jaxb", "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk", "@com_google_code_findbugs_jsr305", diff --git a/java/google/registry/xjc/BUILD b/java/google/registry/xjc/BUILD index ccba64454..fc8cbd876 100644 --- a/java/google/registry/xjc/BUILD +++ b/java/google/registry/xjc/BUILD @@ -12,6 +12,7 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/google/registry/xml", + "//third_party/jaxb", "@com_google_code_findbugs_jsr305", "@com_google_guava", "@joda_time", diff --git a/java/google/registry/xml/BUILD b/java/google/registry/xml/BUILD index 078a0fa40..6b3fef34f 100644 --- a/java/google/registry/xml/BUILD +++ b/java/google/registry/xml/BUILD @@ -14,6 +14,7 @@ java_library( srcs = glob(["*.java"]), resources = [":xml_schema_files"], deps = [ + "//third_party/jaxb", "@com_google_code_findbugs_jsr305", "@com_google_guava", "@com_google_re2j", diff --git a/javatests/google/registry/rde/BUILD b/javatests/google/registry/rde/BUILD index bf4bb4319..6249b616b 100644 --- a/javatests/google/registry/rde/BUILD +++ b/javatests/google/registry/rde/BUILD @@ -27,6 +27,7 @@ java_library( "//javatests/google/registry/testing/mapreduce", "//javatests/google/registry/testing/sftp", "//javatests/google/registry/xml", + "//third_party/jaxb", "//third_party/jsch/v0_1_53", "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", diff --git a/javatests/google/registry/rde/imports/BUILD b/javatests/google/registry/rde/imports/BUILD index 93a4f124e..144e0e52d 100644 --- a/javatests/google/registry/rde/imports/BUILD +++ b/javatests/google/registry/rde/imports/BUILD @@ -22,6 +22,7 @@ java_library( "//java/google/registry/xjc", "//javatests/google/registry/testing", "//javatests/google/registry/testing/mapreduce", + "//third_party/jaxb", "//third_party/objectify:objectify-v4_1", "@com_google_appengine_api_1_0_sdk//:testonly", "@com_google_appengine_tools_appengine_gcs_client", diff --git a/javatests/google/registry/tools/BUILD b/javatests/google/registry/tools/BUILD index 2446cc7ed..6bd581e18 100644 --- a/javatests/google/registry/tools/BUILD +++ b/javatests/google/registry/tools/BUILD @@ -36,6 +36,7 @@ java_library( "//javatests/google/registry/testing", "//javatests/google/registry/tools/server", "//javatests/google/registry/xml", + "//third_party/jaxb", "//third_party/objectify:objectify-v4_1", "@com_beust_jcommander", "@com_google_api_client", diff --git a/third_party/jaxb/BUILD b/third_party/jaxb/BUILD new file mode 100644 index 000000000..1ce8e9827 --- /dev/null +++ b/third_party/jaxb/BUILD @@ -0,0 +1,8 @@ +package(default_visibility = ["//visibility:public"]) + +licenses(["reciprocal"]) # CDDL 1.1 (also dual-licensed under GPL v2) + +java_library( + name = "jaxb", + exports = ["//third_party/jaxb/v2_2_11"], +) diff --git a/third_party/jaxb/v2_2_11/BUILD b/third_party/jaxb/v2_2_11/BUILD new file mode 100644 index 000000000..c151887ad --- /dev/null +++ b/third_party/jaxb/v2_2_11/BUILD @@ -0,0 +1,19 @@ +package_group( + name = "specific_version", + packages = ["//third_party/jaxb"], +) + +package(default_visibility = ["//visibility:public"]) + +licenses(["reciprocal"]) # CDDL 1.1 (also dual-licensed under GPL v2) + +java_library( + name = "v2_2_11", + exports = [ + "@com_sun_xml_bind_jaxb_core", + "@com_sun_xml_bind_jaxb_impl", + "@com_sun_xml_bind_jaxb_jxc", + "@com_sun_xml_bind_jaxb_xjc", + "@javax_xml_bind_jaxb_api", + ], +)