This is an automated email from the ASF dual-hosted git repository.
yangjie01 pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/branch-3.5 by this push:
new 9336a155e0a [SPARK-44796][BUILD][CONNECT] Remove `grpc-java` plugin
related configuration from the `connect/connect-client-jvm` module
9336a155e0a is described below
commit 9336a155e0a7321be50580d5fb5351c291209166
Author: yangjie01 <yangji...@baidu.com>
AuthorDate: Tue Aug 15 11:42:25 2023 +0800
[SPARK-44796][BUILD][CONNECT] Remove `grpc-java` plugin related
configuration from the `connect/connect-client-jvm` module
### What changes were proposed in this pull request?
This pr remove `grpc-java` plugin related configuration from the
`connect/connect-client-jvm module` for SBT because the code generation related
to `grpc-java` is handled by the `connect-common` module. The reason this pr
did not touch the Maven `pom.xml` is because the corresponding Maven modules
originally did not have that configuration.
### Why are the changes needed?
Clean up unnecessary sbt configurations.
### Does this PR introduce _any_ user-facing change?
No
### How was this patch tested?
- Pass GitHub Actions
Closes #42477 from LuciferYang/SPARK-44796.
Authored-by: yangjie01 <yangji...@baidu.com>
Signed-off-by: yangjie01 <yangji...@baidu.com>
(cherry picked from commit dc5fdb4aa1cd8ae727fc6d9dce434cbd1f0ddafc)
Signed-off-by: yangjie01 <yangji...@baidu.com>
---
project/SparkBuild.scala | 19 ++-----------------
1 file changed, 2 insertions(+), 17 deletions(-)
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index bd65d3c4bd4..331ebe0c05a 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -774,7 +774,6 @@ object SparkConnect {
SbtPomKeys.effectivePom.value.getProperties.get(
"guava.failureaccess.version").asInstanceOf[String]
Seq(
- "io.grpc" % "protoc-gen-grpc-java" % BuildCommons.gprcVersion
asProtocPlugin(),
"com.google.guava" % "guava" % guavaVersion,
"com.google.guava" % "failureaccess" % guavaFailureaccessVersion,
"com.google.protobuf" % "protobuf-java" % protoVersion % "protobuf"
@@ -840,14 +839,7 @@ object SparkConnect {
case m if m.toLowerCase(Locale.ROOT).endsWith(".proto") =>
MergeStrategy.discard
case _ => MergeStrategy.first
}
- ) ++ {
- Seq(
- (Compile / PB.targets) := Seq(
- PB.gens.java -> (Compile / sourceManaged).value,
- PB.gens.plugin("grpc-java") -> (Compile / sourceManaged).value
- )
- )
- }
+ )
}
object SparkConnectClient {
@@ -924,14 +916,7 @@ object SparkConnectClient {
case m if m.toLowerCase(Locale.ROOT).endsWith(".proto") =>
MergeStrategy.discard
case _ => MergeStrategy.first
}
- ) ++ {
- Seq(
- (Compile / PB.targets) := Seq(
- PB.gens.java -> (Compile / sourceManaged).value,
- PB.gens.plugin("grpc-java") -> (Compile / sourceManaged).value
- )
- )
- }
+ )
}
object SparkProtobuf {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
