[WIP] Attempt at building grpc and p4runtime protocols with Bazel
STILL NOT WORKING AT RUNTIME
Change-Id: I1f9e60b12a12e09edad2a714ec2921a4f71c6d35
diff --git a/utils/junit/BUCK b/utils/junit/BUCK
index cf8c29a..f4e5444 100644
--- a/utils/junit/BUCK
+++ b/utils/junit/BUCK
@@ -1,12 +1,12 @@
SRC_DEPS = [
'//lib:junit',
'//lib:hamcrest-all',
- '//lib:guava',
+ '//lib:com_google_guava_guava',
'//lib:slf4j-api',
]
TEST_DEPS = [
- '//lib:guava-testlib',
+ '//lib:com_google_guava_guava_testlib',
]
osgi_jar_with_tests(
diff --git a/utils/junit/BUILD b/utils/junit/BUILD
index 2e8e690..c54e5df 100644
--- a/utils/junit/BUILD
+++ b/utils/junit/BUILD
@@ -3,14 +3,14 @@
TEST_SRC = "src/test/java/org/onlab/**/"
COMPILE_DEPS = [
- "@guava//jar",
+ "@com_google_guava_guava//jar",
"@slf4j_api//jar",
"@hamcrest_all//jar",
"@junit//jar",
]
TEST_DEPS = [
- "@guava_testlib//jar",
+ "@com_google_guava_guava_testlib//jar",
]
osgi_jar_with_tests(
diff --git a/utils/misc/BUCK b/utils/misc/BUCK
index aef407f..5df6e11 100644
--- a/utils/misc/BUCK
+++ b/utils/misc/BUCK
@@ -3,7 +3,7 @@
'//lib:NETTY',
'//lib:METRICS',
'//lib:KRYO',
- '//lib:netty',
+ '//lib:io_netty_netty',
'//lib:JACKSON',
]
diff --git a/utils/misc/BUILD b/utils/misc/BUILD
index ca4b963..98621b0 100644
--- a/utils/misc/BUILD
+++ b/utils/misc/BUILD
@@ -1,8 +1,8 @@
COMPILE_DEPS = COMPILE + JACKSON + [
"@kryo//jar",
"@metrics_core//jar",
- "@netty//jar",
- "@netty_common//jar",
+ "@io_netty_netty//jar",
+ "@io_netty_netty_common//jar",
"@objenesis//jar",
]
diff --git a/utils/osgiwrap/BUCK b/utils/osgiwrap/BUCK
index 49acb13..3a91e9b 100644
--- a/utils/osgiwrap/BUCK
+++ b/utils/osgiwrap/BUCK
@@ -4,7 +4,7 @@
CURRENT_TARGET = ':' + CURRENT_NAME
COMPILE_DEPS = [
- '//lib:guava',
+ '//lib:com_google_guava_guava',
'//lib:bndlib',
'//lib:org.apache.felix.scr.bnd'
]
diff --git a/utils/osgiwrap/BUILD b/utils/osgiwrap/BUILD
index 389cc8d..9193c04 100644
--- a/utils/osgiwrap/BUILD
+++ b/utils/osgiwrap/BUILD
@@ -1,7 +1,7 @@
OSGIWRAP_EXECUTABLE = "osgi-jar"
COMPILE_DEPS = [
- "@guava//jar",
+ "@com_google_guava_guava//jar",
"@bndlib//jar",
"@org_apache_felix_scr_bnd//jar",
]