Spaces please! + we need to shade gson because we are using version 2.5, bukkit's one is 2.2.4 (api conflicts)!

This commit is contained in:
Gabriele C 2016-02-10 22:43:28 +01:00
parent 7dc67d7992
commit e1b7303f61

14
pom.xml
View File

@ -137,7 +137,6 @@
<target>${javaVersion}</target> <target>${javaVersion}</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
@ -182,6 +181,10 @@
<pattern>net.ricecode.similarity</pattern> <pattern>net.ricecode.similarity</pattern>
<shadedPattern>fr.xephi.authme.libs.similarity</shadedPattern> <shadedPattern>fr.xephi.authme.libs.similarity</shadedPattern>
</relocation> </relocation>
<relocation>
<pattern>com.google</pattern>
<shadedPattern>fr.xephi.authme.libs.google</shadedPattern>
</relocation>
</relocations> </relocations>
</configuration> </configuration>
<executions> <executions>
@ -195,7 +198,6 @@
<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> <outputFile>target/${jarName}-spigot.jar</outputFile>
@ -208,12 +210,6 @@
<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>
@ -232,14 +228,12 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.eluder.coveralls</groupId> <groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId> <artifactId>coveralls-maven-plugin</artifactId>
<version>4.1.0</version> <version>4.1.0</version>
<!-- Token is provided by mvn command --> <!-- Token is provided by mvn command -->
</plugin> </plugin>
<!-- Javadocs settings --> <!-- Javadocs settings -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>