Fix build behind web proxy - provide all jars needed by grpc java
Change-Id: Ibb925f6d261917c42a6f9a3e3aac27533083d8e9
(cherry picked from commit efb6cc53df699e2e9efb8ccfd96af0d539f918be)
diff --git a/WORKSPACE b/WORKSPACE
index f4c2b4d..dfaaf76 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -70,6 +70,7 @@
omit_javax_annotation = False,
omit_junit_junit = True,
omit_org_apache_commons_lang3 = True,
+ omit_org_codehaus_mojo_animal_sniffer_annotations = True,
)
load("//tools/build/bazel:p4lang_workspace.bzl", "generate_p4lang")
diff --git a/lib/deps.json b/lib/deps.json
index b7e7eaa..8481bb6 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -285,6 +285,8 @@
"io.socket-client": "mvn:io.socket:socket.io-client:jar:0.8.3",
"json": "mvn:org.json:json:jar:20090211",
"engine.io-client": "mvn:io.socket:engine.io-client:jar:0.8.3",
+ "org_codehaus_mojo_animal_sniffer_annotations": "mvn:org.codehaus.mojo:animal-sniffer-annotations:1.17",
+
// grpc related jars
"com_google_api_grpc_proto_google_common_protos": "mvn:com.google.api.grpc:proto-google-common-protos:1.12.0",
diff --git a/tools/build/bazel/generate_workspace.bzl b/tools/build/bazel/generate_workspace.bzl
index ab171af..812fd25 100644
--- a/tools/build/bazel/generate_workspace.bzl
+++ b/tools/build/bazel/generate_workspace.bzl
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Mon, 18 Mar 2019 09:41:29 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Wed, 24 Apr 2019 18:41:52 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
load("//tools/build/bazel:variables.bzl", "ONOS_GROUP_ID", "ONOS_VERSION")
@@ -1072,6 +1072,12 @@
jar_sha256 = "c421ace40f0170d9c7f0155850076a68f091afa9a60fc055f703277ce92bc214",
licenses = ["notice"],
jar_urls = ["http://repo1.maven.org/maven2/io/socket/engine.io-client/0.8.3/engine.io-client-0.8.3.jar"], )
+ if "org_codehaus_mojo_animal_sniffer_annotations" not in native.existing_rules():
+ java_import_external(
+ name = "org_codehaus_mojo_animal_sniffer_annotations",
+ jar_sha256 = "92654f493ecfec52082e76354f0ebf87648dc3d5cec2e3c3cdb947c016747a53",
+ licenses = ["notice"],
+ jar_urls = ["http://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.17/animal-sniffer-annotations-1.17.jar"], )
if "com_google_api_grpc_proto_google_common_protos" not in native.existing_rules():
java_import_external(
name = "com_google_api_grpc_proto_google_common_protos",
@@ -1477,6 +1483,7 @@
artifact_map["@io_socket_client//:io_socket_client"] = "mvn:io.socket:socket.io-client:jar:NON-OSGI:0.8.3"
artifact_map["@json//:json"] = "mvn:org.json:json:jar:NON-OSGI:20090211"
artifact_map["@engine_io_client//:engine_io_client"] = "mvn:io.socket:engine.io-client:jar:NON-OSGI:0.8.3"
+artifact_map["@org_codehaus_mojo_animal_sniffer_annotations//:org_codehaus_mojo_animal_sniffer_annotations"] = "mvn:org.codehaus.mojo:animal-sniffer-annotations:jar:NON-OSGI:1.17"
artifact_map["@com_google_api_grpc_proto_google_common_protos//:com_google_api_grpc_proto_google_common_protos"] = "mvn:com.google.api.grpc:proto-google-common-protos:jar:NON-OSGI:1.12.0"
artifact_map["@com_google_errorprone_error_prone_annotations//:com_google_errorprone_error_prone_annotations"] = "mvn:com.google.errorprone:error_prone_annotations:jar:NON-OSGI:2.3.2"
artifact_map["@com_google_auth_google_auth_library_credentials//:com_google_auth_google_auth_library_credentials"] = "mvn:com.google.auth:google-auth-library-credentials:jar:NON-OSGI:0.9.0"