Skip to content

Commit cccd483

Browse files
committed
Add extra package relocations for standlone agent (#488)
1 parent d885e27 commit cccd483

File tree

1 file changed

+16
-1
lines changed

1 file changed

+16
-1
lines changed

spark-standalone-agent/build.gradle

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ dependencies {
1212
}
1313
implementation 'org.slf4j:slf4j-simple:2.0.16'
1414
implementation 'com.google.code.gson:gson:2.9.0'
15-
implementation 'com.google.guava:guava:31.1-jre'
15+
implementation('com.google.guava:guava:31.1-jre') {
16+
exclude(module: 'jsr305')
17+
exclude(module: 'error_prone_annotations')
18+
exclude(module: 'failureaccess')
19+
exclude(module: 'listenablefuture')
20+
exclude(module: 'j2objc-annotations')
21+
exclude(module: 'checker-qual')
22+
}
1623

1724
implementation 'org.jline:jline-remote-ssh:3.28.0'
1825
implementation 'org.apache.sshd:sshd-core:2.14.0'
@@ -44,6 +51,7 @@ shadowJar {
4451
relocate 'net.kyori.adventure', 'me.lucko.spark.lib.adventure'
4552
relocate 'net.kyori.examination', 'me.lucko.spark.lib.adventure.examination'
4653
relocate 'net.kyori.option', 'me.lucko.spark.lib.adventure.option'
54+
relocate 'net.kyori.ansi', 'me.lucko.spark.lib.adventure.ansi'
4755
relocate 'net.bytebuddy', 'me.lucko.spark.lib.bytebuddy'
4856
relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
4957
relocate 'org.objectweb.asm', 'me.lucko.spark.lib.asm'
@@ -52,8 +60,15 @@ shadowJar {
5260
relocate 'org.java_websocket', 'me.lucko.spark.lib.bytesocks.ws'
5361
relocate 'com.google.gson', 'me.lucko.spark.lib.gson'
5462
relocate 'com.google.common', 'me.lucko.spark.lib.guava'
63+
relocate 'com.google.errorprone', 'me.lucko.spark.lib.google.errorprone'
64+
relocate 'com.google.j2objc', 'me.lucko.spark.lib.google.j2objc'
65+
relocate 'com.google.thirdparty', 'me.lucko.spark.lib.google.thirdparty'
66+
relocate 'org.apache.sshd', 'me.lucko.spark.lib.sshd'
67+
relocate 'org.jline.builtins.ssh', 'me.lucko.spark.lib.jline.builtins.ssh'
5568

5669
project.applyExcludes(delegate)
70+
71+
exclude 'META-INF/services/java.nio.file.spi.FileSystemProvider'
5772
}
5873

5974
artifacts {

0 commit comments

Comments
 (0)