Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1110,6 +1110,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-bom</artifactId>
<version>${io.grpc.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.apache.ws.xmlschema</groupId>
<artifactId>xmlschema-core</artifactId>
Expand Down
6 changes: 4 additions & 2 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1280,7 +1280,9 @@ object KubernetesIntegrationTests {
object DependencyOverrides {
lazy val jacksonVersion = sys.props.get("fasterxml.jackson.version").getOrElse("2.21.4")
lazy val jacksonDeps = Bom.dependencies("com.fasterxml.jackson" % "jackson-bom" % jacksonVersion)
lazy val settings = jacksonDeps ++ Seq(
lazy val grpcVersion = sys.props.get("io.grpc.version").getOrElse("1.76.0")
lazy val grpcDeps = Bom.dependencies("io.grpc" % "grpc-bom" % grpcVersion)
lazy val settings = jacksonDeps ++ grpcDeps ++ Seq(
dependencyOverrides ++= {
val guavaVersion = sys.props.get("guava.version").getOrElse(
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String])
Expand All @@ -1302,7 +1304,7 @@ object DependencyOverrides {
"org.slf4j" % "slf4j-api" % slf4jVersion,
"org.tukaani" % "xz" % xzVersion,
"org.scala-lang" % "scalap" % scalaVersion.value
) ++ jacksonDeps.key.value
) ++ jacksonDeps.key.value ++ grpcDeps.key.value
}
)
}
Expand Down
5 changes: 0 additions & 5 deletions sql/connect/common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,22 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down
4 changes: 0 additions & 4 deletions sql/connect/server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,22 +203,18 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-services</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down
4 changes: 0 additions & 4 deletions udf/worker/grpc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,22 +77,18 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-api</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>${io.grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<version>${io.grpc.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down