Skip to content

[SPARK-57693][BUILD] Simplify k8s-client deps management by using BOM #56774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gillespeiffer-db wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −7
Open

[SPARK-57693][BUILD] Simplify k8s-client deps management by using BOM #56774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client-bom</artifactId>
<version>${kubernetes-client.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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,9 @@ object DependencyOverrides {
lazy val jacksonDeps = Bom.dependencies("com.fasterxml.jackson" % "jackson-bom" % jacksonVersion)
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(
lazy val k8sClientVersion = sys.props.get("kubernetes-client.version").getOrElse("7.7.0")
lazy val k8sClientDeps = Bom.dependencies("io.fabric8" % "kubernetes-client-bom" % k8sClientVersion)
lazy val settings = jacksonDeps ++ grpcDeps ++ k8sClientDeps ++ Seq(
dependencyOverrides ++= {
val guavaVersion = sys.props.get("guava.version").getOrElse(
SbtPomKeys.effectivePom.value.getProperties.get("guava.version").asInstanceOf[String])
Expand All @@ -1304,7 +1306,7 @@ object DependencyOverrides {
"org.slf4j" % "slf4j-api" % slf4jVersion,
"org.tukaani" % "xz" % xzVersion,
"org.scala-lang" % "scalap" % scalaVersion.value
) ++ jacksonDeps.key.value ++ grpcDeps.key.value
) ++ jacksonDeps.key.value ++ grpcDeps.key.value ++ k8sClientDeps.key.value
}
)
}
Expand Down
3 changes: 0 additions & 3 deletions resource-managers/kubernetes/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,10 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>volcano-model</artifactId>
<version>${kubernetes-client.version}</version>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>volcano-client</artifactId>
<version>${kubernetes-client.version}</version>
</dependency>
</dependencies>
<build>
Expand Down Expand Up @@ -111,7 +109,6 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>${kubernetes-client.version}</version>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
Expand Down
2 changes: 0 additions & 2 deletions resource-managers/kubernetes/integration-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-client</artifactId>
<version>${kubernetes-client.version}</version>
<exclusions>
<exclusion>
<groupId>io.vertx</groupId>
Expand Down Expand Up @@ -232,7 +231,6 @@
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>volcano-client</artifactId>
<version>${kubernetes-client.version}</version>
</dependency>
</dependencies>
<build>
Expand Down