Fix build of protobuf-related components to support Bazel 0.22
- Bumped version of protobuf to 3.6.1.3 (includes fix for Bazel 0.22)
- Removed all protobuf and grpc dependencies from deps.json. Instead,
depends solely on what's provided by the external grpc and protobuf
workspaces.
- Use OSGi-wrapped protobuf and grpc JARs built with Bazel for runtime
- Add missing netty-related bundles to onos-thirdparty-base (required
by grpc)
Note, build with Bazel 0.22 is still broken because of
osgi_java_library.bzl, unless the following build arg is used:
build --incompatible_string_is_not_iterable=false
It seems the error is caused by dead code in osgi_java_library.bzl
that should be removed.
Change-Id: I749f1de25902bf9df5242444380f7224bc99b4b5
diff --git a/lib/deps.json b/lib/deps.json
index 7f55443..c21f552 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -119,25 +119,6 @@
"atomix-utils",
"typesafe-config",
"classgraph"
- ],
-
- // FIXME: Remove this for Bazel build
- "GRPC_1.3": [
- "grpc-protobuf-1.3.1",
- "grpc-stub-1.3.1",
- "grpc-netty-1.3.1",
- "grpc-auth-1.3.1",
- "grpc-context-1.3.1",
- "google-truth-0.28"
- ],
- "GRPC_TEST_1.3": [
- "grpc-testing-1.3.1",
- "grpc-testing-proto-1.3.1",
- "google-code-findbugs-3.0.0",
- "google-errorprone-2.0.19",
- "google-instrumentation-0.3.0",
- "junit-dep",
- "objenesis"
]
},
@@ -341,33 +322,6 @@
"stax2-api": "mvn:org.codehaus.woodstox:stax2-api:4.0.0",
"concurrent-hashmap": "mvn:com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.0",
"gnu-idn": "mvn:org.gnu.inet:libidn:1.15",
- "sigar":"mvn:org.knowhowlab.osgi:sigar:1.6.5_01",
-
- // Included merely for packaging purposes into run-time.
- "runtime-grpc-core":"mvn:io.grpc:grpc-core:1.14.0",
- "runtime-grpc-context":"mvn:io.grpc:grpc-context:1.14.0",
- "runtime-grpc-stub":"mvn:io.grpc:grpc-stub:1.14.0",
- "runtime-grpc-netty":"mvn:io.grpc:grpc-netty:1.14.0",
- "runtime-grpc-auth":"mvn:io.grpc:grpc-auth:1.14.0",
- "runtime-grpc-protobuf":"mvn:io.grpc:grpc-protobuf:1.14.0",
- "runtime-grpc-protobuf-lite":"mvn:io.grpc:grpc-protobuf-lite:1.14.0",
- "runtime-protobuf":"mvn:com.google.protobuf:protobuf-java:3.6.1",
-
- // FIXME: Remove this for Bazel build...
- "grpc-core-1.3.1": "mvn:io.grpc:grpc-core:1.3.1",
- "grpc-protobuf-1.3.1": "mvn:io.grpc:grpc-protobuf:1.3.1",
- "grpc-protobuf-lite-1.3.1": "mvn:io.grpc:grpc-protobuf-lite:1.3.1",
- "grpc-stub-1.3.1": "mvn:io.grpc:grpc-stub:1.3.1",
- "grpc-netty-1.3.1": "mvn:io.grpc:grpc-netty:1.3.1",
- "grpc-auth-1.3.1": "mvn:io.grpc:grpc-auth:1.3.1",
- "protobuf-java-3.3.0": "mvn:com.google.protobuf:protobuf-java:3.3.0",
- "protobuf-java-3.2.0": "mvn:com.google.protobuf:protobuf-java:3.2.0",
- "grpc-testing-1.3.1": "mvn:io.grpc:grpc-testing:1.3.1",
- "grpc-testing-proto-1.3.1": "mvn:io.grpc:grpc-testing-proto:1.3.1",
- "grpc-context-1.3.1": "mvn:io.grpc:grpc-context:1.3.1",
- "google-truth-0.28": "mvn:com.google.truth:truth:0.28",
- "google-code-findbugs-3.0.0": "mvn:com.google.code.findbugs:jsr305:3.0.0",
- "google-errorprone-2.0.19": "mvn:com.google.errorprone:error_prone_annotations:2.0.19",
- "google-instrumentation-0.3.0": "mvn:com.google.instrumentation:instrumentation-api:0.3.0"
+ "sigar":"mvn:org.knowhowlab.osgi:sigar:1.6.5_01"
}
}