Fix mergeStrategy for scio-repl (#5794)

clairemcginty · web-flow · commit 4daeffd18967 · 2025-10-23T15:21:53.000-04:00
diff --git a/build.sbt b/build.sbt
@@ -1733,6 +1733,9 @@ lazy val `scio-repl` = project
             ) =>
           // merge conflicting netty config files
           MergeStrategy.filterDistinctLines
+        case PathList("META-INF", "license", "LICENSE.boringssl.txt") =>
+          // drop conflicting netty-tcnative-boringssl license
+          MergeStrategy.discard
         case s => old(s)
       }
     }

Original file line number	Diff line number	Diff line change
@@ -1733,6 +1733,9 @@ lazy val `scio-repl` = project
`1733`	`1733`	`) =>`
`1734`	`1734`	`// merge conflicting netty config files`
`1735`	`1735`	`MergeStrategy.filterDistinctLines`
	`1736`	`+ case PathList("META-INF", "license", "LICENSE.boringssl.txt") =>`
	`1737`	`+ // drop conflicting netty-tcnative-boringssl license`
	`1738`	`+ MergeStrategy.discard`
`1736`	`1739`	`case s => old(s)`
`1737`	`1740`	`}`
`1738`	`1741`	`}`