@@ -418,8 +418,6 @@ object SparkBuild extends PomBuild {
418
418
419
419
enable(HiveThriftServer .settings)(hiveThriftServer)
420
420
421
- enable(SparkDeclarativePipelines .settings)(pipelines)
422
-
423
421
enable(SparkConnectCommon .settings)(connectCommon)
424
422
enable(SparkConnect .settings)(connect)
425
423
enable(SparkConnectClient .settings)(connectClient)
@@ -886,57 +884,6 @@ object SparkConnectClient {
886
884
)
887
885
}
888
886
889
- object SparkDeclarativePipelines {
890
- import BuildCommons .protoVersion
891
-
892
- lazy val settings = Seq (
893
- // For some reason the resolution from the imported Maven build does not work for some
894
- // of these dependendencies that we need to shade later on.
895
- libraryDependencies ++= {
896
- val guavaVersion =
897
- SbtPomKeys .effectivePom.value.getProperties.get(
898
- " connect.guava.version" ).asInstanceOf [String ]
899
- val guavaFailureAccessVersion =
900
- SbtPomKeys .effectivePom.value.getProperties.get(
901
- " guava.failureaccess.version" ).asInstanceOf [String ]
902
- Seq (
903
- " com.google.guava" % " guava" % guavaVersion,
904
- " com.google.guava" % " failureaccess" % guavaFailureAccessVersion,
905
- " com.google.protobuf" % " protobuf-java" % protoVersion % " protobuf"
906
- )
907
- },
908
-
909
- (assembly / logLevel) := Level .Info ,
910
-
911
- // Exclude `scala-library` from assembly.
912
- (assembly / assemblyPackageScala / assembleArtifact) := false ,
913
-
914
- // SPARK-46733: Include `spark-connect-*.jar`, `unused-*.jar`,`guava-*.jar`,
915
- // `failureaccess-*.jar`, `annotations-*.jar`, `grpc-*.jar`, `protobuf-*.jar`,
916
- // `gson-*.jar`, `error_prone_annotations-*.jar`, `j2objc-annotations-*.jar`,
917
- // `animal-sniffer-annotations-*.jar`, `perfmark-api-*.jar`,
918
- // `proto-google-common-protos-*.jar` in assembly.
919
- // This needs to be consistent with the content of `maven-shade-plugin`.
920
- (assembly / assemblyExcludedJars) := {
921
- val cp = (assembly / fullClasspath).value
922
- val validPrefixes = Set (" spark-connect" , " unused-" , " guava-" , " failureaccess-" ,
923
- " annotations-" , " grpc-" , " protobuf-" , " gson" , " error_prone_annotations" ,
924
- " j2objc-annotations" , " animal-sniffer-annotations" , " perfmark-api" ,
925
- " proto-google-common-protos" )
926
- cp filterNot { v =>
927
- validPrefixes.exists(v.data.getName.startsWith)
928
- }
929
- },
930
-
931
- (assembly / assemblyMergeStrategy) := {
932
- case m if m.toLowerCase(Locale .ROOT ).endsWith(" manifest.mf" ) => MergeStrategy .discard
933
- // Drop all proto files that are not needed as artifacts of the build.
934
- case m if m.toLowerCase(Locale .ROOT ).endsWith(" .proto" ) => MergeStrategy .discard
935
- case _ => MergeStrategy .first
936
- }
937
- )
938
- }
939
-
940
887
object SparkProtobuf {
941
888
import BuildCommons .protoVersion
942
889
0 commit comments