Upstream/PurpleIRC-spigot
1
0
Fork 0
mirror of https://github.com/cnaude/PurpleIRC-spigot.git synced 2025-01-07 16:27:43 +01:00
Code Issues Projects Releases Wiki Activity

Dependency fixes and relocations.

Browse Source
This commit is contained in:
cnaude 2015-06-23 19:19:22 -07:00
parent 4e9fb80944
commit 468c2474ba
3 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dependency-reduced-pom.xml
View File

@ -46,32 +46,22 @@
<artifactSet>
<includes>
<include>com.cnaude.pircbotx</include>
<include>org.pircbotx</include>
<include>org.slf4j</include>
<include>org.apache.commons</include>
<include>commons-codec</include>
</includes>
</artifactSet>
<filters />
<relocations>
<relocation>
<pattern>com.cnaude.pircbotx</pattern>
<shadedPattern>com.cnaude.pircbotx</shadedPattern>
</relocation>
<relocation>
<pattern>org.pircbotx</pattern>
<shadedPattern>org.pircbotx</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>org.slf4j</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j.impl</pattern>
<shadedPattern>org.slf4j.impl</shadedPattern>
<shadedPattern>com.cnaude.purpleirc.ext.org.pircbotx</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.lang3</pattern>
<shadedPattern>org.apache.commons.lang3</shadedPattern>
<shadedPattern>com.cnaude.purpleirc.ext.org.apache.commons.lang3</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.codec</pattern>
<shadedPattern>com.cnaude.purpleirc.ext.org.apache.commons.codec</shadedPattern>
</relocation>
</relocations>
</configuration>

43
pom.xml
View File

@ -96,9 +96,15 @@
<!-- PircBotX -->
<dependency>
<groupId>com.cnaude.pircbotx</groupId>
<artifactId>pircbotx</artifactId>
<artifactId>pircbotx-shaded</artifactId>
<version>2.1.6</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.10</version>
</dependency>
<!-- Following dependency is provided by CraftBukkit -->
<dependency>
@ -262,14 +268,7 @@
<artifactId>CleverNotch</artifactId>
<version>1.1-RELEASE</version>
</dependency>
<!-- slf4j (used by PircBotX) -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.7.5</version>
</dependency>
<!-- DeathMessages -->
<dependency>
<groupId>com.cnaude.deathmessages</groupId>
@ -385,34 +384,24 @@
<minimizeJar>true</minimizeJar>
<artifactSet>
<includes>
<include>com.cnaude.pircbotx</include>
<include>org.pircbotx</include>
<include>org.slf4j</include>
<include>org.apache.commons</include>
<include>com.cnaude.pircbotx</include>
<include>commons-codec</include>
</includes>
</artifactSet>
<filters>
</filters>
<relocations>
<relocation>
<pattern>com.cnaude.pircbotx</pattern>
<shadedPattern>com.cnaude.pircbotx</shadedPattern>
</relocation>
<relocation>
<pattern>org.pircbotx</pattern>
<shadedPattern>org.pircbotx</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j</pattern>
<shadedPattern>org.slf4j</shadedPattern>
</relocation>
<relocation>
<pattern>org.slf4j.impl</pattern>
<shadedPattern>org.slf4j.impl</shadedPattern>
<shadedPattern>com.cnaude.purpleirc.ext.org.pircbotx</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.lang3</pattern>
<shadedPattern>org.apache.commons.lang3</shadedPattern>
<shadedPattern>com.cnaude.purpleirc.ext.org.apache.commons.lang3</shadedPattern>
</relocation>
<relocation>
<pattern>org.apache.commons.codec</pattern>
<shadedPattern>com.cnaude.purpleirc.ext.org.apache.commons.codec</shadedPattern>
</relocation>
</relocations>
</configuration>

2
src/main/java/com/cnaude/purpleirc/CommandHandlers.java
View File

@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import net.md_5.bungee.api.ChatColor;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;