Set output_licenses on java_plugin

The fix was released in Bazel 0.4.4 a month ago.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=150630179
This commit is contained in:
jart 2017-03-20 08:49:47 -07:00 committed by Ben McIlwain
parent 57c41d2e16
commit f37296c3a1
2 changed files with 7 additions and 12 deletions

View file

@ -7,7 +7,7 @@ This document covers the steps necessary to download, build, and deploy Nomulus.
You will need the following programs installed on your local machine: You will need the following programs installed on your local machine:
* A recent version of the [Java 7 JDK][java-jdk7]. * A recent version of the [Java 7 JDK][java-jdk7].
* [Bazel build system](http://bazel.io/) >= version 0.4.2. Make sure to * [Bazel build system](http://bazel.io/) >= version 0.4.4. Make sure to
download the JDK7-compatible version. download the JDK7-compatible version.
* [Google App Engine SDK for Java][app-engine-sdk], and configure aliases to * [Google App Engine SDK for Java][app-engine-sdk], and configure aliases to
to the `gcloud` and `appcfg.sh` utilities (you'll use them a lot). to the `gcloud` and `appcfg.sh` utilities (you'll use them a lot).

View file

@ -19,7 +19,7 @@ load("@io_bazel_rules_closure//closure/private:java_import_external.bzl", "java_
def domain_registry_bazel_check(): def domain_registry_bazel_check():
"""Checks Bazel version for Nomulus.""" """Checks Bazel version for Nomulus."""
_check_bazel_version("Nomulus", "0.4.2") _check_bazel_version("Nomulus", "0.4.4")
def domain_registry_repositories( def domain_registry_repositories(
omit_com_beust_jcommander=False, omit_com_beust_jcommander=False,
@ -707,8 +707,7 @@ def com_google_auto_factory():
"", "",
"java_plugin(", "java_plugin(",
" name = \"AutoFactoryProcessor\",", " name = \"AutoFactoryProcessor\",",
# TODO(jart): https://github.com/bazelbuild/bazel/issues/2286 " output_licenses = [\"unencumbered\"],",
# " output_licenses = [\"unencumbered\"],",
" processor_class = \"com.google.auto.factory.processor.AutoFactoryProcessor\",", " processor_class = \"com.google.auto.factory.processor.AutoFactoryProcessor\",",
" generates_api = 1,", " generates_api = 1,",
" tags = [\"annotation=com.google.auto.factory.AutoFactory;genclass=${package}.${outerclasses}@{className|${classname}Factory}\"],", " tags = [\"annotation=com.google.auto.factory.AutoFactory;genclass=${package}.${outerclasses}@{className|${classname}Factory}\"],",
@ -747,8 +746,7 @@ def com_google_auto_service():
extra_build_file_content = "\n".join([ extra_build_file_content = "\n".join([
"java_plugin(", "java_plugin(",
" name = \"AutoServiceProcessor\",", " name = \"AutoServiceProcessor\",",
# TODO(jart): https://github.com/bazelbuild/bazel/issues/2286 " output_licenses = [\"unencumbered\"],",
# " output_licenses = [\"unencumbered\"],",
" processor_class = \"com.google.auto.service.processor.AutoServiceProcessor\",", " processor_class = \"com.google.auto.service.processor.AutoServiceProcessor\",",
" deps = [\":processor\"],", " deps = [\":processor\"],",
")", ")",
@ -781,8 +779,7 @@ def com_google_auto_value():
extra_build_file_content = "\n".join([ extra_build_file_content = "\n".join([
"java_plugin(", "java_plugin(",
" name = \"AutoAnnotationProcessor\",", " name = \"AutoAnnotationProcessor\",",
# TODO(jart): https://github.com/bazelbuild/bazel/issues/2286 " output_licenses = [\"unencumbered\"],",
# " output_licenses = [\"unencumbered\"],",
" processor_class = \"com.google.auto.value.processor.AutoAnnotationProcessor\",", " processor_class = \"com.google.auto.value.processor.AutoAnnotationProcessor\",",
" tags = [\"annotation=com.google.auto.value.AutoAnnotation;genclass=${package}.AutoAnnotation_${outerclasses}${classname}_${methodname}\"],", " tags = [\"annotation=com.google.auto.value.AutoAnnotation;genclass=${package}.AutoAnnotation_${outerclasses}${classname}_${methodname}\"],",
" deps = [\":processor\"],", " deps = [\":processor\"],",
@ -790,8 +787,7 @@ def com_google_auto_value():
"", "",
"java_plugin(", "java_plugin(",
" name = \"AutoValueProcessor\",", " name = \"AutoValueProcessor\",",
# TODO(jart): https://github.com/bazelbuild/bazel/issues/2286 " output_licenses = [\"unencumbered\"],",
# " output_licenses = [\"unencumbered\"],",
" processor_class = \"com.google.auto.value.processor.AutoValueProcessor\",", " processor_class = \"com.google.auto.value.processor.AutoValueProcessor\",",
" tags = [\"annotation=com.google.auto.value.AutoValue;genclass=${package}.AutoValue_${outerclasses}${classname}\"],", " tags = [\"annotation=com.google.auto.value.AutoValue;genclass=${package}.AutoValue_${outerclasses}${classname}\"],",
" deps = [\":processor\"],", " deps = [\":processor\"],",
@ -866,8 +862,7 @@ def com_google_dagger_compiler():
extra_build_file_content = "\n".join([ extra_build_file_content = "\n".join([
"java_plugin(", "java_plugin(",
" name = \"ComponentProcessor\",", " name = \"ComponentProcessor\",",
# TODO(jart): https://github.com/bazelbuild/bazel/issues/2286 " output_licenses = [\"unencumbered\"],",
# " output_licenses = [\"unencumbered\"],",
" processor_class = \"dagger.internal.codegen.ComponentProcessor\",", " processor_class = \"dagger.internal.codegen.ComponentProcessor\",",
" generates_api = 1,", " generates_api = 1,",
" tags = [", " tags = [",