Skip to content
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

Jump to bottom

[SPARK-43646][PROTOBUF][BUILD] Split protobuf-assembly module from protobuf module #41466

Closed
wants to merge 12 commits into from
Closed

[SPARK-43646][PROTOBUF][BUILD] Split protobuf-assembly module from protobuf module #41466

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c2bf580
split
LuciferYang Jun 5, 2023
8fd90d6
add new dir
LuciferYang Jun 5, 2023
d4f4ac5
update SparkBuild.scala
LuciferYang Jun 5, 2023
6b1f1f7
update SparkBuild.scala
LuciferYang Jun 5, 2023
0a5c335
Merge branch 'apache:master' into protobuf-assembly
LuciferYang Jun 6, 2023
541ee61
revdert
LuciferYang Jun 6, 2023
3031b5b
Merge branch 'upmaster' into protobuf-assembly
LuciferYang Jun 13, 2023
0e91185
Merge branch 'upmaster' into protobuf-assembly
LuciferYang Jul 13, 2023
d3cfc59
Merge branch 'upmaster' into protobuf-assembly
LuciferYang Jul 28, 2023
f45f7b2
fix compiel
LuciferYang Jul 28, 2023
288967b
Merge branch 'upmaster' into protobuf-assembly
LuciferYang Aug 8, 2023
fb53fe8
remove
LuciferYang Aug 8, 2023
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
Prev Previous commit
remove
  • Loading branch information
@LuciferYang
LuciferYang committed Aug 8, 2023
commit fb53fe8c7f186d994f1fcf642a27197519cd4819
4 changes: 0 additions & 4 deletions project/SparkBuild.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1554,7 +1554,6 @@ object CopyDependencies {
// Later, when the dependencies are copied, we manually copy the shaded Jar only.
val fid = (LocalProject("connect") / assembly).value
val fidClient = (LocalProject("connect-client-jvm") / assembly).value
val fidProtobuf = (LocalProject("protobuf-assembly") / assembly).value

(Compile / dependencyClasspath).value.map(_.data)
.filter { jar => jar.isFile() }
Expand All @@ -1570,9 +1569,6 @@ object CopyDependencies {
} else if (jar.getName.contains("connect-client-jvm") &&
!SbtPomKeys.profiles.value.contains("noshade-connect-client-jvm")) {
Files.copy(fidClient.toPath, destJar.toPath)
} else if (jar.getName.contains("spark-protobuf") &&
!SbtPomKeys.profiles.value.contains("noshade-protobuf")) {
Files.copy(fidProtobuf.toPath, destJar.toPath)
} else {
Files.copy(jar.toPath(), destJar.toPath())
}
Expand Down