Don't relocate libraries that are available in spigot

This commit is contained in:
games647 2016-02-10 22:22:53 +01:00
parent ee962bce11
commit 0cb0bbcd37

22
pom.xml
View File

@ -155,17 +155,17 @@
<shadedPattern>fr.xephi.authme.libs.apache</shadedPattern> <shadedPattern>fr.xephi.authme.libs.apache</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>javax</pattern> <pattern>javax.mail</pattern>
<shadedPattern>fr.xephi.authme.libs.javax</shadedPattern> <shadedPattern>fr.xephi.authme.libs.javax.mail</shadedPattern>
</relocation>
<relocation>
<pattern>javax.activation</pattern>
<shadedPattern>fr.xephi.authme.libs.javax.activation</shadedPattern>
</relocation> </relocation>
<relocation> <relocation>
<pattern>com.sun</pattern> <pattern>com.sun</pattern>
<shadedPattern>fr.xephi.authme.libs.sun</shadedPattern> <shadedPattern>fr.xephi.authme.libs.sun</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>fr.xephi.authme.libs.google</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>com.zaxxer.hikari</pattern> <pattern>com.zaxxer.hikari</pattern>
<shadedPattern>fr.xephi.authme.libs.hikari</shadedPattern> <shadedPattern>fr.xephi.authme.libs.hikari</shadedPattern>
@ -192,12 +192,13 @@
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<outputFile>target/${jarName}-spigot.jar</outputFile>
<artifactSet> <artifactSet>
<excludes> <excludes>
<exclude>com.google.guava:guava</exclude> <exclude>com.google.guava:guava</exclude>
<exclude>com.google.code.gson:gson</exclude>
</excludes> </excludes>
</artifactSet> </artifactSet>
<outputFile>target/${jarName}-spigot.jar</outputFile>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -207,12 +208,17 @@
<goal>shade</goal> <goal>shade</goal>
</goals> </goals>
<configuration> <configuration>
<relocations>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>fr.xephi.authme.libs.google</shadedPattern>
</relocation>
</relocations>
<outputFile>target/${jarName}-legacy.jar</outputFile> <outputFile>target/${jarName}-legacy.jar</outputFile>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>