Update gRPC
- Update gRPC and it's dependencies to 0.13.2
- Use pre-defined default port if not specified by URI
- Cosmetic fixes
Change-Id: Iac8c3ba4c6fe1b5925ea8832e61d313adfad6f71
diff --git a/incubator/rpc-grpc/pom.xml b/incubator/rpc-grpc/pom.xml
index dd320bc..c9191e0 100644
--- a/incubator/rpc-grpc/pom.xml
+++ b/incubator/rpc-grpc/pom.xml
@@ -32,18 +32,10 @@
<onos.app.name>org.onosproject.incubator.rpc.grpc</onos.app.name>
<onos.app.requires>org.onosproject.incubator.rpc</onos.app.requires>
<!-- Note: update feature.xml when updating -->
- <grpc.version>0.9.0</grpc.version>
- <grpc.netty.version>4.1.0.Beta6</grpc.netty.version>
+ <grpc.version>0.13.2</grpc.version>
+ <grpc.netty.version>4.1.0.CR3</grpc.netty.version>
</properties>
- <pluginRepositories>
- <pluginRepository>
- <id>protoc-plugin</id>
- <url>https://dl.bintray.com/sergei-ivanov/maven/</url>
- </pluginRepository>
- </pluginRepositories>
-
-
<dependencies>
<dependency>
<groupId>org.onosproject</groupId>
@@ -117,10 +109,21 @@
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
- <version>1.4.0.Final</version>
+ <version>1.4.1.Final</version>
</extension>
</extensions>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<!-- TODO This is included to suppress the generation of javadocs for
this package. There is a problem when we try to package the
@@ -196,16 +199,17 @@
</plugin>
<plugin>
- <groupId>com.google.protobuf.tools</groupId>
- <artifactId>maven-protoc-plugin</artifactId>
- <version>0.4.2</version>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <version>0.5.0</version>
<configuration>
<!-- The version of protoc must match protobuf-java. If you don't
depend on protobuf-java directly, you will be transitively depending on the
protobuf-java version that grpc depends on. -->
- <protocArtifact>com.google.protobuf:protoc:3.0.0-beta-1:exe:${os.detected.classifier}</protocArtifact>
+ <protocArtifact>com.google.protobuf:protoc:3.0.0-beta-2:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
+ <checkStaleness>true</checkStaleness>
</configuration>
<executions>
<execution>
@@ -220,7 +224,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
- <version>1.9.1</version>
+ <version>1.10</version>
<executions>
<execution>
<id>add-source</id>