Shade netty into Bukkit jar

2020-01-18 16:38:40 -06:00 · 2020-01-18 16:38:40 -06:00 · 5c7755b772
parent 2fc591e341
commit 5c7755b772
2 changed files with 7 additions and 2 deletions
--- a/bootstrap/bukkit/pom.xml
+++ b/bootstrap/bukkit/pom.xml
@ -45,6 +45,12 @@
                            <goal>shade</goal>
                        </goals>
                        <configuration>
+                            <relocations>
+                                <relocation>
+                                    <pattern>io.netty</pattern>
+                                    <shadedPattern>org.geysermc.platform.bukkit.shaded.netty</shadedPattern>
+                                </relocation>
+                            </relocations>
                            <minimizeJar>true</minimizeJar>
                        </configuration>
                    </execution>
@ -62,7 +68,6 @@
                        <excludes>
                            <exclude>com.google.code.gson:*</exclude>
                            <exclude>org.yaml:*</exclude>
-                            <exclude>io.netty:*</exclude>
                        </excludes>
                    </artifactSet>
                </configuration>
--- a/connector/src/main/resources/mappings
+++ b/connector/src/main/resources/mappings
@ -1 +1 @@
-Subproject commit b9308a64699fabb7510a05d3b270ccd6dd52b635
+Subproject commit 1ad8a19417391710d34d72214e3aa430f84740cd