This is an automated email from the ASF dual-hosted git repository.
yangjie01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 4f2e2d7e038 [SPARK-43772][BUILD][CONNECT] Move version configuration
in `connect` module to parent
4f2e2d7e038 is described below
commit 4f2e2d7e038396f37d2afddff76608eef5cc6e8d
Author: panbingkun <pbk1...@gmail.com>
AuthorDate: Sun Jun 11 15:54:38 2023 +0800
[SPARK-43772][BUILD][CONNECT] Move version configuration in `connect`
module to parent
### What changes were proposed in this pull request?
The pr aims to move version configuration in `connect` module to parent.
### Why are the changes needed?
For better management and post maintenance, eg: upgrading some library
version of a module while forgetting another one.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
- Pass GA.
- Manually test
sh build/sbt "connect/testOnly
org.apache.spark.sql.connect.artifact.ArtifactManagerSuite"
sh build/sbt "connect/testOnly
org.apache.spark.sql.connect.planner.SparkConnectServiceSuite"
sh build/sbt "connect/testOnly
org.apache.spark.sql.connect.service.InterceptorRegistrySuite"
Closes #41295 from panbingkun/SPARK-43772.
Authored-by: panbingkun <pbk1...@gmail.com>
Signed-off-by: yangjie01 <yangji...@baidu.com>
---
connector/connect/client/jvm/pom.xml | 5 +----
connector/connect/common/pom.xml | 4 ----
connector/connect/server/pom.xml | 6 +-----
pom.xml | 7 +++++++
project/SparkBuild.scala | 18 ++++++++++++------
5 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/connector/connect/client/jvm/pom.xml
b/connector/connect/client/jvm/pom.xml
index 4d0a4379329..cbb283ed993 100644
--- a/connector/connect/client/jvm/pom.xml
+++ b/connector/connect/client/jvm/pom.xml
@@ -32,9 +32,6 @@
<url>https://spark.apache.org/</url>
<properties>
<sbt.project.name>connect-client-jvm</sbt.project.name>
- <guava.version>31.0.1-jre</guava.version>
- <guava.failureaccess.version>1.0.1</guava.failureaccess.version>
- <mima.version>1.1.2</mima.version>
</properties>
<dependencies>
@@ -70,7 +67,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <version>${connect.guava.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/connector/connect/common/pom.xml b/connector/connect/common/pom.xml
index 06076646df7..1890384b51d 100644
--- a/connector/connect/common/pom.xml
+++ b/connector/connect/common/pom.xml
@@ -32,10 +32,6 @@
<url>https://spark.apache.org/</url>
<properties>
<sbt.project.name>connect-common</sbt.project.name>
- <guava.version>31.0.1-jre</guava.version>
- <guava.failureaccess.version>1.0.1</guava.failureaccess.version>
- <io.grpc.version>1.47.0</io.grpc.version>
- <tomcat.annotations.api.version>6.0.53</tomcat.annotations.api.version>
</properties>
<dependencies>
<dependency>
diff --git a/connector/connect/server/pom.xml b/connector/connect/server/pom.xml
index f9dc40ce85a..95b70c6b0f4 100644
--- a/connector/connect/server/pom.xml
+++ b/connector/connect/server/pom.xml
@@ -32,10 +32,6 @@
<url>https://spark.apache.org/</url>
<properties>
<sbt.project.name>connect</sbt.project.name>
- <guava.version>31.0.1-jre</guava.version>
- <guava.failureaccess.version>1.0.1</guava.failureaccess.version>
- <io.grpc.version>1.47.0</io.grpc.version>
- <tomcat.annotations.api.version>6.0.53</tomcat.annotations.api.version>
</properties>
<dependencies>
@@ -165,7 +161,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <version>${connect.guava.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index b668854fd4e..23872c6ea9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,6 +277,13 @@
<spark.test.docker.keepContainer>false</spark.test.docker.keepContainer>
<spark.test.docker.removePulledImage>true</spark.test.docker.removePulledImage>
+ <!-- Version used in Connect -->
+ <connect.guava.version>31.0.1-jre</connect.guava.version>
+ <guava.failureaccess.version>1.0.1</guava.failureaccess.version>
+ <io.grpc.version>1.47.0</io.grpc.version>
+ <mima.version>1.1.2</mima.version>
+ <tomcat.annotations.api.version>6.0.53</tomcat.annotations.api.version>
+
<CodeCacheSize>128m</CodeCacheSize>
<!-- Needed for consistent times -->
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss
z</maven.build.timestamp.format>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 023ce4ba81c..bd09c53b442 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -674,7 +674,8 @@ object SparkConnectCommon {
// of these dependendencies that we need to shade later on.
libraryDependencies ++= {
val guavaVersion =
-
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String]
+ SbtPomKeys.effectivePom.value.getProperties.get(
+ "connect.guava.version").asInstanceOf[String]
val guavaFailureaccessVersion =
SbtPomKeys.effectivePom.value.getProperties.get(
"guava.failureaccess.version").asInstanceOf[String]
@@ -688,7 +689,8 @@ object SparkConnectCommon {
dependencyOverrides ++= {
val guavaVersion =
-
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String]
+ SbtPomKeys.effectivePom.value.getProperties.get(
+ "connect.guava.version").asInstanceOf[String]
val guavaFailureaccessVersion =
SbtPomKeys.effectivePom.value.getProperties.get(
"guava.failureaccess.version").asInstanceOf[String]
@@ -753,7 +755,8 @@ object SparkConnect {
// of these dependendencies that we need to shade later on.
libraryDependencies ++= {
val guavaVersion =
-
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String]
+ SbtPomKeys.effectivePom.value.getProperties.get(
+ "connect.guava.version").asInstanceOf[String]
val guavaFailureaccessVersion =
SbtPomKeys.effectivePom.value.getProperties.get(
"guava.failureaccess.version").asInstanceOf[String]
@@ -767,7 +770,8 @@ object SparkConnect {
dependencyOverrides ++= {
val guavaVersion =
-
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String]
+ SbtPomKeys.effectivePom.value.getProperties.get(
+ "connect.guava.version").asInstanceOf[String]
val guavaFailureaccessVersion =
SbtPomKeys.effectivePom.value.getProperties.get(
"guava.failureaccess.version").asInstanceOf[String]
@@ -842,7 +846,8 @@ object SparkConnectClient {
// of these dependendencies that we need to shade later on.
libraryDependencies ++= {
val guavaVersion =
-
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String]
+ SbtPomKeys.effectivePom.value.getProperties.get(
+ "connect.guava.version").asInstanceOf[String]
Seq(
"com.google.guava" % "guava" % guavaVersion,
"com.google.protobuf" % "protobuf-java" % protoVersion % "protobuf"
@@ -851,7 +856,8 @@ object SparkConnectClient {
dependencyOverrides ++= {
val guavaVersion =
-
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String]
+ SbtPomKeys.effectivePom.value.getProperties.get(
+ "connect.guava.version").asInstanceOf[String]
Seq(
"com.google.guava" % "guava" % guavaVersion,
"com.google.protobuf" % "protobuf-java" % protoVersion
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
