Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2025-02-15 11:21:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #117 from sgdc3/master

Browse Source 
Fixed duplicated mail api in the shaded jar
This commit is contained in:
Alexandre Vanhecke 2015-07-14 04:29:52 +02:00
commit 16f5e1f91e
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pom.xml
View File

@ -17,8 +17,8 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Change Compiler Version (JDK) HERE! --> <!-- Change Compiler Version (JDK) HERE! -->
<maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.source>1.7</maven.compiler.source>
<maven.compiler.target>1.6</maven.compiler.target> <maven.compiler.target>1.7</maven.compiler.target>
<!-- Change MC Version HERE! --> <!-- Change MC Version HERE! -->
<bukkitVersion>1.8.7-R0.1-SNAPSHOT</bukkitVersion> <bukkitVersion>1.8.7-R0.1-SNAPSHOT</bukkitVersion>
@ -86,7 +86,6 @@
<artifactSet> <artifactSet>
<includes> <includes>
<include>com.maxmind.geoip:*</include> <include>com.maxmind.geoip:*</include>
<include>com.sun.mail:*</include>
<include>javax.mail:*</include> <include>javax.mail:*</include>
<include>com.comphenix.attribute:*</include> <include>com.comphenix.attribute:*</include>
<include>org.mcstats.*:*</include> <include>org.mcstats.*:*</include>
@ -195,8 +194,8 @@
<!-- Java Email API --> <!-- Java Email API -->
<dependency> <dependency>
<groupId>com.sun.mail</groupId> <groupId>javax.mail</groupId>
<artifactId>javax.mail</artifactId> <artifactId>javax.mail-api</artifactId>
<version>1.5.4</version> <version>1.5.4</version>
</dependency> </dependency>