Skip to content

Commit

Permalink
Package beam avro classes from extension lib in scio-repl (#4929)
Browse files Browse the repository at this point in the history
  • Loading branch information
RustedBones authored Jul 20, 2023
1 parent db1329b commit 737d862
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -1244,11 +1244,11 @@ lazy val `scio-repl`: Project = project
assembly / assemblyMergeStrategy ~= { old =>
{
case PathList("org", "apache", "beam", "sdk", "extensions", "avro", _*) =>
// prefer beam-runners-direct-java until we explicitly move to beam-sdks-java-extensions-avro
// prefer beam avro classes from extensions lib instead of ones shipped in runners
CustomMergeStrategy("BeamAvro") { conflicts =>
import sbtassembly.Assembly._
conflicts.collectFirst {
case Library(ModuleCoordinate(_, "beam-runners-direct-java", _), _, t, s) =>
case Library(ModuleCoordinate(_, "beam-sdks-java-extensions-avro", _), _, t, s) =>
JarEntry(t, s)
} match {
case Some(e) => Right(Vector(e))
Expand Down

0 comments on commit 737d862

Please sign in to comment.