From 190f3cbd49014fef492f68830a51a29eaa2c3856 Mon Sep 17 00:00:00 2001
From: Eric Anderson <ejona@google.com>
Date: Tue, 15 May 2018 10:57:03 -0700
Subject: [PATCH] bazel: Remove http_file trick for neverlink

The trick wasn't necessary, as any java_library can mark itself as
neverlink which applies to its dependencies.
---
 repositories.bzl | 11 +++++------
 stub/BUILD.bazel |  6 ++----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/repositories.bzl b/repositories.bzl
index e0938e0fe9e..67665c3465b 100644
--- a/repositories.bzl
+++ b/repositories.bzl
@@ -291,12 +291,11 @@ def io_opencensus_grpc_metrics():
     )
 
 def javax_annotation():
-    # TODO(davido): maven_jar does not support neverlink attribute.
-    # To circumvent use http_file following by java_import.
-    native.http_file(
-        name = "javax_annotation_api",
-        sha256 = "5909b396ca3a2be10d0eea32c74ef78d816e1b4ead21de1d78de1f890d033e04",
-        urls = ["http://central.maven.org/maven2/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar"],
+    # Use //stub:javax_annotation for neverlink=1 support.
+    native.maven_jar(
+        name = "javax_annotation_javax_annotation_api",
+        artifact = "javax.annotation:javax.annotation-api:1.2",
+        sha1 = "479c1e06db31c432330183f5cae684163f186146",
     )
 
 def junit_junit():
diff --git a/stub/BUILD.bazel b/stub/BUILD.bazel
index 1ee793a4628..b0304cf5f1a 100644
--- a/stub/BUILD.bazel
+++ b/stub/BUILD.bazel
@@ -14,11 +14,9 @@ java_library(
 
 # javax.annotation.Generated is not included in the default root modules in 9,
 # see: http://openjdk.java.net/jeps/320.
-java_import(
+java_library(
     name = "javax_annotation",
-    jars = [
-        "@javax_annotation_api//file",
-    ],
     neverlink = 1,  # @Generated is source-retention
     visibility = ["//visibility:public"],
+    exports = ["@javax_annotation_javax_annotation_api//jar"],
 )