Skip to content

[ FLINK-33603][FileSystems] shade guava in gs-fs filesystem #23489

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
wants to merge 9 commits into from
Closed

[ FLINK-33603][FileSystems] shade guava in gs-fs filesystem #23489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e8dd8ed
[FLINK-31631][FileSystema] shade guava in gs-fs filesystem
singhravidutt Oct 4, 2023
41ebd0d
mark dependency as optional
singhravidutt Oct 6, 2023
8964849
add packages in NOTICE
singhravidutt Oct 17, 2023
cba7bb8
removing jars from NOTICE
singhravidutt Dec 5, 2023
cda1e43
Fixing licensing check issue
singhravidutt Dec 14, 2023
e14a4f3
Fixing licensing check issue
singhravidutt Dec 15, 2023
040d69e
Merge branch 'master' into guava-shading
singhravidutt Dec 15, 2023
ec5a2ec
remove relocation of guava
singhravidutt Dec 15, 2023
2733e05
Fixed jar version in NOTICE
singhravidutt Dec 15, 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
47 changes: 26 additions & 21 deletions flink-filesystems/flink-gs-fs-hadoop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@ under the License.
<artifactId>flink-fs-hadoop-shaded</artifactId>
<version>${project.version}</version>
<optional>${flink.markBundledAsOptional}</optional>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand All @@ -82,26 +88,6 @@ under the License.
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotations</artifactId>
</exclusion>
<!-- exclude dependency because of its GPLv2 license, see https://github.com/apache/flink/pull/15599#issuecomment-850241316 -->
<exclusion>
<groupId>javax.annotation</groupId>
Expand Down Expand Up @@ -141,14 +127,33 @@ under the License.
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>failureaccess</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>listenablefuture</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.j2objc</groupId>
<artifactId>j2objc-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.errorprone</groupId>
<artifactId>error_prone_annotation</artifactId>
</exclusion>
<!-- exclude dependency because of its GPLv2 license, see https://github.com/apache/flink/pull/15599#issuecomment-850241316 -->
<exclusion>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
</exclusion>
</exclusions>
</dependency>

</dependencies>

<dependencyManagement>
Expand Down
5 changes: 5 additions & 0 deletions flink-filesystems/flink-gs-fs-hadoop/src/main/resources/META-INF/NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,19 @@ This project bundles the following dependencies under the Apache Software Licens
- com.google.cloud:google-cloud-monitoring:1.82.0
- com.google.cloud:google-cloud-storage:2.29.1
- com.google.code.gson:gson:2.10.1
- com.google.errorprone:error_prone_annotations:2.22.0
- com.google.flogger:flogger-system-backend:0.7.1
- com.google.flogger:flogger:0.7.1
- com.google.flogger:google-extensions:0.7.1
- com.google.guava:failureaccess:1.0.1
- com.google.guava:guava:32.1.2-jre
- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
- com.google.http-client:google-http-client-apache-v2:1.43.3
- com.google.http-client:google-http-client-appengine:1.43.3
- com.google.http-client:google-http-client-gson:1.43.3
- com.google.http-client:google-http-client-jackson2:1.43.3
- com.google.http-client:google-http-client:1.43.3
- com.google.j2objc:j2objc-annotations:2.8
- com.google.oauth-client:google-oauth-client:1.34.1
- com.lmax:disruptor:3.4.2
- commons-codec:commons-codec:1.15
Expand Down Expand Up @@ -69,6 +73,7 @@ This project bundles the following dependencies under the Apache Software Licens
- io.opencensus:opencensus-impl-core:0.31.0
- io.opencensus:opencensus-proto:0.2.0
- io.perfmark:perfmark-api:0.26.0
- org.checkerframework:checker-qual:3.39.0
- org.apache.httpcomponents:httpclient:4.5.13
- org.apache.httpcomponents:httpcore:4.4.14
- org.conscrypt:conscrypt-openjdk-uber:2.5.2
Expand Down