Skip to content

Commit 5742224

Browse files
committed
Fix licensing issues
1 parent 818d199 commit 5742224

File tree

5 files changed

+22
-10
lines changed
  • fluss-filesystems
    • fluss-fs-gs/src/main/resources/META-INF
    • fluss-fs-hadoop-shaded/src/main/resources/META-INF
    • fluss-fs-obs/src/main/resources/META-INF
    • fluss-fs-oss/src/main/resources/META-INF
    • fluss-fs-s3/src/main/resources/META-INF

5 files changed

+22
-10
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ This project bundles the following dependencies under the Apache Software Licens
66
- com.fasterxml.jackson.core:jackson-core:2.15.3
77
- com.fasterxml.jackson.core:jackson-databind:2.15.3
88
- com.fasterxml.woodstox:woodstox-core:5.4.0
9-
- com.github.pjfanning:jersey-json:1.20
109
- com.google.android:annotations:4.1.1.4
1110
- com.google.api-client:google-api-client-jackson2:2.0.1
1211
- com.google.api-client:google-api-client:2.2.0
@@ -43,7 +42,6 @@ This project bundles the following dependencies under the Apache Software Licens
4342
- com.google.http-client:google-http-client:1.43.3
4443
- com.google.oauth-client:google-oauth-client:1.34.1
4544
- com.lmax:disruptor:3.4.2
46-
- com.sun.xml.bind:jaxb-impl:2.2.3-1
4745
- commons-beanutils:commons-beanutils:1.9.4
4846
- commons-codec:commons-codec:1.16.0
4947
- commons-collections:commons-collections:3.2.2
@@ -143,9 +141,11 @@ See bundled license files for details.
143141
This project bundles the following dependencies under the CDDL 1.1 license.
144142
See bundled license files for details.
145143

144+
- com.github.pjfanning:jersey-json:1.20
146145
- javax.xml.bind:jaxb-api:2.3.1
147146

