Bumped version of gRPC to 1.3.1
Change-Id: I7798476bd443a796e0e6a6e149ab8f66435ba4fa
diff --git a/apps/p4runtime-test/BUCK b/apps/p4runtime-test/BUCK
index 521f7c2..d81fd06 100644
--- a/apps/p4runtime-test/BUCK
+++ b/apps/p4runtime-test/BUCK
@@ -1,4 +1,4 @@
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
PROTOBUF_VER = '3.2.0'
COMPILE_DEPS = [
diff --git a/bucklets/grpc.bucklet b/bucklets/grpc.bucklet
index 34b31f2..53ab5ef 100644
--- a/bucklets/grpc.bucklet
+++ b/bucklets/grpc.bucklet
@@ -3,7 +3,7 @@
DEFAULT_PROTOC_VERSION = '3.2.0'
-DEFAULT_GRPC_PLUGIN_VERSION = '1.3.0'
+DEFAULT_GRPC_PLUGIN_VERSION = '1.3.1'
PROTOC_RELEASE_BASE_URL = "https://github.com/google/protobuf/releases/download"
GRPC_PLUGIN_BASE_URL = "https://repo1.maven.org/maven2/io/grpc/protoc-gen-grpc-java"
@@ -16,8 +16,8 @@
}
GRPC_JAVA_SHA1S = {
- "protoc-gen-grpc-java-1.3.0-linux-x86_64.exe":"44a0fa3e6074852ea84f93d258233b3f4f6d9e53",
- "protoc-gen-grpc-java-1.3.0-osx-x86_64.exe":"61a1b81b9f0af7d0900c314a4201972b52fb5f12"
+ "protoc-gen-grpc-java-1.3.1-linux-x86_64.exe":"9598b00ad0f41a6bd6aeb01f647903dbc62792cc",
+ "protoc-gen-grpc-java-1.3.1-osx-x86_64.exe":"f4eccb96524b8b9f152024890550d9b88398b8cd"
}
#Returns the string for the OS and architecture of the system of the form 'OS-ARCH'
diff --git a/drivers/barefoot/BUCK b/drivers/barefoot/BUCK
index 6dfe7ba..8bcefde 100644
--- a/drivers/barefoot/BUCK
+++ b/drivers/barefoot/BUCK
@@ -1,4 +1,4 @@
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
diff --git a/drivers/bmv2/BUCK b/drivers/bmv2/BUCK
index d79c85f..63feb68 100644
--- a/drivers/bmv2/BUCK
+++ b/drivers/bmv2/BUCK
@@ -1,4 +1,4 @@
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
diff --git a/drivers/bmv2/pom.xml b/drivers/bmv2/pom.xml
index b68f094..d9a9cf4 100644
--- a/drivers/bmv2/pom.xml
+++ b/drivers/bmv2/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
diff --git a/drivers/p4runtime/BUCK b/drivers/p4runtime/BUCK
index 09c9bf7..0c9f23d 100644
--- a/drivers/p4runtime/BUCK
+++ b/drivers/p4runtime/BUCK
@@ -1,4 +1,4 @@
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
diff --git a/drivers/p4runtime/pom.xml b/drivers/p4runtime/pom.xml
index 108f9ee..ff48f14 100644
--- a/drivers/p4runtime/pom.xml
+++ b/drivers/p4runtime/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
</dependency>
<!-- protocols/p4runtime/api missing -->
diff --git a/incubator/grpc-dependencies/BUCK b/incubator/grpc-dependencies/BUCK
index 7179dc9..e36dc17 100644
--- a/incubator/grpc-dependencies/BUCK
+++ b/incubator/grpc-dependencies/BUCK
@@ -1,34 +1,34 @@
include_defs('//bucklets/grpc.bucklet')
-fetch_grpc_plugin(version = '1.3.0')
+fetch_grpc_plugin(version = '1.3.1')
-# Repackaging of gRPC 1.3.0 to solve the OSGI split package issue.
+# Repackaging of gRPC 1.3.* to solve the OSGI split package issue.
# If bumping the gRPC version, please write a new rule.
-def grpc_core_repkg_130():
+def grpc_core_repkg_131():
repkg_deps = [
'//lib:COMPILE',
'//lib:google-instrumentation-0.3.0',
"//lib:google-errorprone-2.0.19"
]
remote_file(
- name = "grpc-src-zip-130",
- url = "https://github.com/grpc/grpc-java/archive/v1.3.0.zip",
- sha1 = "aae4368c7e4c4666236238e31be3a529e153cc02",
+ name = "grpc-src-zip-131",
+ url = "https://github.com/grpc/grpc-java/archive/v1.3.1.zip",
+ sha1 = "03dc21440fdfa920aa0e905da17df35b0d6c9a44",
)
srcs = []
for pkg in ['core', 'context']:
name = 'grpc-' + pkg + '-130'
genrule(
name = name,
- bash = 'jar xf $(location :grpc-src-zip-130) grpc-java-1.3.0/' + pkg + '/src/main/java '
- + '&& cd grpc-java-1.3.0/' + pkg + '/src/main/java '
+ bash = 'jar xf $(location :grpc-src-zip-131) grpc-java-1.3.1/' + pkg + '/src/main/java '
+ + '&& cd grpc-java-1.3.1/' + pkg + '/src/main/java '
+ '&& jar -cf $OUT *',
out = pkg + '.src.zip',
)
srcs.append(':' + name)
osgi_jar(
- name = 'grpc-core-repkg-1.3.0',
+ name = 'grpc-core-repkg-1.3.1',
srcs = srcs,
deps = repkg_deps,
package_name_root = 'io.grpc',
@@ -38,4 +38,4 @@
do_checkstyle = False,
)
-grpc_core_repkg_130()
\ No newline at end of file
+grpc_core_repkg_131()
diff --git a/incubator/protobuf/api/BUCK b/incubator/protobuf/api/BUCK
index 9ae1ccf..13a04d4 100644
--- a/incubator/protobuf/api/BUCK
+++ b/incubator/protobuf/api/BUCK
@@ -1,6 +1,6 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0'
+ '//incubator/grpc-dependencies:grpc-core-repkg-1.3.1'
]
TEST_DEPS = [
diff --git a/incubator/protobuf/models/BUCK b/incubator/protobuf/models/BUCK
index 81a9b25..2fc2d4b 100644
--- a/incubator/protobuf/models/BUCK
+++ b/incubator/protobuf/models/BUCK
@@ -1,17 +1,18 @@
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
':onos-incubator-protobuf-models-proto',
'//lib:protobuf-java-3.2.0',
'//lib:GRPC_1.3',
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0'
+ '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER
]
GRPC_DEPS = [
'//lib:GRPC_1.3',
'//lib:protobuf-java-3.2.0',
'//lib:guava',
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0'
+ '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER
]
BUNDLES = [
diff --git a/incubator/protobuf/registry/BUCK b/incubator/protobuf/registry/BUCK
index e6a339d..2b49f88 100644
--- a/incubator/protobuf/registry/BUCK
+++ b/incubator/protobuf/registry/BUCK
@@ -1,8 +1,10 @@
+GRPC_VER = '1.3.1'
+
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:NETTY',
'//lib:GRPC_1.3',
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
+ '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
'//incubator/protobuf/api:onos-grpc-api'
]
@@ -13,7 +15,7 @@
onos_app (
title = 'Grpc Service Registry',
app_name = "org.onosproject.grpc.registry",
- included_bundles = ['//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
+ included_bundles = ['//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
'//lib:google-instrumentation-0.3.0'],
category = 'TODO',
url = 'http://onosproject.org',
diff --git a/incubator/protobuf/services/nb/BUCK b/incubator/protobuf/services/nb/BUCK
index f2528a4..49787ec 100644
--- a/incubator/protobuf/services/nb/BUCK
+++ b/incubator/protobuf/services/nb/BUCK
@@ -1,3 +1,4 @@
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
@@ -6,14 +7,14 @@
'//incubator/protobuf/models:onos-incubator-protobuf-models',
'//lib:protobuf-java-3.2.0',
'//lib:GRPC_1.3',
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
- '//lib:grpc-protobuf-lite-1.3.0',
+ '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
+ '//lib:grpc-protobuf-lite-' + GRPC_VER,
'//incubator/protobuf/api:onos-grpc-api'
]
GRPC_DEPS = [
'//lib:GRPC_1.3',
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
+ '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
'//incubator/protobuf/models:onos-incubator-protobuf-models-proto',
'//lib:protobuf-java-3.2.0',
'//lib:guava',
@@ -26,13 +27,13 @@
':onos-incubator-protobuf-services-nb-proto',
'//lib:protobuf-java-3.2.0',
'//lib:guava',
- '//lib:grpc-core-1.3.0',
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
- '//lib:grpc-protobuf-1.3.0',
- '//lib:grpc-stub-1.3.0',
- '//lib:grpc-netty-1.3.0',
- '//lib:grpc-auth-1.3.0',
- '//lib:grpc-context-1.3.0',
+ '//lib:grpc-core-' + GRPC_VER,
+ '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
+ '//lib:grpc-protobuf-' + GRPC_VER,
+ '//lib:grpc-stub-' + GRPC_VER,
+ '//lib:grpc-netty-' + GRPC_VER,
+ '//lib:grpc-auth-' + GRPC_VER,
+ '//lib:grpc-context-' + GRPC_VER,
'//lib:google-truth-0.28',
'//core/api:onos-api',
'//lib:netty-transport',
@@ -65,7 +66,7 @@
app_name = "org.onosproject.grpc.nb.service",
category = 'TODO',
url = 'http://onosproject.org',
- included_bundles = ['//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
+ included_bundles = ['//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
'//lib:google-instrumentation-0.3.0'],
description = 'gRPC northbound services used to provide fine-grained access to ONOS native northbound interface from off-platform applications',
)
diff --git a/lib/BUCK b/lib/BUCK
index 51bb3f0..52e68db 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -1,4 +1,4 @@
-# ***** This file was auto-generated at Tue, 12 Dec 2017 22:03:12 GMT. Do not edit this file manually. *****
+# ***** This file was auto-generated at Tue, 12 Dec 2017 22:46:22 GMT. Do not edit this file manually. *****
# ***** Use onos-lib-gen *****
pass_thru_pom(
@@ -112,11 +112,11 @@
name = 'GRPC_1.3',
visibility = ['PUBLIC'],
exported_deps = [
- ':grpc-protobuf-1.3.0',
- ':grpc-stub-1.3.0',
- ':grpc-netty-1.3.0',
- ':grpc-auth-1.3.0',
- ':grpc-context-1.3.0',
+ ':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',
],
)
@@ -125,8 +125,8 @@
name = 'GRPC_TEST_1.3',
visibility = ['PUBLIC'],
exported_deps = [
- ':grpc-testing-1.3.0',
- ':grpc-testing-proto-1.3.0',
+ ':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',
@@ -1338,56 +1338,56 @@
)
remote_jar (
- name = 'grpc-core-1.3.0',
- out = 'grpc-core-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-core:jar:1.3.0',
- sha1 = 'c44f8c1d9561f5ad0212cb4ee5e035bc03d47700',
- maven_coords = 'io.grpc:grpc-core:jar:NON-OSGI:1.3.0',
+ name = 'grpc-core-1.3.1',
+ out = 'grpc-core-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-core:jar:1.3.1',
+ sha1 = 'a9b38b4a19af3ef208f4f6bf7871876d959c5eb1',
+ maven_coords = 'io.grpc:grpc-core:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
- name = 'grpc-protobuf-1.3.0',
- out = 'grpc-protobuf-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-protobuf:jar:1.3.0',
- sha1 = 'ab950b38b67a3b22c8d709970bef053304b13b31',
- maven_coords = 'io.grpc:grpc-protobuf:jar:NON-OSGI:1.3.0',
+ name = 'grpc-protobuf-1.3.1',
+ out = 'grpc-protobuf-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-protobuf:jar:1.3.1',
+ sha1 = '9562e977cacd6e128a31686c3e6948d61873c496',
+ maven_coords = 'io.grpc:grpc-protobuf:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
- name = 'grpc-protobuf-lite-1.3.0',
- out = 'grpc-protobuf-lite-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-protobuf-lite:jar:1.3.0',
- sha1 = '0aea7ea9cd12ad1938231769738016622461b1ed',
- maven_coords = 'io.grpc:grpc-protobuf-lite:jar:NON-OSGI:1.3.0',
+ name = 'grpc-protobuf-lite-1.3.1',
+ out = 'grpc-protobuf-lite-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-protobuf-lite:jar:1.3.1',
+ sha1 = '98d1d3d100fdcf92c4331999a504a1a72a5f6e52',
+ maven_coords = 'io.grpc:grpc-protobuf-lite:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
- name = 'grpc-stub-1.3.0',
- out = 'grpc-stub-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-stub:jar:1.3.0',
- sha1 = 'ec6514126b1e4b460491b29df11a365880359d8c',
- maven_coords = 'io.grpc:grpc-stub:jar:NON-OSGI:1.3.0',
+ name = 'grpc-stub-1.3.1',
+ out = 'grpc-stub-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-stub:jar:1.3.1',
+ sha1 = '60bdfa9d8c664a9d87ae461106eff6eed8da6c54',
+ maven_coords = 'io.grpc:grpc-stub:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
- name = 'grpc-netty-1.3.0',
- out = 'grpc-netty-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-netty:jar:1.3.0',
- sha1 = 'a81c3f104c51302fbb972fdc1957dc5b3091d89a',
- maven_coords = 'io.grpc:grpc-netty:jar:NON-OSGI:1.3.0',
+ name = 'grpc-netty-1.3.1',
+ out = 'grpc-netty-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-netty:jar:1.3.1',
+ sha1 = 'cc3831fccb76cfe21445f75cc055b5ffd979dc54',
+ maven_coords = 'io.grpc:grpc-netty:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
- name = 'grpc-auth-1.3.0',
- out = 'grpc-auth-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-auth:jar:1.3.0',
- sha1 = '11e3062f80979d1c6b3e7b4225c10c5d854ffd90',
- maven_coords = 'io.grpc:grpc-auth:jar:NON-OSGI:1.3.0',
+ name = 'grpc-auth-1.3.1',
+ out = 'grpc-auth-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-auth:jar:1.3.1',
+ sha1 = '57a0e0b9e474842801521fae76f955dd28ad3ae0',
+ maven_coords = 'io.grpc:grpc-auth:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
@@ -1410,29 +1410,29 @@
)
remote_jar (
- name = 'grpc-testing-1.3.0',
- out = 'grpc-testing-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-testing:jar:1.3.0',
- sha1 = '2828c4bbab639470b9a017f521426490ba919803',
- maven_coords = 'io.grpc:grpc-testing:jar:NON-OSGI:1.3.0',
+ name = 'grpc-testing-1.3.1',
+ out = 'grpc-testing-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-testing:jar:1.3.1',
+ sha1 = 'fd6c4081cd3415684a0b655327e210aa10153eec',
+ maven_coords = 'io.grpc:grpc-testing:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
- name = 'grpc-testing-proto-1.3.0',
- out = 'grpc-testing-proto-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-testing-proto:jar:1.3.0',
- sha1 = '6e707eb79bb892abd22dae80d5799156e614393d',
- maven_coords = 'io.grpc:grpc-testing-proto:jar:NON-OSGI:1.3.0',
+ name = 'grpc-testing-proto-1.3.1',
+ out = 'grpc-testing-proto-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-testing-proto:jar:1.3.1',
+ sha1 = '170f0406457b44695562ccd5ec8d0da9cb762643',
+ maven_coords = 'io.grpc:grpc-testing-proto:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
remote_jar (
- name = 'grpc-context-1.3.0',
- out = 'grpc-context-1.3.0.jar',
- url = 'mvn:io.grpc:grpc-context:jar:1.3.0',
- sha1 = '2a924ad1897dd1b768e1859943e2d0408789150a',
- maven_coords = 'io.grpc:grpc-context:jar:NON-OSGI:1.3.0',
+ name = 'grpc-context-1.3.1',
+ out = 'grpc-context-1.3.1.jar',
+ url = 'mvn:io.grpc:grpc-context:jar:1.3.1',
+ sha1 = '28accd419b18d59055b8999f78f5cb7767c7bde8',
+ maven_coords = 'io.grpc:grpc-context:jar:NON-OSGI:1.3.1',
visibility = [ 'PUBLIC' ],
)
diff --git a/lib/deps.json b/lib/deps.json
index efb7ffd..a1bb91b 100644
--- a/lib/deps.json
+++ b/lib/deps.json
@@ -71,17 +71,16 @@
"netty-common"
],
"GRPC_1.3": [
-// "grpc-core-1.3.0",
- "grpc-protobuf-1.3.0",
- "grpc-stub-1.3.0",
- "grpc-netty-1.3.0",
- "grpc-auth-1.3.0",
- "grpc-context-1.3.0",
+ "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.0",
- "grpc-testing-proto-1.3.0",
+ "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",
@@ -248,17 +247,17 @@
"org.apache.servicemix.bundles.dom4j":"mvn:org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j:1.6.1_5",
"plexus-utils": "mvn:org.codehaus.plexus:plexus-utils:3.0.24",
"sshd-core": "mvn:org.apache.sshd:sshd-core:1.4.0",
- "grpc-core-1.3.0": "mvn:io.grpc:grpc-core:1.3.0",
- "grpc-protobuf-1.3.0": "mvn:io.grpc:grpc-protobuf:1.3.0",
- "grpc-protobuf-lite-1.3.0": "mvn:io.grpc:grpc-protobuf-lite:1.3.0",
- "grpc-stub-1.3.0": "mvn:io.grpc:grpc-stub:1.3.0",
- "grpc-netty-1.3.0": "mvn:io.grpc:grpc-netty:1.3.0",
- "grpc-auth-1.3.0": "mvn:io.grpc:grpc-auth:1.3.0",
+ "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.0": "mvn:io.grpc:grpc-testing:1.3.0",
- "grpc-testing-proto-1.3.0": "mvn:io.grpc:grpc-testing-proto:1.3.0",
- "grpc-context-1.3.0": "mvn:io.grpc:grpc-context:1.3.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",
diff --git a/lib/pom.xml b/lib/pom.xml
index d53b2c7..7b8f528 100644
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -54,7 +54,7 @@
to fix locale errors for non-US developers. However, it breaks
SonarQube's test coverage, so moving here for now. -->
<argLine>-Duser.language=en -Duser.region=US</argLine>
- <grpccore.version>1.3.0</grpccore.version>
+ <grpccore.version>1.3.1</grpccore.version>
</properties>
<dependencyManagement>
diff --git a/protocols/grpc/BUCK b/protocols/grpc/BUCK
index 7c91c47..7aa98fc 100644
--- a/protocols/grpc/BUCK
+++ b/protocols/grpc/BUCK
@@ -1,17 +1,17 @@
PROTOBUF_VER = '3.2.0'
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
BUNDLES = [
'//protocols/grpc/proto:onos-protocols-grpc-proto',
'//protocols/grpc/api:onos-protocols-grpc-api',
'//protocols/grpc/ctl:onos-protocols-grpc-ctl',
# gRPC dependencies
- '//incubator/grpc-dependencies:grpc-core-repkg-1.3.0',
- '//lib:grpc-protobuf-1.3.0',
- '//lib:grpc-protobuf-lite-1.3.0',
- '//lib:grpc-stub-1.3.0',
- '//lib:grpc-netty-1.3.0',
- '//lib:grpc-auth-1.3.0',
+ '//incubator/grpc-dependencies:grpc-core-repkg-' + GRPC_VER,
+ '//lib:grpc-protobuf-' + GRPC_VER,
+ '//lib:grpc-protobuf-lite-' + GRPC_VER,
+ '//lib:grpc-stub-' + GRPC_VER,
+ '//lib:grpc-netty-' + GRPC_VER,
+ '//lib:grpc-auth-' + GRPC_VER,
'//lib:google-instrumentation-0.3.0',
'//lib:protobuf-java-3.2.0',
# Lazily adding all netty-related packages.
diff --git a/protocols/grpc/api/BUCK b/protocols/grpc/api/BUCK
index f0c8fd3..e0dad74 100644
--- a/protocols/grpc/api/BUCK
+++ b/protocols/grpc/api/BUCK
@@ -1,4 +1,4 @@
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
diff --git a/protocols/grpc/api/pom.xml b/protocols/grpc/api/pom.xml
index 49e42c6..af2a8c5 100644
--- a/protocols/grpc/api/pom.xml
+++ b/protocols/grpc/api/pom.xml
@@ -46,8 +46,8 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/protocols/grpc/ctl/BUCK b/protocols/grpc/ctl/BUCK
index e0c2b6d..36681b5 100644
--- a/protocols/grpc/ctl/BUCK
+++ b/protocols/grpc/ctl/BUCK
@@ -1,5 +1,5 @@
PROTOBUF_VER = '3.2.0'
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
diff --git a/protocols/grpc/proto/BUCK b/protocols/grpc/proto/BUCK
index 8d32ab1..8f1b562 100644
--- a/protocols/grpc/proto/BUCK
+++ b/protocols/grpc/proto/BUCK
@@ -3,7 +3,7 @@
)
PROTOBUF_VER = '3.2.0'
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
diff --git a/protocols/p4runtime/api/BUCK b/protocols/p4runtime/api/BUCK
index cefdf3a..8b740b84 100644
--- a/protocols/p4runtime/api/BUCK
+++ b/protocols/p4runtime/api/BUCK
@@ -1,4 +1,4 @@
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
COMPILE_DEPS = [
'//lib:CORE_DEPS',
diff --git a/protocols/p4runtime/ctl/BUCK b/protocols/p4runtime/ctl/BUCK
index 87366f5..90a0266 100644
--- a/protocols/p4runtime/ctl/BUCK
+++ b/protocols/p4runtime/ctl/BUCK
@@ -1,4 +1,4 @@
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
PROTOBUF_VER = '3.2.0'
COMPILE_DEPS = [
diff --git a/protocols/p4runtime/model/pom.xml b/protocols/p4runtime/model/pom.xml
index 5756406..696772e 100644
--- a/protocols/p4runtime/model/pom.xml
+++ b/protocols/p4runtime/model/pom.xml
@@ -38,7 +38,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
diff --git a/protocols/p4runtime/pom.xml b/protocols/p4runtime/pom.xml
index 1f19b72..ab43ca0 100644
--- a/protocols/p4runtime/pom.xml
+++ b/protocols/p4runtime/pom.xml
@@ -42,7 +42,7 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
- <version>1.3.0</version>
+ <version>1.3.1</version>
</dependency>
diff --git a/protocols/p4runtime/proto/BUCK b/protocols/p4runtime/proto/BUCK
index 95fe691..53db8a5 100644
--- a/protocols/p4runtime/proto/BUCK
+++ b/protocols/p4runtime/proto/BUCK
@@ -3,7 +3,7 @@
)
PROTOBUF_VER = '3.2.0'
-GRPC_VER = '1.3.0'
+GRPC_VER = '1.3.1'
PI_COMMIT = '13d611a9c655938676ebcde2bd5653b461f46ca7'
PI_BASEURL = 'https://github.com/p4lang/PI.git'
diff --git a/protocols/p4runtime/proto/pom.xml b/protocols/p4runtime/proto/pom.xml
index f07728e..774ebb5 100644
--- a/protocols/p4runtime/proto/pom.xml
+++ b/protocols/p4runtime/proto/pom.xml
@@ -179,7 +179,7 @@
<!--<plugin>-->
<!--<groupId>com.googlecode.maven-download-plugin</groupId>-->
<!--<artifactId>download-maven-plugin</artifactId>-->
- <!--<version>1.3.0</version>-->
+ <!--<version>1.3.1</version>-->
<!--<executions>-->
<!--<execution>-->
<!--<id>install-any</id>-->
diff --git a/tools/dev/bin/onos-setup-p4-dev b/tools/dev/bin/onos-setup-p4-dev
index 5450651..e844718 100755
--- a/tools/dev/bin/onos-setup-p4-dev
+++ b/tools/dev/bin/onos-setup-p4-dev
@@ -19,7 +19,7 @@
PI_COMMIT="13d611a9c655938676ebcde2bd5653b461f46ca7"
P4C_COMMIT="040b931fbfcb7912e3a14cd05df950fbdd49b038"
PROTOBUF_COMMIT="tags/v3.2.0"
-GRPC_COMMIT="tags/v1.3.0"
+GRPC_COMMIT="tags/v1.3.2"
NUM_CORES=`grep -c ^processor /proc/cpuinfo`