Skip to content

Commit

Permalink
minor update
Browse files Browse the repository at this point in the history
  • Loading branch information
scottsand-db committed Sep 7, 2023
1 parent af8255e commit 6b7ba06
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ lazy val hive2Tez = (project in file("connectors/hive2-tez"))
* -- .m2/repository/io/delta/delta-standalone_2.12/0.2.1-SNAPSHOT/delta-standalone_2.12-0.2.1-SNAPSHOT-javadoc.jar
*/
lazy val standaloneCosmetic = project
.dependsOn(storage) // this doesn't impact the output artifact (jar), only the pom.xml dependencies
.settings(
name := "delta-standalone",
commonSettings,
Expand Down Expand Up @@ -749,7 +750,8 @@ lazy val standalone = (project in file("connectors/standalone"))
assembly / logLevel := Level.Info,
assembly / test := {},
assembly / assemblyJarName := s"${name.value}-shaded_${scalaBinaryVersion.value}-${version.value}.jar",
// we exclude jars first, and then we shade what is remaining
// We exclude jars first, and then we shade what is remaining. Note: the input here is only
// `libraryDependencies` jars, not `.dependsOn(_)` jars.
assembly / assemblyExcludedJars := {
val cp = (assembly / fullClasspath).value
val allowedPrefixes = Set("META_INF", "io", "json4s", "jackson", "paranamer",
Expand Down Expand Up @@ -777,8 +779,8 @@ lazy val standalone = (project in file("connectors/standalone"))
// Discard the jackson service configs that we don't need. These files are not shaded so
// adding them may conflict with other jackson version used by the user.
case PathList("META-INF", "services", xs @ _*) => MergeStrategy.discard
// This project `.dependsOn` delta-storage. Manually discard io.delta.storage classes
// since it is a provided dependency.
// This project `.dependsOn` delta-storage, and its classes will be included by default
// in this assembly jar.Manually discard them since it is already a compile-time dependency.
case PathList("io", "delta", "storage", xs @ _*) => MergeStrategy.discard
case x =>
val oldStrategy = (assembly / assemblyMergeStrategy).value
Expand Down Expand Up @@ -874,7 +876,6 @@ def flinkScalaVersion(scalaBinaryVersion: String): String = {
}

lazy val flink = (project in file("connectors/flink"))
.dependsOn(storage % "provided")
.dependsOn(standaloneCosmetic % "provided")
.settings (
name := "delta-flink",
Expand Down

0 comments on commit 6b7ba06

Please sign in to comment.