Skip to content

Commit 8d20c48

Browse files
mchadesjerryshao
andauthored
[#7279] improvement(GVFS): shade GVFS dependency jars (#7298)
### What changes were proposed in this pull request? shade gcp provider dependencies jar ### Why are the changes needed? Fix: #7279 ### Does this PR introduce _any_ user-facing change? no ### How was this patch tested? CI pass --------- Co-authored-by: Jerry Shao <[email protected]>
1 parent fc397e3 commit 8d20c48

File tree

10 files changed

+115
-27
lines changed

10 files changed

+115
-27
lines changed

bundles/aliyun-bundle/build.gradle.kts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,18 @@ tasks.withType(ShadowJar::class.java) {
4444
}
4545

4646
// Relocate dependencies to avoid conflicts
47-
relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
48-
relocate("org.apache.commons.lang3", "org.apache.gravitino.aliyun.shaded.org.apache.commons.lang3")
4947
relocate("com.fasterxml.jackson", "org.apache.gravitino.aliyun.shaded.com.fasterxml.jackson")
50-
relocate("com.google.common", "org.apache.gravitino.aliyun.shaded.com.google.common")
48+
relocate("com.google", "org.apache.gravitino.aliyun.shaded.com.google")
49+
relocate("com.sun", "org.apache.gravitino.aliyun.shaded.com.sun")
50+
relocate("okhttp3", "org.apache.gravitino.aliyun.shaded.okhttp3")
51+
relocate("okio", "org.apache.gravitino.aliyun.shaded.okio")
52+
relocate("org.apache.commons", "org.apache.gravitino.aliyun.shaded.org.apache.commons")
5153
relocate("org.apache.http", "org.apache.gravitino.aliyun.shaded.org.apache.http")
52-
relocate("org.apache.commons.collections", "org.apache.gravitino.aliyun.shaded.org.apache.commons.collections")
54+
relocate("org.checkerframework", "org.apache.gravitino.aliyun.shaded.org.checkerframework")
55+
relocate("org.jacoco.agent.rt", "org.apache.gravitino.aliyun.shaded.org.jacoco.agent.rt")
56+
relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
57+
58+
mergeServiceFiles()
5359
}
5460

5561
tasks.jar {

bundles/aliyun/build.gradle.kts

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,19 @@ tasks.withType(ShadowJar::class.java) {
7979
}
8080

8181
// Relocate dependencies to avoid conflicts
82-
relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
83-
relocate("org.apache.commons.lang3", "org.apache.gravitino.aliyun.shaded.org.apache.commons.lang3")
82+
relocate("com.aliyun", "org.apache.gravitino.aliyun.shaded.com.aliyun")
8483
relocate("com.fasterxml.jackson", "org.apache.gravitino.aliyun.shaded.com.fasterxml.jackson")
85-
relocate("com.google.common", "org.apache.gravitino.aliyun.shaded.com.google.common")
84+
relocate("com.google", "org.apache.gravitino.aliyun.shaded.com.google.common")
85+
relocate("com.sun", "org.apache.gravitino.aliyun.shaded.com.sun")
86+
relocate("okhttp3", "org.apache.gravitino.aliyun.shaded.okhttp3")
87+
relocate("okio", "org.apache.gravitino.aliyun.shaded.okio")
88+
relocate("org.apache.commons", "org.apache.gravitino.aliyun.shaded.org.apache.commons")
8689
relocate("org.apache.http", "org.apache.gravitino.aliyun.shaded.org.apache.http")
87-
relocate("org.apache.commons.collections", "org.apache.gravitino.aliyun.shaded.org.apache.commons.collections")
90+
relocate("org.checkerframework", "org.apache.gravitino.aliyun.shaded.org.checkerframework")
91+
relocate("org.jacoco.agent.rt", "org.apache.gravitino.aliyun.shaded.org.jacoco.agent.rt")
92+
relocate("org.jdom", "org.apache.gravitino.aliyun.shaded.org.jdom")
93+
94+
mergeServiceFiles()
8895
}
8996

