Skip to content

Commit 9252e10

Browse files
sd4324530sd4324530
authored
[s3] fix the size of fluss-fs-s3 is too big (#2419)
1 parent 087a05b commit 9252e10

File tree

10 files changed

+64
-103
lines changed
  • fluss-filesystems
    • fluss-fs-azure/src/main/resources/META-INF
    • fluss-fs-gs
    • fluss-fs-hadoop-shaded/src/main/resources/META-INF
    • fluss-fs-hdfs/src/main/resources/META-INF
    • fluss-fs-oss/src/main/resources/META-INF
    • fluss-fs-s3
    • pom.xml
  • website/docs/maintenance/filesystems

10 files changed

+64
-103
lines changed

‎fluss-filesystems/fluss-fs-azure/src/main/resources/META-INF/NOTICE‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,22 @@ This project bundles the following dependencies under the Apache Software Licens
3232
- org.apache.commons:commons-configuration2:2.8.0
3333
- org.apache.commons:commons-lang3:3.18.0
3434
- org.apache.commons:commons-text:1.10.0
35-
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0
35+
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
3636
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21:1.2.0
3737
- org.apache.hadoop:hadoop-annotations:3.4.0
3838
- org.apache.hadoop:hadoop-auth:3.4.0
39-
- org.apache.hadoop:hadoop-azure:3.4.0
39+
- org.apache.hadoop:hadoop-azure:3.3.4
4040
- org.apache.hadoop:hadoop-common:3.4.0
4141
- org.apache.kerby:kerb-core:2.0.3
4242
- org.apache.kerby:kerby-asn1:2.0.3
4343
- org.apache.kerby:kerby-pkix:2.0.3
4444
- org.apache.kerby:kerby-util:2.0.3
4545
- org.apache.httpcomponents:httpclient:4.5.13
4646
- org.apache.httpcomponents:httpcore:4.4.13
47+
- org.codehaus.jackson:jackson-core-asl:1.9.13
48+
- org.codehaus.jackson:jackson-mapper-asl:1.9.13
4749
- org.codehaus.jettison:jettison:1.5.4
48-
- org.wildfly.openssl:wildfly-openssl:1.1.3.Final
50+
- org.wildfly.openssl:wildfly-openssl:1.0.7.Final
4951
- org.xerial.snappy:snappy-java:1.1.10.4
5052

5153
This project bundles the following dependencies under the BSD license. See bundled license files for details.
@@ -76,5 +78,5 @@ This project bundles the following dependencies under the Eclipse Public License
7678
- EPL-2.0: https://www.eclipse.org/legal/epl-2.0/
7779
- Apache-2.0: http://www.apache.org/licenses/LICENSE-2.0.txt
7880

79-
- org.eclipse.jetty:jetty-util-ajax:9.4.53.v20231009
80-
- org.eclipse.jetty:jetty-util:9.4.53.v20231009
81+
- org.eclipse.jetty:jetty-util-ajax:9.4.43.v20210629
82+
- org.eclipse.jetty:jetty-util:9.4.43.v20210629

‎fluss-filesystems/fluss-fs-gs/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
<groupId>com.sun.jersey</groupId>
8282
<artifactId>jersey-server</artifactId>
8383
</exclusion>
84-
<exclusion>
85-
<groupId>com.github.pjfanning</groupId>
86-
<artifactId>jersey-json</artifactId>
87-
</exclusion>
8884
<exclusion>
8985
<groupId>org.apache.avro</groupId>
9086
<artifactId>avro</artifactId>

‎fluss-filesystems/fluss-fs-gs/src/main/resources/META-INF/NOTICE‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ This project bundles the following dependencies under the Apache Software Licens
55
- com.fasterxml.jackson.core:jackson-annotations:2.15.3
66
- com.fasterxml.jackson.core:jackson-core:2.15.3
77
- com.fasterxml.jackson.core:jackson-databind:2.15.3
8-
- com.fasterxml.woodstox:woodstox-core:5.4.0
8+
- com.fasterxml.woodstox:woodstox-core:5.3.0
99
- com.google.android:annotations:4.1.1.4
1010
- com.google.api-client:google-api-client-jackson2:2.0.1
1111
- com.google.api-client:google-api-client:2.2.0
@@ -45,9 +45,8 @@ This project bundles the following dependencies under the Apache Software Licens
4545
- commons-beanutils:commons-beanutils:1.9.4
4646
- commons-codec:commons-codec:1.16.0
4747
- commons-collections:commons-collections:3.2.2
48-
- commons-io:commons-io:2.14.0
49-
- commons-logging:commons-logging:1.2
50-
- io.dropwizard.metrics:metrics-core:3.2.4
48+
- commons-io:commons-io:2.8.0
49+
- commons-logging:commons-logging:1.1.3
5150
- io.grpc:grpc-alts:1.59.1
5251
- io.grpc:grpc-api:1.59.1
5352
- io.grpc:grpc-auth:1.59.1
@@ -65,15 +64,6 @@ This project bundles the following dependencies under the Apache Software Licens
6564
- io.grpc:grpc-stub:1.59.1
6665
- io.grpc:grpc-util:1.59.1
6766
- io.grpc:grpc-xds:1.59.1
68-
- io.netty:netty-buffer:4.1.100.Final
69-
- io.netty:netty-codec:4.1.100.Final
70-
- io.netty:netty-common:4.1.100.Final
71-
- io.netty:netty-handler:4.1.100.Final
72-
- io.netty:netty-resolver:4.1.100.Final
73-
- io.netty:netty-transport-classes-epoll:4.1.100.Final
74-
- io.netty:netty-transport-native-epoll:4.1.100.Final
75-
- io.netty:netty-transport-native-unix-common:4.1.100.Final
76-
- io.netty:netty-transport:4.1.100.Final
7767
- io.opencensus:opencensus-api:0.31.1
7868
- io.opencensus:opencensus-contrib-exemplar-util:0.31.0
7969
- io.opencensus:opencensus-contrib-grpc-metrics:0.31.0
@@ -85,23 +75,21 @@ This project bundles the following dependencies under the Apache Software Licens
8575
- io.opencensus:opencensus-impl-core:0.31.0
8676
- io.opencensus:opencensus-proto:0.2.0
8777
- io.perfmark:perfmark-api:0.26.0
88-
- org.apache.commons:commons-compress:1.24.0
89-
- org.apache.commons:commons-configuration2:2.8.0
78+
- org.apache.commons:commons-compress:1.21
79+
- org.apache.commons:commons-configuration2:2.1.1
9080
- org.apache.commons:commons-lang3:3.18.0
91-
- org.apache.commons:commons-text:1.10.0
92-
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0
93-
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21:1.2.0
94-
- org.apache.hadoop:hadoop-annotations:3.4.0
95-
- org.apache.hadoop:hadoop-auth:3.4.0
96-
- org.apache.hadoop:hadoop-common:3.4.0
81+
- org.apache.commons:commons-text:1.4
82+
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
83+
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
84+
- org.apache.hadoop:hadoop-annotations:3.3.4
85+
- org.apache.hadoop:hadoop-auth:3.3.4
86+
- org.apache.hadoop:hadoop-common:3.3.4
9787
- org.apache.httpcomponents:httpclient:4.5.13
9888
- org.apache.httpcomponents:httpcore:4.4.13
99-
- org.apache.kerby:kerb-core:2.0.3
100-
- org.apache.kerby:kerby-asn1:2.0.3
101-
- org.apache.kerby:kerby-pkix:2.0.3
102-
- org.apache.kerby:kerby-util:2.0.3
103-
- org.bouncycastle:bcprov-jdk15on:1.70
104-
- org.codehaus.jettison:jettison:1.5.4
89+
- org.apache.kerby:kerb-core:1.0.1
90+
- org.apache.kerby:kerby-asn1:1.0.1
91+
- org.apache.kerby:kerby-pkix:1.0.1
92+
- org.apache.kerby:kerby-util:1.0.1
10593
- org.conscrypt:conscrypt-openjdk-uber:2.5.2
10694
- org.xerial.snappy:snappy-java:1.1.10.4
10795

@@ -113,7 +101,7 @@ See bundled license files for details.
113101
This project bundles the following dependencies under BSD-2 License (https://opensource.org/licenses/BSD-2-Clause).
114102
See bundled license files for details.
115103

116-
- dnsjava:dnsjava:3.4.0
104+
- dnsjava:dnsjava:2.1.7
117105

118106
This project bundles the following dependencies under BSD-3 License (https://opensource.org/licenses/BSD-3-Clause).
119107
See bundled license files for details.

‎fluss-filesystems/fluss-fs-hadoop-shaded/src/main/resources/META-INF/NOTICE‎

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,28 @@ This project bundles the following dependencies under the Apache Software Licens
99
- com.fasterxml.jackson.core:jackson-annotations:2.15.3
1010
- com.fasterxml.jackson.core:jackson-core:2.15.3
1111
- com.fasterxml.jackson.core:jackson-databind:2.15.3
12-
- com.fasterxml.woodstox:woodstox-core:5.4.0
12+
- com.fasterxml.woodstox:woodstox-core:5.3.0
1313
- com.google.guava:failureaccess:1.0
1414
- com.google.guava:guava:27.0-jre
1515
- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
1616
- com.google.j2objc:j2objc-annotations:1.1
1717
- commons-beanutils:commons-beanutils:1.9.4
1818
- commons-collections:commons-collections:3.2.2
19-
- commons-io:commons-io:2.14.0
20-
- commons-logging:commons-logging:1.2
21-
- io.dropwizard.metrics:metrics-core:3.2.4
22-
- io.netty:netty-buffer:4.1.100.Final
23-
- io.netty:netty-codec:4.1.100.Final
24-
- io.netty:netty-common:4.1.100.Final
25-
- io.netty:netty-handler:4.1.100.Final
26-
- io.netty:netty-resolver:4.1.100.Final
27-
- io.netty:netty-transport-classes-epoll:4.1.100.Final
28-
- io.netty:netty-transport-native-epoll:4.1.100.Final
29-
- io.netty:netty-transport-native-unix-common:4.1.100.Final
30-
- io.netty:netty-transport:4.1.100.Final
31-
- org.apache.commons:commons-compress:1.24.0
32-
- org.apache.commons:commons-configuration2:2.8.0
19+
- commons-io:commons-io:2.8.0
20+
- commons-logging:commons-logging:1.1.3
21+
- org.apache.commons:commons-compress:1.21
22+
- org.apache.commons:commons-configuration2:2.1.1
3323
- org.apache.commons:commons-lang3:3.18.0
34-
- org.apache.commons:commons-text:1.10.0
35-
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0
36-
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21:1.2.0
37-
- org.apache.hadoop:hadoop-annotations:3.4.0
38-
- org.apache.hadoop:hadoop-auth:3.4.0
39-
- org.apache.hadoop:hadoop-common:3.4.0
40-
- org.apache.kerby:kerb-core:2.0.3
41-
- org.apache.kerby:kerby-asn1:2.0.3
42-
- org.apache.kerby:kerby-pkix:2.0.3
43-
- org.apache.kerby:kerby-util:2.0.3
44-
- org.bouncycastle:bcprov-jdk15on:1.70
45-
- org.codehaus.jettison:jettison:1.5.4
24+
- org.apache.commons:commons-text:1.4
25+
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
26+
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
27+
- org.apache.hadoop:hadoop-annotations:3.3.4
28+
- org.apache.hadoop:hadoop-auth:3.3.4
29+
- org.apache.hadoop:hadoop-common:3.3.4
30+
- org.apache.kerby:kerb-core:1.0.1
31+
- org.apache.kerby:kerby-asn1:1.0.1
32+
- org.apache.kerby:kerby-pkix:1.0.1
33+
- org.apache.kerby:kerby-util:1.0.1
4634
- org.xerial.snappy:snappy-java:1.1.10.4
4735

4836
This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)
@@ -54,7 +42,7 @@ See bundled license files for details.
5442
This project bundles the following dependencies under BSD-2 License (https://opensource.org/licenses/BSD-2-Clause).
5543
See bundled license files for details.
5644

57-
- dnsjava:dnsjava:3.4.0
45+
- dnsjava:dnsjava:2.1.7
5846

5947
This project bundles the following dependencies under the Go License (https://golang.org/LICENSE).
6048
See bundled license files for details.

‎fluss-filesystems/fluss-fs-hdfs/src/main/resources/META-INF/NOTICE‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ This project bundles the following dependencies under the Apache Software Licens
99
- com.fasterxml.jackson.core:jackson-annotations:2.15.3
1010
- com.fasterxml.jackson.core:jackson-core:2.15.3
1111
- com.fasterxml.jackson.core:jackson-databind:2.15.3
12-
- org.apache.hadoop:hadoop-hdfs-client:3.4.0
12+
- com.squareup.okhttp3:okhttp:4.9.3
13+
- com.squareup.okio:okio:2.8.0
14+
- org.apache.hadoop:hadoop-hdfs-client:3.3.4
15+
- org.jetbrains.kotlin:kotlin-stdlib-common:1.4.10
16+
- org.jetbrains.kotlin:kotlin-stdlib:1.4.10
1317

1418
This project bundles the following dependencies under BSD-3 License (https://opensource.org/licenses/BSD-3-Clause).
1519
See bundled license files for details.

‎fluss-filesystems/fluss-fs-oss/src/main/resources/META-INF/NOTICE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ This project bundles the following dependencies under the Apache Software Licens
4040
- io.opentracing:opentracing-noop:0.33.0
4141
- io.opentracing:opentracing-util:0.33.0
4242
- jakarta.activation:jakarta.activation-api:1.2.1
43-
- org.apache.hadoop:hadoop-aliyun:3.4.0
43+
- org.apache.hadoop:hadoop-aliyun:3.3.4
4444
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0
4545
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21:1.2.0
4646
- org.apache.httpcomponents:httpclient:4.5.13

‎fluss-filesystems/fluss-fs-s3/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@
7474
<groupId>com.sun.jersey</groupId>
7575
<artifactId>jersey-server</artifactId>
7676
</exclusion>
77-
<exclusion>
78-
<groupId>com.github.pjfanning</groupId>
79-
<artifactId>jersey-json</artifactId>
80-
</exclusion>
8177
<exclusion>
8278
<groupId>org.apache.avro</groupId>
8379
<artifactId>avro</artifactId>

‎fluss-filesystems/fluss-fs-s3/src/main/resources/META-INF/NOTICE‎

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,41 @@ This project bundles the following dependencies under the Apache Software Licens
1313
- com.fasterxml.jackson.core:jackson-core:2.15.3
1414
- com.fasterxml.jackson.core:jackson-databind:2.15.3
1515
- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3
16-
- com.fasterxml.woodstox:woodstox-core:5.4.0
16+
- com.fasterxml.woodstox:woodstox-core:5.3.0
1717
- com.google.guava:failureaccess:1.0
1818
- com.google.guava:guava:27.0-jre
1919
- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
2020
- com.google.j2objc:j2objc-annotations:1.1
2121
- commons-beanutils:commons-beanutils:1.9.4
2222
- commons-codec:commons-codec:1.15
2323
- commons-collections:commons-collections:3.2.2
24-
- commons-io:commons-io:2.14.0
24+
- commons-io:commons-io:2.8.0
2525
- commons-logging:commons-logging:1.1.3
26-
- io.dropwizard.metrics:metrics-core:3.2.4
27-
- io.netty:netty-buffer:4.1.100.Final
28-
- io.netty:netty-codec:4.1.100.Final
29-
- io.netty:netty-common:4.1.100.Final
30-
- io.netty:netty-handler:4.1.100.Final
31-
- io.netty:netty-resolver:4.1.100.Final
32-
- io.netty:netty-transport-classes-epoll:4.1.100.Final
33-
- io.netty:netty-transport-native-epoll:4.1.100.Final
34-
- io.netty:netty-transport-native-unix-common:4.1.100.Final
35-
- io.netty:netty-transport:4.1.100.Final
3626
- joda-time:joda-time:2.8.1
37-
- org.apache.commons:commons-compress:1.24.0
38-
- org.apache.commons:commons-configuration2:2.8.0
27+
- org.apache.commons:commons-compress:1.21
28+
- org.apache.commons:commons-configuration2:2.1.1
3929
- org.apache.commons:commons-lang3:3.18.0
40-
- org.apache.commons:commons-text:1.10.0
41-
- org.apache.hadoop:hadoop-annotations:3.4.0
42-
- org.apache.hadoop:hadoop-auth:3.4.0
43-
- org.apache.hadoop:hadoop-aws:3.4.0
44-
- org.apache.hadoop:hadoop-common:3.4.0
45-
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.2.0
46-
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_21:1.2.0
30+
- org.apache.commons:commons-text:1.4
31+
- org.apache.hadoop:hadoop-annotations:3.3.4
32+
- org.apache.hadoop:hadoop-auth:3.3.4
33+
- org.apache.hadoop:hadoop-aws:3.3.4
34+
- org.apache.hadoop:hadoop-common:3.3.4
35+
- org.apache.hadoop.thirdparty:hadoop-shaded-guava:1.1.1
36+
- org.apache.hadoop.thirdparty:hadoop-shaded-protobuf_3_7:1.1.1
4737
- org.apache.httpcomponents:httpclient:4.5.13
4838
- org.apache.httpcomponents:httpcore:4.4.13
49-
- org.apache.kerby:kerb-core:2.0.3
50-
- org.apache.kerby:kerby-asn1:2.0.3
51-
- org.apache.kerby:kerby-pkix:2.0.3
52-
- org.apache.kerby:kerby-util:2.0.3
53-
- org.bouncycastle:bcprov-jdk15on:1.70
54-
- org.codehaus.jettison:jettison:1.5.4
55-
- org.wildfly.openssl:wildfly-openssl:1.1.3.Final
39+
- org.apache.kerby:kerb-core:1.0.1
40+
- org.apache.kerby:kerby-asn1:1.0.1
41+
- org.apache.kerby:kerby-pkix:1.0.1
42+
- org.apache.kerby:kerby-util:1.0.1
43+
- org.wildfly.openssl:wildfly-openssl:1.0.7.Final
5644
- org.xerial.snappy:snappy-java:1.1.10.4
57-
- software.amazon.awssdk:bundle:2.23.19
5845
- software.amazon.ion:ion-java:1.0.2
5946

6047
This project bundles the following dependencies under BSD-2 License (https://opensource.org/licenses/BSD-2-Clause).
6148
See bundled license files for details.
6249

63-
- dnsjava:dnsjava:3.4.0
50+
- dnsjava:dnsjava:2.1.7
6451

6552
This project bundles the following dependencies under the MIT (https://opensource.org/licenses/MIT)
6653
See bundled license files for details.

‎fluss-filesystems/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<packaging>pom</packaging>
4242

4343
<properties>
44-
<fs.hadoopshaded.version>3.4.0</fs.hadoopshaded.version>
44+
<fs.hadoopshaded.version>3.3.4</fs.hadoopshaded.version>
4545
<commons.beanutils.version>1.9.4</commons.beanutils.version>
4646
</properties>
4747

‎website/docs/maintenance/filesystems/hdfs.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fluss.hadoop.hadoop.security.kerberos.ticket.cache.path: /tmp/krb5cc_1000
5656
5757
#### Use Machine Hadoop Environment Configuration
5858
59-
Fluss includes bundled Hadoop libraries with version 3.4.0 for deploying Fluss in machine without Hadoop installed.
59+
Fluss includes bundled Hadoop libraries with version 3.3.4 for deploying Fluss in machine without Hadoop installed.
6060
For most use cases, these work perfectly. However, you should configure your machine's native Hadoop environment if:
6161
1. Your HDFS uses kerberos security
6262
2. You need to avoid version conflicts between Fluss's bundled hadoop libraries and your HDFS cluster

0 commit comments

Comments
 (0)