Skip to content

[SPARK-40677][CONNECT][BUILD] Shade more dependency to be able to run separately #38132

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

Closed
HyukjinKwon wants to merge 1 commit into from
Closed

[SPARK-40677][CONNECT][BUILD] Shade more dependency to be able to run separately #38132

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 36 additions & 0 deletions connector/connect/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,17 @@
<include>com.google.guava:*</include>
<include>io.grpc:*:</include>
<include>com.google.protobuf:*</include>

<!--
The dependencies below are not added in SBT because SBT add them all
as assembly build.
-->
<include>com.google.android:annotations</include>
<include>com.google.api.grpc:proto-google-common-proto</include>
<include>io.perfmark:perfmark-api</include>
<include>org.codehaus.mojo:animal-sniffer-annotations</include>
<include>com.google.errorprone:error_prone_annotations</include>
<include>com.google.j2objc:j2objc-annotations</include>
</includes>
</artifactSet>
<relocations>
Expand Down Expand Up @@ -271,6 +282,31 @@
<pattern>io.grpc</pattern>
<shadedPattern>${spark.shade.packageName}.connect.grpc</shadedPattern>
</relocation>

<relocation>
<pattern>com.google.android</pattern>
Copy link
Contributor

@LuciferYang LuciferYang Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HyukjinKwon Sorry for the late reply

The relocation rule may be incorrect

I think it should be

<pattern>android.annotation</pattern>
<shadedPattern>${spark.shade.packageName}.connect.android.annotation</shadedPattern>

and unzip the assembly jar, the contents are as follows:

ls

META-INF	android		com		google		grpc		org		spark

Not all contents are placed in ${spark.shade.packageName}.connect, which may require further check

Copy link
Member Author

@HyukjinKwon HyukjinKwon Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey sure, please go ahead with a followup. I just rushed to merge to fix up the broken tests with Maven :-).

Copy link
Contributor

@LuciferYang LuciferYang Oct 7, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK~ Maybe do this tomorrow, a little tired today

<shadedPattern>${spark.shade.packageName}.connect.android</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.api.grpc</pattern>
<shadedPattern>${spark.shade.packageName}.connect.api</shadedPattern>
</relocation>
<relocation>
<pattern>io.perfmark</pattern>
<shadedPattern>${spark.shade.packageName}.connect.perfmark</shadedPattern>
</relocation>
<relocation>
<pattern>org.codehaus.mojo</pattern>
<shadedPattern>${spark.shade.packageName}.connect.mojo</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.errorprone</pattern>
<shadedPattern>${spark.shade.packageName}.connect.errorprone</shadedPattern>
</relocation>
<relocation>
<pattern>com.com.google.j2objc</pattern>
<shadedPattern>${spark.shade.packageName}.connect.j2objc</shadedPattern>
</relocation>
</relocations>
</configuration>
</plugin>
Expand Down