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
diff --git a/apps/castor/BUILD b/apps/castor/BUILD
index 546453b..d493321 100644
--- a/apps/castor/BUILD
+++ b/apps/castor/BUILD
@@ -2,6 +2,7 @@
"//core/store/serializers:onos-core-serializers",
"//apps/routing-api:onos-apps-routing-api",
"//apps/intentsync:onos-apps-intentsync",
+ "@jaxb_api//jar",
]
BUNDLES = [
diff --git a/apps/onlp-demo/BUILD b/apps/onlp-demo/BUILD
index 2ef30c2..8bae746 100644
--- a/apps/onlp-demo/BUILD
+++ b/apps/onlp-demo/BUILD
@@ -1,6 +1,6 @@
COMPILE_DEPS = CORE_DEPS + JACKSON + [
"//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",
diff --git a/apps/openstacktelemetry/BUILD b/apps/openstacktelemetry/BUILD
index 33b9813..11a1d3d 100644
--- a/apps/openstacktelemetry/BUILD
+++ b/apps/openstacktelemetry/BUILD
@@ -16,7 +16,7 @@
"@simpleclient_hotspot//jar",
"@simpleclient_servlet//jar",
# gRPC dependencies (with patched core)
- "//lib:io_grpc_grpc_core_context",
+ "//lib:io_grpc_grpc_api_context",
"//lib:io_grpc_grpc_stub",
"//lib:io_grpc_grpc_netty",
"//lib:io_grpc_grpc_auth",
diff --git a/apps/openstacktelemetry/app/BUILD b/apps/openstacktelemetry/app/BUILD
index ecfb34d..76f1247 100644
--- a/apps/openstacktelemetry/app/BUILD
+++ b/apps/openstacktelemetry/app/BUILD
@@ -12,7 +12,7 @@
"@jetty_util//jar",
"@jetty_websocket//jar",
"@servlet_api//jar",
- "//lib:io_grpc_grpc_core_context",
+ "//lib:io_grpc_grpc_api_context",
"//lib:io_grpc_grpc_protobuf_lite",
"//core/store/serializers:onos-core-serializers",
"//apps/openstacknode/api:onos-apps-openstacknode-api",
diff --git a/apps/pcep-api/BUILD b/apps/pcep-api/BUILD
index 530f2b7..b759412 100644
--- a/apps/pcep-api/BUILD
+++ b/apps/pcep-api/BUILD
@@ -1,6 +1,7 @@
COMPILE_DEPS = CORE_DEPS + JACKSON + [
"//protocols/ovsdb/api:onos-protocols-ovsdb-api",
"//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
+ "@jaxb_api//jar",
]
osgi_jar_with_tests(