Revert "Remove Fanciful, fix compilation (part 1/2)"

This reverts commit fc1d08e507.
We have users on builds before this was included in Spigot. We don't want to break those servers.
This commit is contained in:
drtshock
2015-05-25 15:46:18 -05:00
parent 1481d604d4
commit de57060819
11 changed files with 132 additions and 170 deletions

14
pom.xml
View File

@@ -44,10 +44,15 @@
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
<includes>
<include>mkremins:fanciful</include>
<include>com.google.code.gson:gson</include>
</includes>
</artifactSet>
<relocations>
<relocation>
<pattern>mkremins.fanciful</pattern>
<shadedPattern>com.massivecraft.factions.shade.mkremins.fanciful</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.gson</pattern>
<shadedPattern>com.massivecraft.factions.shade.com.google.gson</shadedPattern>
@@ -98,6 +103,11 @@
<artifactId>EssentialsXChat</artifactId>
<version>2.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>mkremins</groupId>
<artifactId>fanciful</artifactId>
<version>0.3.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.dynmap</groupId>
<artifactId>dynmap</artifactId>
@@ -138,5 +148,9 @@
<id>repo.mikeprimm.com</id>
<url>http://repo.mikeprimm.com/</url>
</repository>
<repository>
<id>franga2000-repo</id>
<url>http://repo.franga2000.com/artifactory/public</url>
</repository>
</repositories>
</project>