diff --git a/WORKSPACE b/WORKSPACE index 997904163..100000adb 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -2,11 +2,11 @@ workspace(name = "domain_registry") http_archive( name = "io_bazel_rules_closure", - sha256 = "c104d30b4aaf23d72afe327b4478d1c08cf1ff75c6db2060682bb7ad0591e19b", - strip_prefix = "rules_closure-962d929bc769fc320dd395f54fef3e9db62c3920", + sha256 = "286e9169d478c4549199e862d63b24aa8530e0fe1c1fd44524d307f3a56b0fa0", + strip_prefix = "rules_closure-c8e68361db0875f6fabb23abed16f1cebbb8b5d5", urls = [ - "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/962d929bc769fc320dd395f54fef3e9db62c3920.tar.gz", # 2016-12-28 - "https://github.com/bazelbuild/rules_closure/archive/962d929bc769fc320dd395f54fef3e9db62c3920.tar.gz", + "http://mirror.bazel.build/github.com/bazelbuild/rules_closure/archive/c8e68361db0875f6fabb23abed16f1cebbb8b5d5.tar.gz", # 2017-08-08 + "https://github.com/bazelbuild/rules_closure/archive/c8e68361db0875f6fabb23abed16f1cebbb8b5d5.tar.gz", ], ) @@ -17,10 +17,8 @@ closure_repositories( omit_com_google_guava = True, omit_com_ibm_icu_icu4j = True, omit_javax_inject = True, - omit_org_apache_tomcat_servlet_api = True, omit_org_json = True, - omit_org_mortbay_jetty = True, - omit_org_mortbay_jetty_util = True, + omit_com_google_template_soy = True, ) load("//java/google/registry:repositories.bzl", "domain_registry_repositories") diff --git a/java/google/registry/repositories.bzl b/java/google/registry/repositories.bzl index 9343af522..3bf1a41de 100644 --- a/java/google/registry/repositories.bzl +++ b/java/google/registry/repositories.bzl @@ -107,7 +107,8 @@ def domain_registry_repositories( omit_org_mortbay_jetty_servlet_api=False, omit_org_mortbay_jetty_util=False, omit_org_slf4j_api=False, - omit_org_yaml_snakeyaml=False): + omit_org_yaml_snakeyaml=False, + omit_com_google_template_soy=False): """Imports dependencies for Nomulus.""" domain_registry_bazel_check() if not omit_com_beust_jcommander: @@ -282,6 +283,8 @@ def domain_registry_repositories( org_slf4j_api() if not omit_org_yaml_snakeyaml: org_yaml_snakeyaml() + if not omit_com_google_template_soy: + com_google_template_soy() def com_beust_jcommander(): java_import_external( @@ -1651,6 +1654,48 @@ def org_yaml_snakeyaml(): ], ) +def com_google_template_soy(): + java_import_external( + name = "com_google_template_soy", + jar_sha256 = "3c4e61234e9ee9f79411da997e23b201bcf281255469c76d162dac07a67dbb78", + jar_urls = [ + "http://repo1.maven.org/maven2/com/google/template/soy/2017-06-22/soy-2017-06-22.jar", + "http://central.maven.org/maven2/com/google/template/soy/2017-06-22/soy-2017-06-22.jar", + ], + deps = [ + "@args4j", + "@org_ow2_asm", + "@org_ow2_asm_analysis", + "@org_ow2_asm_commons", + "@org_ow2_asm_util", + "@com_google_guava", + "@com_google_inject_guice", + "@com_google_inject_extensions_guice_assistedinject", + "@com_google_inject_extensions_guice_multibindings", + "@com_ibm_icu_icu4j", + "@org_json", + "@com_google_code_findbugs_jsr305", + "@javax_inject", + "@com_google_common_html_types", + ], + licenses = ["notice"], # The Apache Software License, Version 2.0 + extra_build_file_content = "\n".join([ + ("java_binary(\n" + + " name = \"%s\",\n" + + " main_class = \"com.google.template.soy.%s\",\n" + + " output_licenses = [\"unencumbered\"],\n" + + " runtime_deps = [\":com_google_template_soy\"],\n" + + ")\n") % (name, name) + for name in ("SoyParseInfoGenerator", + "SoyToJbcSrcCompiler", + "SoyToJsSrcCompiler", + "SoyToPySrcCompiler", + "SoyToIncrementalDomSrcCompiler") + ]), + ) + + + def _check_bazel_version(project, bazel_version): if "bazel_version" not in dir(native): fail("%s requires Bazel >=%s but was <0.2.1" % (project, bazel_version)) diff --git a/java/google/registry/ui/soy/Console.soy b/java/google/registry/ui/soy/Console.soy index 287c175c1..1666f72d7 100644 --- a/java/google/registry/ui/soy/Console.soy +++ b/java/google/registry/ui/soy/Console.soy @@ -68,7 +68,7 @@ {@param logoFilename: string} {@param productName: string}