Skip to content

Commit

Permalink
Revert "[build] Add protobuf compiler plugin and required dependencie…
Browse files Browse the repository at this point in the history
…s for generating gRPC Java stubs (linkedin#462)"

This reverts commit 16cc06a.
  • Loading branch information
nisargthakkar committed Jun 8, 2023
1 parent cd1aa66 commit 1f8d0bb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 30 deletions.
31 changes: 1 addition & 30 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ plugins {
id 'com.form.diff-coverage' version '0.9.5' apply false
id 'me.champeau.jmh' version '0.6.7' apply false
id 'io.github.lhotari.gradle-nar-plugin' version '0.5.1' apply false
id 'com.google.protobuf' version '0.9.3'
}

apply from: "$rootDir/gradle/helper/git.gradle"
Expand All @@ -40,15 +39,12 @@ if (project.hasProperty('overrideBuildEnvironment')) {

def avroVersion = '1.9.2'
def avroUtilVersion = '0.2.150'
def grpcVersion = '1.54.1'
def kafkaGroup = 'com.linkedin.kafka'
def kafkaVersion = '2.4.1.65'
def log4j2Version = '2.17.1'
def pegasusVersion = '29.31.0'
def protobufVersion = '3.21.7'
def jacksonVersion = '2.13.3'


ext.libraries = [
avro: 'org.apache.avro:avro:' + avroVersion,
avroCompiler: 'org.apache.avro:avro-compiler:' + avroVersion,
Expand Down Expand Up @@ -118,11 +114,7 @@ ext.libraries = [
xerces: 'xerces:xercesImpl:2.9.1',
zkclient: 'com.101tec:zkclient:0.7', // For Kafka AdminUtils
zookeeper: 'org.apache.zookeeper:zookeeper:3.5.9',
zstd: 'com.github.luben:zstd-jni:1.5.2-3',
grpcNettyShaded: 'io.grpc:grpc-netty-shaded:' + grpcVersion,
grpcProtobuf: 'io.grpc:grpc-protobuf:' + grpcVersion,
grpcStub: 'io.grpc:grpc-stub:' + grpcVersion,
tomcatAnnotations: 'org.apache.tomcat:annotations-api:6.0.53',
zstd: 'com.github.luben:zstd-jni:1.5.2-3'
]

group = 'com.linkedin.venice'
Expand Down Expand Up @@ -159,7 +151,6 @@ subprojects {
plugin 'java-library'
plugin 'com.github.spotbugs'
plugin 'org.gradle.test-retry'
plugin 'com.google.protobuf'
}

if (isLeafSubModule) {
Expand All @@ -181,22 +172,6 @@ subprojects {
//withJavadocJar()
}

protobuf {
protoc {
artifact = 'com.google.protobuf:protoc:' + protobufVersion
}
plugins {
grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:' + grpcVersion
}
}
generateProtoTasks {
all()*.plugins {
grpc {}
}
}
}

configurations {
implementation {
// These are global exclusions that will apply to the entire project
Expand Down Expand Up @@ -251,10 +226,6 @@ subprojects {
avroCompiler libraries.avroCompiler
avroCompiler libraries.avroUtilBuilder
avroCompiler 'org.slf4j:slf4j-simple:1.7.32'
runtimeOnly libraries.grpcNettyShaded
implementation libraries.grpcProtobuf
implementation libraries.grpcStub
compileOnly libraries.tomcatAnnotations
}

idea {
Expand Down
1 change: 1 addition & 0 deletions services/venice-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,4 @@ jar {
ext {
jacocoCoverageThreshold = 0.23
}

0 comments on commit 1f8d0bb

Please sign in to comment.