9097
tasks.jar {

bundles/aws-bundle/build.gradle.kts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
*
1212
* Unless required by applicable law or agreed to in writing,
1313
* software distributed under the License is distributed on an
14-
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
15+
* OF ANY
1516
* KIND, either express or implied. See the License for the
1617
* specific language governing permissions and limitations
1718
* under the License.
@@ -40,9 +41,18 @@ tasks.withType(ShadowJar::class.java) {
4041
exclude(dependency("org.slf4j:slf4j-api"))
4142
}
4243

43-
relocate("org.apache.commons.lang3", "org.apache.gravitino.aws.shaded.org.apache.commons.lang3")
44-
relocate("com.google.common", "org.apache.gravitino.aws.shaded.com.google.common")
4544
relocate("com.fasterxml.jackson", "org.apache.gravitino.aws.shaded.com.fasterxml.jackson")
45+
relocate("com.google.common", "org.apache.gravitino.aws.shaded.com.google.common")
46+
relocate("com.google.errorprone", "org.apache.gravitino.aws.shaded.com.google.errorprone")
47+
relocate("com.google.thirdparty", "org.apache.gravitino.aws.shaded.com.google.thirdparty")
48+
relocate("io.netty", "org.apache.gravitino.aws.shaded.io.netty")
49+
relocate("org.apache.commons", "org.apache.gravitino.aws.shaded.org.apache.commons")
50+
relocate("org.apache.http", "org.apache.gravitino.aws.shaded.org.apache.http")
51+
relocate("org.checkerframework", "org.apache.gravitino.aws.shaded.org.checkerframework")
52+
relocate("org.reactivestreams", "org.apache.gravitino.aws.shaded.org.reactivestreams")
53+
relocate("org.wildfly.openssl", "org.apache.gravitino.aws.shaded.org.wildfly.openssl")
54+
relocate("software.amazon", "org.apache.gravitino.aws.shaded.software.amazon")
55+
4656
mergeServiceFiles()
4757
}
4858

bundles/aws/build.gradle.kts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,21 @@ tasks.withType(ShadowJar::class.java) {
6363
exclude(dependency("org.slf4j:slf4j-api"))
6464
}
6565

66-
relocate("org.apache.commons.lang3", "org.apache.gravitino.aws.shaded.org.apache.commons.lang3")
67-
relocate("com.google.common", "org.apache.gravitino.aws.shaded.com.google.common")
66+
relocate("com.amazonaws", "org.apache.gravitino.aws.shaded.com.amazonaws")
6867
relocate("com.fasterxml.jackson", "org.apache.gravitino.aws.shaded.com.fasterxml.jackson")
68+
relocate("com.google.common", "org.apache.gravitino.aws.shaded.com.google.common")
69+
relocate("com.google.errorprone", "org.apache.gravitino.aws.shaded.com.google.errorprone")
70+
relocate("com.google.thirdparty", "org.apache.gravitino.aws.shaded.com.google.thirdparty")
71+
relocate("io.netty", "org.apache.gravitino.aws.shaded.io.netty")
72+
relocate("org.apache.commons", "org.apache.gravitino.aws.shaded.org.apache.commons")
73+
relocate("org.apache.hadoop.fs.s3a", "org.apache.gravitino.aws.shaded.org.apache.hadoop.fs.s3a")
74+
relocate("org.apache.http", "org.apache.gravitino.aws.shaded.org.apache.http")
75+
relocate("org.checkerframework", "org.apache.gravitino.aws.shaded.org.checkerframework")
76+
relocate("org.reactivestreams", "org.apache.gravitino.aws.shaded.org.reactivestreams")
77+
relocate("org.wildfly.openssl", "org.apache.gravitino.aws.shaded.org.wildfly.openssl")
78+
relocate("software.amazon", "org.apache.gravitino.aws.shaded.software.amazon")
79+
80+
mergeServiceFiles()
6981
}
7082

