core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the standard 1.7.10 Netty version, not newer

This commit is contained in:
Zach Brown 2014-07-09 18:17:21 -05:00
parent 832f7ad2c3
commit 44a7935503
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Bukkit

@ -1 +1 @@
Subproject commit 677e082bc10ca217e21dee06424bb8044730b340 Subproject commit 22d5465ee9fab9284a70289e043c882a16e2656f

2
CraftBukkit

@ -1 +1 @@
Subproject commit bc14645b6f7442af6bb819098a2dcbde582ce923 Subproject commit aae615536dc048630301297aaed98d84d9aad27e

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>