Skip to content

Commit

Permalink
Merge branch 'connector-2024.2.x'
Browse files Browse the repository at this point in the history
# Conflicts:
#	pom.xml
  • Loading branch information
smcvb committed Jan 15, 2025
2 parents 33ed60f + b7f5f80 commit cdccea3
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,10 @@
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
<artifactId>reactive-streams-tck</artifactId>
Expand Down Expand Up @@ -339,9 +343,11 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}
</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}</pluginArtifact>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:${grpc.version}:exe:${os.detected.classifier}
</pluginArtifact>
<protoSourceRoot>${project.build.directory}/proto</protoSourceRoot>
</configuration>
<executions>
Expand Down

0 comments on commit cdccea3

Please sign in to comment.