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

[core] Fix missing kotlin and okio dependencies when using okhttp3. #5050

Merged
merged 3 commits into from
Feb 14, 2025
Merged

[core] Fix missing kotlin and okio dependencies when using okhttp3. #5050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c86728b
[core] Fix missing kotlin and okio dependencies when using okhttp3.
LinMingQiang Feb 10, 2025
b635741
[core] add new dependencies NOTICE.
LinMingQiang Feb 10, 2025
6b532f5
[core] fix.
LinMingQiang Feb 11, 2025
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
10 changes: 10 additions & 0 deletions paimon-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,13 +284,23 @@ under the License.
<artifactSet>
<includes combine.children="append">
<include>com.squareup.okhttp3:okhttp</include>
<include>com.squareup.okio:okio-jvm</include>
<include>org.jetbrains.kotlin:kotlin-stdlib</include>
LinMingQiang marked this conversation as resolved.
Show resolved Hide resolved
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>okhttp3</pattern>
<shadedPattern>org.apache.paimon.shade.okhttp3</shadedPattern>
</relocation>
<relocation>
<pattern>kotlin</pattern>
<shadedPattern>org.apache.paimon.shade.kotlin</shadedPattern>
</relocation>
<relocation>
<pattern>okio</pattern>
<shadedPattern>org.apache.paimon.shade.okio</shadedPattern>
</relocation>
</relocations>
</configuration>
</execution>
Expand Down
4 changes: 3 additions & 1 deletion paimon-core/src/main/resources/META-INF/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).

This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- com.squareup.okhttp3:okhttp:4.12.0
- com.squareup.okhttp3:okhttp:4.12.0
- com.squareup.okio:okio-jvm:3.6.0
- org.jetbrains.kotlin:kotlin-stdlib:1.8.21
Copy link
Contributor

Choose a reason for hiding this comment

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

If we don't need add okio-jvm and kotlin-stdlib as dependency. Needn't update this file.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It still bundles okio-jvm and kotlin-stdlib dependencies in this project, It's just that these two dependencies are introduced by okhttp3.