commit b9536696f60b36feae70dbfeeeb580766836f9b2
author Carmelo Cascone <carmelo@opennetworking.org> Tue May 28 18:15:23 2019 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Thu May 30 18:11:06 2019 +0000
tree e04f4a01bc92fd637a157412e6c24c0301062ca0
parent f3f6a8de7963f630f60e3a051aac3f08b290bd81

First attempt at supporting builds with Java 11

Includes:
- Bump protobuf to 3.8.0 and grpc-java to 1.21.0 (along with transitive
  dependencies such as Netty)
- Add jaxb_api at compile time when needed (removed in JDK 11)
- Bump Bnd to 4.1 (adds support for Java 11)

To build with JDK 11, uncomment lines in .bazelrc.
Tested with Bazel 0.26.0.

Change-Id: Ib8e0c7310eacf97328762606e57c01e4834e5565

drivers/bmv2/BUILD

diff --git a/drivers/bmv2/BUILD b/drivers/bmv2/BUILD
index 9478b50..2b42bdb 100644
--- a/drivers/bmv2/BUILD
+++ b/drivers/bmv2/BUILD
@@ -4,7 +4,7 @@
     "//pipelines/basic:onos-pipelines-basic",
     "//protocols/p4runtime/api:onos-protocols-p4runtime-api",
     "//protocols/p4runtime/model:onos-protocols-p4runtime-model",
-    "//lib:io_grpc_grpc_core_context",
+    "//lib:io_grpc_grpc_api_context",
     "//lib:io_grpc_grpc_netty",
     "@minimal_json//jar",
     # "//protocols/bmv2/thrift-api:onos-protocols-bmv2-thrift-api",

drivers/gnmi/BUILD

diff --git a/drivers/gnmi/BUILD b/drivers/gnmi/BUILD
index f2c33d0..de00da9 100644
--- a/drivers/gnmi/BUILD
+++ b/drivers/gnmi/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + [
     "//lib:com_google_protobuf_protobuf_java",
-    "//lib:io_grpc_grpc_core_context",
+    "//lib:io_grpc_grpc_api_context",
     "//lib:io_grpc_grpc_netty",
     "//lib:io_grpc_grpc_stub",
     "//core/store/serializers:onos-core-serializers",

drivers/gnoi/BUILD

diff --git a/drivers/gnoi/BUILD b/drivers/gnoi/BUILD
index 122c961..70b3c83 100644
--- a/drivers/gnoi/BUILD
+++ b/drivers/gnoi/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + [
     "//lib:com_google_protobuf_protobuf_java",
-    "//lib:io_grpc_grpc_core_context",
+    "//lib:io_grpc_grpc_api_context",
     "//lib:io_grpc_grpc_netty",
     "//lib:io_grpc_grpc_stub",
     "//protocols/gnoi/stub:onos-protocols-gnoi-stub",

drivers/p4runtime/BUILD

diff --git a/drivers/p4runtime/BUILD b/drivers/p4runtime/BUILD
index 23c6e9e..ded8842 100644
--- a/drivers/p4runtime/BUILD
+++ b/drivers/p4runtime/BUILD
@@ -3,7 +3,7 @@
     "//protocols/grpc/api:onos-protocols-grpc-api",
     "//protocols/grpc/utils:onos-protocols-grpc-utils",
     "//protocols/p4runtime/api:onos-protocols-p4runtime-api",
-    "//lib:io_grpc_grpc_core_context",
+    "//lib:io_grpc_grpc_api_context",
 ]
 
 BUNDLES = [

drivers/stratum/BUILD

diff --git a/drivers/stratum/BUILD b/drivers/stratum/BUILD
index 91b055c..e6e84d8 100644
--- a/drivers/stratum/BUILD
+++ b/drivers/stratum/BUILD
@@ -1,5 +1,5 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + JACKSON + [
-    "//lib:io_grpc_grpc_core_context",
+    "//lib:io_grpc_grpc_api_context",
     "//drivers/p4runtime:onos-drivers-p4runtime",
     "//drivers/gnmi:onos-drivers-gnmi",
     "//drivers/gnoi:onos-drivers-gnoi",