Upstream/AuthMeReloaded
1
0
Fork 0
mirror of https://github.com/AuthMe/AuthMeReloaded.git synced 2024-09-17 09:24:25 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
DNx5 2015-09-14 19:01:12 +07:00
commit 8701733b30
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pom.xml
View File

@ -177,12 +177,6 @@
<url>http://repo.mcstats.org/content/repositories/snapshots/</url> <url>http://repo.mcstats.org/content/repositories/snapshots/</url>
</repository> </repository>
<!-- sgdc3 HikariCP Log4J Repo -->
<repository>
<id>hikaricp-log4j-releases</id>
<url>http://nexus-sgdc3.rhcloud.com/nexus/content/repositories/hikaricp-log4j-releases/</url>
</repository>
</repositories> </repositories>
<dependencies> <dependencies>
@ -195,12 +189,12 @@
<artifactId>HikariCP</artifactId> <artifactId>HikariCP</artifactId>
<version>2.4.1</version> <version>2.4.1</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> <exclusions>
<dependency> <exclusion>
<groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId>
<artifactId>slf4j-api</artifactId> <groupId>org.slf4j</groupId>
<version>1.7.12</version> </exclusion>
<scope>compile</scope> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -229,6 +223,12 @@
<artifactId>javax.mail</artifactId> <artifactId>javax.mail</artifactId>
<version>1.5.4</version> <version>1.5.4</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions>
<exclusion>
<artifactId>activation</artifactId>
<groupId>javax.activation</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>