148147
This project bundles the following dependencies under EDL 1.0 License (https://www.eclipse.org/org/documents/edl-v10.php).
149148
See bundled license files for details.
150149

150+
- com.sun.xml.bind:jaxb-impl:2.2.3-1
151151
- jakarta.activation:jakarta.activation-api:1.2.1

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ This project bundles the following dependencies under the Apache Software Licens
1010
- com.fasterxml.jackson.core:jackson-core:2.15.3
1111
- com.fasterxml.jackson.core:jackson-databind:2.15.3
1212
- com.fasterxml.woodstox:woodstox-core:5.4.0
13-
- com.github.pjfanning:jersey-json:1.20
1413
- com.google.guava:failureaccess:1.0
1514
- com.google.guava:guava:27.0-jre
1615
- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
1716
- com.google.j2objc:j2objc-annotations:1.1
18-
- com.sun.xml.bind:jaxb-impl:2.2.3-1
1917
- commons-beanutils:commons-beanutils:1.9.4
2018
- commons-collections:commons-collections:3.2.2
2119
- commons-io:commons-io:2.14.0
@@ -74,4 +72,10 @@ See bundled license files for details.
7472
This project bundles the following dependencies under EDL 1.0 License (https://www.eclipse.org/org/documents/edl-v10.php).
7573
See bundled license files for details.
7674

75+
- com.sun.xml.bind:jaxb-impl:2.2.3-1
7776
- jakarta.activation:jakarta.activation-api:1.2.1
77+
78+
This project bundles the following dependencies under the CDDL 1.1 license.
79+
See bundled license files for details.
80+
81+
- com.github.pjfanning:jersey-json:1.20

fluss-filesystems/fluss-fs-obs/src/main/resources/META-INF/NOTICE

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ The Apache Software Foundation (http://www.apache.org/).
66

77
This project bundles the following dependencies under the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
88

9-
- com.github.pjfanning:jersey-json:1.20
109
- com.google.guava:guava:27.0-jre
1110
- com.google.guava:failureaccess:1.0
1211
- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
@@ -15,7 +14,6 @@ This project bundles the following dependencies under the Apache Software Licens
1514
- com.huaweicloud:esdk-obs-java:3.24.12
1615
- com.huaweicloud.sdk:huaweicloud-sdk-iam:3.1.87
1716
- com.fasterxml.woodstox:woodstox-core:5.4.0
18-
- com.sun.xml.bind:jaxb-impl:2.2.3-1
1917
- commons-beanutils:commons-beanutils:1.9.4
2018
- commons-collections:commons-collections:3.2.2
2119
- commons-io:commons-io:2.14.0
@@ -71,4 +69,10 @@ This project bundles the following dependencies under the Apache Software Licens
7169
This project bundles the following dependencies under the CDDL 1.1 license.
7270
See bundled license files for details.
7371

72+
- com.github.pjfanning:jersey-json:1.20
7473
- javax.xml.bind:jaxb-api:2.3.1
74+
75+
This project bundles the following dependencies under EDL 1.0 License (https://www.eclipse.org/org/documents/edl-v10.php).
76+
See bundled license files for details.
77+
78+
- com.sun.xml.bind:jaxb-impl:2.2.3-1

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ This project bundles the following dependencies under the Apache Software Licens
1414
- com.fasterxml.jackson.core:jackson-core:2.15.3
1515
- com.fasterxml.jackson.core:jackson-databind:2.15.3
1616
- com.fasterxml.woodstox:woodstox-core:5.4.0
17-
- com.github.pjfanning:jersey-json:1.20
1817
- com.google.code.gson:gson:2.8.6
1918
- com.google.guava:failureaccess:1.0
2019
- com.google.guava:guava:27.0-jre
2120
- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
2221
- com.google.j2objc:j2objc-annotations:1.1
2322
- com.google.re2j:re2j:1.1
24-
- com.sun.xml.bind:jaxb-impl:2.2.3-1
2523
- commons-beanutils:commons-beanutils:1.9.4
2624
- commons-collections:commons-collections:3.2.2
2725
- commons-io:commons-io:2.14.0
@@ -79,4 +77,10 @@ See bundled license files for details.
7977
This project bundles the following dependencies under the CDDL 1.1 license.
8078
See bundled license files for details.
8179

80+
- com.github.pjfanning:jersey-json:1.20
8281
- javax.xml.bind:jaxb-api:2.3.1
82+
83+
This project bundles the following dependencies under EDL 1.0 License (https://www.eclipse.org/org/documents/edl-v10.php).
84+
See bundled license files for details.
85+
86+
- com.sun.xml.bind:jaxb-impl:2.2.3-1

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,10 @@ This project bundles the following dependencies under the Apache Software Licens
1414
- com.fasterxml.jackson.core:jackson-databind:2.15.3
1515
- com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.15.3
1616
- com.fasterxml.woodstox:woodstox-core:5.4.0
17-
- com.github.pjfanning:jersey-json:1.20
1817
- com.google.guava:failureaccess:1.0
1918
- com.google.guava:guava:27.0-jre
2019
- com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
2120
- com.google.j2objc:j2objc-annotations:1.1
22-
- com.sun.xml.bind:jaxb-impl:2.2.3-1
2321
- commons-beanutils:commons-beanutils:1.9.4
2422
- commons-codec:commons-codec:1.15
2523
- commons-collections:commons-collections:3.2.2
@@ -73,6 +71,7 @@ See bundled license files for details.
7371
This project bundles the following dependencies under the CDDL 1.1 license.
7472
See bundled license files for details.
7573

74+
- com.github.pjfanning:jersey-json:1.20
7675
- javax.xml.bind:jaxb-api:2.3.1
7776

7877
This project bundles the following dependencies under the Go License (https://golang.org/LICENSE).
@@ -88,4 +87,5 @@ See bundled license files for details.
8887
This project bundles the following dependencies under EDL 1.0 License (https://www.eclipse.org/org/documents/edl-v10.php).
8988
See bundled license files for details.
9089

90+
- com.sun.xml.bind:jaxb-impl:2.2.3-1
9191
- jakarta.activation:jakarta.activation-api:1.2.1

0 commit comments

Comments
 (0)