7183
tasks.jar {

bundles/azure-bundle/build.gradle.kts

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,24 @@ tasks.withType(ShadowJar::class.java) {
4141
}
4242

4343
// Relocate dependencies to avoid conflicts
44-
relocate("org.apache.httpcomponents", "org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
45-
relocate("org.apache.commons", "org.apache.gravitino.azure.shaded.org.apache.commons")
44+
relocate("com.ctc.wstx", "org.apache.gravitino.azure.shaded.com.ctc.wstx")
4645
relocate("com.fasterxml", "org.apache.gravitino.azure.shaded.com.fasterxml")
47-
relocate("com.google.common", "org.apache.gravitino.azure.shaded.com.google.common")
46+
relocate("com.google", "org.apache.gravitino.azure.shaded.com.google")
47+
relocate("com.microsoft.aad", "org.apache.gravitino.azure.shaded.com.microsoft.aad")
48+
relocate("com.nimbusds", "org.apache.gravitino.azure.shaded.com.nimbusds")
49+
relocate("com.sun", "org.apache.gravitino.azure.shaded.com.sun")
50+
relocate("io.netty", "org.apache.gravitino.azure.shaded.io.netty")
51+
relocate("net.minidev", "org.apache.gravitino.azure.shaded.net.minidev")
52+
relocate("net.jcip.annotations", "org.apache.gravitino.azure.shaded.net.jcip.annotations")
53+
relocate("org.apache.commons", "org.apache.gravitino.azure.shaded.org.apache.commons")
54+
relocate("org.apache.httpcomponents", "org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
55+
relocate("org.checkerframework", "org.apache.gravitino.azure.shaded.org.checkerframework")
56+
relocate("org.codehaus.stax2", "org.apache.gravitino.azure.shaded.org.codehaus.stax2")
4857
relocate("org.eclipse.jetty", "org.apache.gravitino.azure.shaded.org.eclipse.jetty")
58+
relocate("org.objectweb.asm", "org.apache.gravitino.azure.shaded.org.objectweb.asm")
59+
relocate("org.reactivestreams", "org.apache.gravitino.azure.shaded.org.reactivestreams")
60+
relocate("reactor", "org.apache.gravitino.azure.shaded.reactor")
61+
4962
mergeServiceFiles()
5063
}
5164

bundles/azure/build.gradle.kts

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,26 @@ tasks.withType(ShadowJar::class.java) {
6464
}
6565

6666
// Relocate dependencies to avoid conflicts
67-
relocate("org.apache.httpcomponents", "org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
68-
relocate("org.apache.commons", "org.apache.gravitino.azure.shaded.org.apache.commons")
67+
relocate("com.azure", "org.apache.gravitino.azure.shaded.com.azure")
68+
relocate("com.ctc.wstx", "org.apache.gravitino.azure.shaded.com.ctc.wstx")
6969
relocate("com.fasterxml", "org.apache.gravitino.azure.shaded.com.fasterxml")
70-
relocate("com.google.common", "org.apache.gravitino.azure.shaded.com.google.common")
70+
relocate("com.google", "org.apache.gravitino.azure.shaded.com.google.common")
71+
relocate("com.microsoft.aad", "org.apache.gravitino.azure.shaded.com.microsoft.aad")
72+
relocate("com.nimbusds", "org.apache.gravitino.azure.shaded.com.nimbusds")
73+
relocate("com.sun", "org.apache.gravitino.azure.shaded.com.sun")
74+
relocate("io.netty", "org.apache.gravitino.azure.shaded.io.netty")
75+
relocate("net.minidev", "org.apache.gravitino.azure.shaded.net.minidev")
76+
relocate("net.jcip.annotations", "org.apache.gravitino.azure.shaded.net.jcip.annotations")
77+
relocate("org.apache.commons", "org.apache.gravitino.azure.shaded.org.apache.commons")
78+
relocate("org.apache.httpcomponents", "org.apache.gravitino.azure.shaded.org.apache.httpcomponents")
79+
relocate("org.checkerframework", "org.apache.gravitino.azure.shaded.org.checkerframework")
80+
relocate("org.codehaus.stax2", "org.apache.gravitino.azure.shaded.org.codehaus.stax2")
7181
relocate("org.eclipse.jetty", "org.apache.gravitino.azure.shaded.org.eclipse.jetty")
82+
relocate("org.objectweb.asm", "org.apache.gravitino.azure.shaded.org.objectweb.asm")
83+
relocate("org.reactivestreams", "org.apache.gravitino.azure.shaded.org.reactivestreams")
84+
relocate("reactor", "org.apache.gravitino.azure.shaded.reactor")
85+
86+
mergeServiceFiles()
7287
}
7388

7489
tasks.jar {

bundles/gcp-bundle/build.gradle.kts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,22 @@ tasks.withType(ShadowJar::class.java) {
4242

4343
// Relocate dependencies to avoid conflicts
4444
relocate("com.fasterxml", "org.apache.gravitino.gcp.shaded.com.fasterxml")
45-
relocate("com.google.api", "org.apache.gravitino.gcp.shaded.com.google.api")
46-
relocate("com.google.auth", "org.apache.gravitino.gcp.shaded.com.google.auth")
45+
relocate("com.google.auto", "org.apache.gravitino.gcp.shaded.com.google.auto")
4746
relocate("com.google.common", "org.apache.gravitino.gcp.shaded.com.google.common")
48-
relocate("com.google.iam", "org.apache.gravitino.gcp.shaded.com.google.iam")
47+
relocate("com.google.errorprone", "org.apache.gravitino.gcp.shaded.com.google.errorprone")
48+
relocate("com.google.gson", "org.apache.gravitino.gcp.shaded.com.google.gson")
49+
relocate("com.google.j2objc", "org.apache.gravitino.gcp.shaded.com.google.j2objc")
4950
relocate("com.google.longrunning", "org.apache.gravitino.gcp.shaded.com.google.longrunning")
5051
relocate("com.google.protobuf", "org.apache.gravitino.gcp.shaded.com.google.protobuf")
52+
relocate("com.google.thirdparty", "org.apache.gravitino.gcp.shaded.com.google.thirdparty")
5153
relocate("io.grpc", "org.apache.gravitino.gcp.shaded.io.grpc")
52-
54+
relocate("io.opencensus", "org.apache.gravitino.gcp.shaded.io.opencensus")
5355
relocate("org.apache.commons", "org.apache.gravitino.gcp.shaded.org.apache.commons")
56+
relocate("org.apache.http", "org.apache.gravitino.gcp.shaded.org.apache.http")
5457
relocate("org.apache.httpcomponents", "org.apache.gravitino.gcp.shaded.org.apache.httpcomponents")
58+
relocate("org.checkerframework", "org.apache.gravitino.gcp.shaded.org.checkerframework")
5559
relocate("org.eclipse.jetty", "org.apache.gravitino.gcp.shaded.org.eclipse.jetty")
60+
5661
mergeServiceFiles()
5762
}
5863

bundles/gcp/build.gradle.kts

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,27 @@ tasks.withType(ShadowJar::class.java) {
6363
}
6464

6565
// Relocate dependencies to avoid conflicts
66-
relocate("org.apache.httpcomponents", "org.apache.gravitino.gcp.shaded.org.apache.httpcomponents")
67-
relocate("org.apache.commons", "org.apache.gravitino.gcp.shaded.org.apache.commons")
68-
relocate("com.google.common", "org.apache.gravitino.gcp.shaded.com.google.common")
6966
relocate("com.fasterxml", "org.apache.gravitino.gcp.shaded.com.fasterxml")
70-
relocate("com.fasterxml.jackson", "org.apache.gravitino.gcp.shaded.com.fasterxml.jackson")
67+
relocate("com.google.api", "org.apache.gravitino.gcp.shaded.com.google.api")
68+
relocate("com.google.auth", "org.apache.gravitino.gcp.shaded.com.google.auth")
69+
relocate("com.google.auto", "org.apache.gravitino.gcp.shaded.com.google.auto")
70+
relocate("com.google.common", "org.apache.gravitino.gcp.shaded.com.google.common")
71+
relocate("com.google.errorprone", "org.apache.gravitino.gcp.shaded.com.google.errorprone")
72+
relocate("com.google.gson", "org.apache.gravitino.gcp.shaded.com.google.gson")
73+
relocate("com.google.iam", "org.apache.gravitino.gcp.shaded.com.google.iam")
74+
relocate("com.google.j2objc", "org.apache.gravitino.gcp.shaded.com.google.j2objc")
75+
relocate("com.google.longrunning", "org.apache.gravitino.gcp.shaded.com.google.longrunning")
76+
relocate("com.google.protobuf", "org.apache.gravitino.gcp.shaded.com.google.protobuf")
77+
relocate("com.google.thirdparty", "org.apache.gravitino.gcp.shaded.com.google.thirdparty")
78+
relocate("io.grpc", "org.apache.gravitino.gcp.shaded.io.grpc")
79+
relocate("io.opencensus", "org.apache.gravitino.gcp.shaded.io.opencensus")
80+
relocate("org.apache.commons", "org.apache.gravitino.gcp.shaded.org.apache.commons")
81+
relocate("org.apache.http", "org.apache.gravitino.gcp.shaded.org.apache.http")
82+
relocate("org.apache.httpcomponents", "org.apache.gravitino.gcp.shaded.org.apache.httpcomponents")
83+
relocate("org.checkerframework", "org.apache.gravitino.gcp.shaded.org.checkerframework")
84+
relocate("org.eclipse.jetty", "org.apache.gravitino.gcp.shaded.org.eclipse.jetty")
85+
86+
mergeServiceFiles()
7187
}
7288

7389
tasks.jar {

clients/client-java-runtime/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ tasks.withType<ShadowJar>(ShadowJar::class.java) {
4747
relocate("org.apache.httpcomponents", "org.apache.gravitino.shaded.org.apache.httpcomponents")
4848
relocate("org.apache.commons", "org.apache.gravitino.shaded.org.apache.commons")
4949
relocate("org.antlr", "org.apache.gravitino.shaded.org.antlr")
50+
51+
mergeServiceFiles()
5052
}
5153

5254
tasks.jar {

clients/filesystem-hadoop3-runtime/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ tasks.withType<ShadowJar>(ShadowJar::class.java) {
4343
relocate("com.github.benmanes.caffeine", "org.apache.gravitino.shaded.com.github.benmanes.caffeine")
4444
// relocate common lang3 package
4545
relocate("org.apache.commons.lang3", "org.apache.gravitino.shaded.org.apache.commons.lang3")
46+
relocate("org.apache.hc", "org.apache.gravitino.shaded.org.apache.hc")
47+
relocate("org.checkerframework", "org.apache.gravitino.shaded.org.checkerframework")
4648

4749
mergeServiceFiles()
4850
}

0 commit comments

Comments
 (0)