From 169fd62da71707a2d7608716117da901ee754066 Mon Sep 17 00:00:00 2001 From: jianglai Date: Mon, 29 Jan 2018 13:11:45 -0800 Subject: [PATCH] Add dependencies on classes that are not in the default modules in JDK 9 This is a follow-up to [] Also added jaxws-api Maven dependency and upgraded activation artifacts to 1.2.0, in parity with //third_party/java/activation. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=183714304 --- java/google/registry/repositories.bzl | 52 +++++++++++++++---- javatests/google/registry/model/BUILD | 2 + .../google/registry/monitoring/whitebox/BUILD | 1 + javatests/google/registry/rdap/BUILD | 1 + 4 files changed, 46 insertions(+), 10 deletions(-) diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 8478eb543..80ad16047 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -110,12 +110,14 @@ def domain_registry_repositories( omit_io_netty_tcnative=False, omit_io_netty_transport=False, omit_it_unimi_dsi_fastutil=False, - omit_javax_activation=False, + omit_com_sun_activation_javax_activation=False, omit_javax_annotation_jsr250_api=False, omit_javax_inject=False, omit_javax_mail=False, omit_javax_servlet_api=False, omit_javax_xml_bind_jaxb_api=False, + omit_javax_xml_soap_api=False, + omit_javax_xml_ws_jaxws_api=False, omit_joda_time=False, omit_junit=False, omit_org_apache_avro=False, @@ -332,8 +334,8 @@ def domain_registry_repositories( io_netty_transport() if not omit_it_unimi_dsi_fastutil: it_unimi_dsi_fastutil() - if not omit_javax_activation: - javax_activation() + if not omit_com_sun_activation_javax_activation: + com_sun_activation_javax_activation() if not omit_javax_annotation_jsr250_api: javax_annotation_jsr250_api() if not omit_javax_inject: @@ -344,6 +346,10 @@ def domain_registry_repositories( javax_servlet_api() if not omit_javax_xml_bind_jaxb_api: javax_xml_bind_jaxb_api() + if not omit_javax_xml_soap_api: + javax_xml_soap_api() + if not omit_javax_xml_ws_jaxws_api: + javax_xml_ws_jaxws_api() if not omit_joda_time: joda_time() if not omit_junit: @@ -1806,15 +1812,15 @@ def it_unimi_dsi_fastutil(): licenses = ["notice"], # Apache License, Version 2.0 ) -def javax_activation(): +def com_sun_activation_javax_activation(): java_import_external( - name = "javax_activation", - jar_sha256 = "2881c79c9d6ef01c58e62beea13e9d1ac8b8baa16f2fc198ad6e6776defdcdd3", + name = "com_sun_activation_javax_activation", + licenses = ["restricted"], # CDDL/GPLv2+CE + jar_sha256 = "993302b16cd7056f21e779cc577d175a810bb4900ef73cd8fbf2b50f928ba9ce", jar_urls = [ - "http://domain-registry-maven.storage.googleapis.com/repo1.maven.org/maven2/javax/activation/activation/1.1/activation-1.1.jar", - "http://repo1.maven.org/maven2/javax/activation/activation/1.1/activation-1.1.jar", + "http://maven.ibiblio.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar", + "http://repo1.maven.org/maven2/com/sun/activation/javax.activation/1.2.0/javax.activation-1.2.0.jar", ], - licenses = ["reciprocal"], # Common Development and Distribution License (CDDL) v1.0 ) def javax_annotation_jsr250_api(): @@ -1848,7 +1854,7 @@ def javax_mail(): "http://repo1.maven.org/maven2/javax/mail/mail/1.4/mail-1.4.jar", ], licenses = ["reciprocal"], # Common Development and Distribution License (CDDL) v1.0 - deps = ["@javax_activation"], + deps = ["@com_sun_activation_javax_activation"], ) def javax_servlet_api(): @@ -1875,6 +1881,32 @@ def javax_xml_bind_jaxb_api(): licenses = ["reciprocal"], ) +def javax_xml_soap_api(): + java_import_external( + name = "javax_xml_soap_api", + licenses = ["restricted"], # CDDL + GPLv2 with classpath exception + jar_sha256 = "141374e33be99768611a2d42b9d33571a0c5b9763beca9c2dc90900d8cc8f767", + jar_urls = [ + "http://repo1.maven.org/maven2/javax/xml/soap/javax.xml.soap-api/1.4.0/javax.xml.soap-api-1.4.0.jar", + "http://maven.ibiblio.org/maven2/javax/xml/soap/javax.xml.soap-api/1.4.0/javax.xml.soap-api-1.4.0.jar", + ], + ) + +def javax_xml_ws_jaxws_api(): + java_import_external( + name = "javax_xml_ws_jaxws_api", + licenses = ["restricted"], # CDDL + GPLv2 with classpath exception + jar_sha256 = "c261f75c1a25ecb17d1936efe34a34236b5d0e79415b34ffb9324359a30a8c08", + jar_urls = [ + "http://maven.ibiblio.org/maven2/javax/xml/ws/jaxws-api/2.3.0/jaxws-api-2.3.0.jar", + "http://repo1.maven.org/maven2/javax/xml/ws/jaxws-api/2.3.0/jaxws-api-2.3.0.jar", + ], + deps = [ + "@javax_xml_bind_jaxb_api", + "@javax_xml_soap_api", + ], + ) + def joda_time(): java_import_external( name = "joda_time", diff --git a/javatests/google/registry/model/BUILD b/javatests/google/registry/model/BUILD index 9c78fd346..6fe3e5e1b 100644 --- a/javatests/google/registry/model/BUILD +++ b/javatests/google/registry/model/BUILD @@ -36,6 +36,8 @@ java_library( "@com_google_monitoring_client_contrib", "@com_google_truth", "@com_google_truth_extensions_truth_java8_extension", + "@com_sun_activation_javax_activation", + "@javax_xml_ws_jaxws_api", "@joda_time", "@junit", "@org_joda_money", diff --git a/javatests/google/registry/monitoring/whitebox/BUILD b/javatests/google/registry/monitoring/whitebox/BUILD index 3d42d2c50..507f3b737 100644 --- a/javatests/google/registry/monitoring/whitebox/BUILD +++ b/javatests/google/registry/monitoring/whitebox/BUILD @@ -31,6 +31,7 @@ java_library( "@com_google_truth", "@com_google_truth_extensions_truth_java8_extension", "@javax_servlet_api", + "@javax_xml_ws_jaxws_api", "@joda_time", "@junit", "@org_joda_money", diff --git a/javatests/google/registry/rdap/BUILD b/javatests/google/registry/rdap/BUILD index ec6da920b..af6dda963 100644 --- a/javatests/google/registry/rdap/BUILD +++ b/javatests/google/registry/rdap/BUILD @@ -30,6 +30,7 @@ java_library( "@com_google_truth_extensions_truth_java8_extension", "@com_googlecode_json_simple", "@javax_servlet_api", + "@javax_xml_ws_jaxws_api", "@joda_time", "@junit", "@org_mockito_all",