GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Don't shade any Google dependency

Browse source 
All server platforms have modern enough Google dependencies that nothing should break. Tested with Velocity, BungeeCord, Spigot 1.12.2/1.16.5/1.17.1.
This commit is contained in:
Camotoy 2021-09-26 20:54:44 -04:00
parent 0438aa4709
commit 43bef851c7
No known key found for this signature in database
GPG key ID: 7EEFB66FE798081F
3 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bootstrap/bungeecord/pom.xml
View file

@ -72,14 +72,6 @@
<pattern>io.netty.channel.kqueue</pattern> <pattern>io.netty.channel.kqueue</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.io.netty.channel.kqueue</shadedPattern> <shadedPattern>org.geysermc.platform.bungeecord.shaded.io.netty.channel.kqueue</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.guava</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.google.guava</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>net.kyori</pattern> <pattern>net.kyori</pattern>
<shadedPattern>org.geysermc.platform.bungeecord.shaded.kyori</shadedPattern> <shadedPattern>org.geysermc.platform.bungeecord.shaded.kyori</shadedPattern>
@ -91,7 +83,7 @@
<configuration> <configuration>
<artifactSet> <artifactSet>
<excludes> <excludes>
<exclude>com.google.code.gson:*</exclude> <exclude>com.google.*:*</exclude>
<exclude>org.yaml:*</exclude> <exclude>org.yaml:*</exclude>
<exclude>io.netty:netty-transport-native-epoll:*</exclude> <exclude>io.netty:netty-transport-native-epoll:*</exclude>
<exclude>io.netty:netty-transport-native-unix-common:*</exclude> <exclude>io.netty:netty-transport-native-unix-common:*</exclude>

10
bootstrap/spigot/pom.xml
View file

@ -83,14 +83,6 @@
<pattern>com.fasterxml.jackson</pattern> <pattern>com.fasterxml.jackson</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.jackson</shadedPattern> <shadedPattern>org.geysermc.platform.spigot.shaded.jackson</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.guava</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.google.guava</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>net.kyori</pattern> <pattern>net.kyori</pattern>
<shadedPattern>org.geysermc.platform.spigot.shaded.kyori</shadedPattern> <shadedPattern>org.geysermc.platform.spigot.shaded.kyori</shadedPattern>
@ -106,7 +98,7 @@
<configuration> <configuration>
<artifactSet> <artifactSet>
<excludes> <excludes>
<exclude>com.google.code.gson:*</exclude> <exclude>com.google.*:*</exclude>
<exclude>org.yaml:*</exclude> <exclude>org.yaml:*</exclude>
<!-- We cannot shade Netty, or else native libraries will not load --> <!-- We cannot shade Netty, or else native libraries will not load -->
<!-- Needed because older Spigot builds do not provide the haproxy module --> <!-- Needed because older Spigot builds do not provide the haproxy module -->

10
bootstrap/velocity/pom.xml
View file

@ -65,14 +65,6 @@
<pattern>it.unimi.dsi.fastutil</pattern> <pattern>it.unimi.dsi.fastutil</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern> <shadedPattern>org.geysermc.platform.velocity.shaded.fastutil</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.google.common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.guava</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.google.guava</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>net.kyori.adventure.text.serializer.gson.legacyimpl</pattern> <pattern>net.kyori.adventure.text.serializer.gson.legacyimpl</pattern>
<shadedPattern>org.geysermc.platform.velocity.shaded.kyori.legacyimpl</shadedPattern> <shadedPattern>org.geysermc.platform.velocity.shaded.kyori.legacyimpl</shadedPattern>
@ -84,7 +76,7 @@
<configuration> <configuration>
<artifactSet> <artifactSet>
<excludes> <excludes>
<exclude>com.google.code.gson:*</exclude> <exclude>com.google.*:*</exclude>
<!-- Needed because Velocity provides every dependency except netty-resolver-dns --> <!-- Needed because Velocity provides every dependency except netty-resolver-dns -->
<exclude>io.netty:netty-transport-native-epoll:*</exclude> <exclude>io.netty:netty-transport-native-epoll:*</exclude>
<exclude>io.netty:netty-transport-native-unix-common:*</exclude> <exclude>io.netty:netty-transport-native-unix-common:*</exclude>