Skip to content

Commit 4ca18db

Browse files
committed
build: declare grpc-netty-shaded a compile-time dependency
Remove grpc-netty to avoid version conflicts
1 parent d6c4f20 commit 4ca18db

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
<grpc-netty-shaded.version>1.68.2</grpc-netty-shaded.version>
7373
<grpc-protobuf.version>1.70.0</grpc-protobuf.version>
7474
<grpc-stub.version>1.68.2</grpc-stub.version>
75-
<grpc-netty.version>1.73.0</grpc-netty.version>
7675
<annotations-api.version>6.0.53</annotations-api.version>
7776
</properties>
7877

@@ -91,18 +90,12 @@
9190
<groupId>io.grpc</groupId>
9291
<artifactId>grpc-netty-shaded</artifactId>
9392
<version>${grpc-netty-shaded.version}</version>
94-
<scope>runtime</scope>
9593
</dependency>
9694
<dependency>
9795
<groupId>io.grpc</groupId>
9896
<artifactId>grpc-protobuf</artifactId>
9997
<version>${grpc-protobuf.version}</version>
10098
</dependency>
101-
<dependency>
102-
<groupId>io.grpc</groupId>
103-
<artifactId>grpc-netty</artifactId>
104-
<version>${grpc-netty.version}</version>
105-
</dependency>
10699
<dependency>
107100
<groupId>io.grpc</groupId>
108101
<artifactId>grpc-stub</artifactId>

src/main/java/io/weaviate/client6/v1/internal/grpc/DefaultGrpcTransport.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
import com.google.common.util.concurrent.ListenableFuture;
1111

1212
import io.grpc.ManagedChannel;
13-
import io.grpc.netty.GrpcSslContexts;
14-
import io.grpc.netty.NettyChannelBuilder;
13+
import io.grpc.netty.shaded.io.grpc.netty.GrpcSslContexts;
14+
import io.grpc.netty.shaded.io.grpc.netty.NettyChannelBuilder;
15+
import io.grpc.netty.shaded.io.netty.handler.ssl.SslContext;
1516
import io.grpc.stub.MetadataUtils;
16-
import io.netty.handler.ssl.SslContext;
1717
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateGrpc;
1818
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateGrpc.WeaviateBlockingStub;
1919
import io.weaviate.client6.v1.internal.grpc.protocol.WeaviateGrpc.WeaviateFutureStub;

0 commit comments

Comments
 (0)