SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the standard 1.7.10 Netty version, not newer

Browse Source
This commit is contained in:
Zach Brown
2014-07-09 18:17:21 -05:00
parent 2d830e5a1c
commit 394581d97b
3 changed files with 2 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

Submodule Bukkit updated: 677e082bc1...22d5465ee9

2
CraftBukkit

Submodule CraftBukkit updated: bc14645b6f...aae615536d

24
MinecraftServer/pom.xml
View File

@@ -30,12 +30,6 @@
<version>1.7.10</version> <version>1.7.10</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>4.0.21.Final</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
@@ -52,24 +46,6 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration>
<filters>
<!-- Exclude old Netty version -->
<filter>
<artifact>org.bukkit:minecraft-server</artifact>
<excludes>
<exclude>net/minecraft/util/io/netty/**</exclude>
</excludes>
</filter>
</filters>
<relocations>
<!-- Relocate new version to the correct place -->
<relocation>
<pattern>io.netty</pattern>
<shadedPattern>net.minecraft.util.io.netty</shadedPattern>
</relocation>
</relocations>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>