aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorEric Anderson <ejona@google.com>2018-08-02 16:00:12 -0700
committerEric Anderson <ejona@google.com>2018-08-02 16:58:59 -0700
commitb64cde1488a69559386a56a4a809d2e6046c4c18 (patch)
tree327228f11fc57a1e25d3e802d79913ef7be585e3 /core
parent478f006d3eaa0e1832aef4b85ff8e96a4bc12841 (diff)
downloadgrpc-grpc-java-b64cde1488a69559386a56a4a809d2e6046c4c18.tar.gz
Encourage using grpc-netty-shaded instead of grpc-netty
grpc-netty is still really useful, but for most users who aren't doing anything advanced using grpc-netty-shaded is much safer from a dependency basis. grpc-netty-shaded has seen more usage and has shown itself to be stable and reduce the number of conflicts due to Netty versions.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/io/grpc/ManagedChannelProvider.java3
-rw-r--r--core/src/main/java/io/grpc/ServerProvider.java2
2 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/java/io/grpc/ManagedChannelProvider.java b/core/src/main/java/io/grpc/ManagedChannelProvider.java
index 16fa99b29..3455440f2 100644
--- a/core/src/main/java/io/grpc/ManagedChannelProvider.java
+++ b/core/src/main/java/io/grpc/ManagedChannelProvider.java
@@ -58,7 +58,8 @@ public abstract class ManagedChannelProvider {
public static ManagedChannelProvider provider() {
if (provider == null) {
throw new ProviderNotFoundException("No functional channel service provider found. "
- + "Try adding a dependency on the grpc-okhttp or grpc-netty artifact");
+ + "Try adding a dependency on the grpc-okhttp, grpc-netty, or grpc-netty-shaded "
+ + "artifact");
}
return provider;
}
diff --git a/core/src/main/java/io/grpc/ServerProvider.java b/core/src/main/java/io/grpc/ServerProvider.java
index 68d25cff4..301d05b77 100644
--- a/core/src/main/java/io/grpc/ServerProvider.java
+++ b/core/src/main/java/io/grpc/ServerProvider.java
@@ -53,7 +53,7 @@ public abstract class ServerProvider {
public static ServerProvider provider() {
if (provider == null) {
throw new ProviderNotFoundException("No functional server found. "
- + "Try adding a dependency on the grpc-netty artifact");
+ + "Try adding a dependency on the grpc-netty or grpc-netty-shaded artifact");
}
return provider;
}