Revert last commit

pom.xml

@@ -2,41 +2,41 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-
+	
 	<groupId>fr.xephi.authme.AuthMe</groupId>
 	<artifactId>AuthMe</artifactId>
 	<version>5.0-SNAPSHOT</version>
-
+	
 	<name>AuthMeReloaded</name>
 	<description>Authentication plugin for CraftBukkit/Spigot!</description>
 	<url>http://dev.bukkit.org/bukkit-plugins/authme-reloaded/</url>
-
+	
 	<packaging>jar</packaging>
-
+	
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
+		
 		<!-- Change Compiler Version (JDK) HERE! -->
 		<maven.compiler.source>1.7</maven.compiler.source>
 		<maven.compiler.target>1.7</maven.compiler.target>
-
+		
 		<!-- Change MC Version HERE! -->
 		<bukkitVersion>1.8.7-R0.1-SNAPSHOT</bukkitVersion>
-
+		
 		<mainClass>${project.groupId}.${project.artifactId}</mainClass>
 	</properties>
-
+	
 	<!-- Official Build Server ALLERT: sometimes jenkins is offline, no panic! -->
 	<ciManagement>
 		<system>jenkins</system>
 		<url>http://ci.xephi.fr</url>
 	</ciManagement>
-
+	
 	<issueManagement>
 		<system>GitHub</system>
 		<url>https://github.com/Xephi/AuthMeReloaded/issues</url>
 	</issueManagement>
-
+	
 	<build>
 		<plugins>
 			<plugin>
@@ -48,12 +48,28 @@
 					<target>${maven.compiler.target}</target>
 				</configuration>
 			</plugin>
-			<!-- <plugin> <groupId>com.google.code.maven-replacer-plugin</groupId> 
+			<!-- <plugin>
-				<artifactId>maven-replacer-plugin</artifactId> <version>1.4.1</version> <executions> 
+				<groupId>com.google.code.maven-replacer-plugin</groupId>
-				<execution> <phase>prepare-package</phase> <goals> <goal>replace</goal> </goals> 
+				<artifactId>maven-replacer-plugin</artifactId>
-				</execution> </executions> <configuration> <file>target/classes/plugin.yml</file> 
+				<version>1.4.1</version>
-				<replacements> <replacement> <token>${version}</token> <value>${version}</value> 
+				<executions>
-				</replacement> </replacements> </configuration> </plugin> -->
+					<execution>
+						<phase>prepare-package</phase>
+						<goals>
+							<goal>replace</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<file>target/classes/plugin.yml</file>
+					<replacements>
+						<replacement>
+							<token>${version}</token>
+							<value>${version}</value>
+						</replacement>
+					</replacements>
+				</configuration>
+			</plugin> -->
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>2.6</version>
@@ -63,76 +79,54 @@
 					</archive>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>2.3</version>
-				<configuration>
-					<artifactSet>
-						<includes>
-							<include>com.maxmind.geoip:*</include>
-							<include>com.sun.mail:*</include>
-							<include>javax.mail:*</include>
-						</includes>
-					</artifactSet>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
-
+	
 	<repositories>
-
+		
 		<!-- SpigotMC Repo (Bukkit and SpigotAPI) -->
 		<repository>
 			<id>spigot-repo</id>
 			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 		</repository>
-
+		
 		<!-- Vault Repo -->
 		<repository>
 			<id>vault-repo</id>
 			<url>http://nexus.theyeticave.net/content/repositories/pub_releases</url>
 		</repository>
-
+		
 		<!-- Citizens 2.X Repo -->
 		<repository>
 			<id>everything</id>
 			<url>http://repo.citizensnpcs.co</url>
 		</repository>
-
+		
 		<!-- EssentialsX Repo -->
 		<repository>
 			<id>ess-repo</id>
 			<url>http://repo.ess3.net/content/groups/public</url>
 		</repository>
-
+		
 		<!-- CombatTagPlus Repo -->
 		<repository>
 			<id>minelink-thirdparty</id>
 			<url>http://repo.minelink.net/content/repositories/public</url>
 		</repository>
-
+		
 		<!-- CombatTag Repo, Unofficial (needs replacement) -->
 		<repository>
 			<id>techcable-repo</id>
 			<url>http://repo.techcable.net/content/repositories/snapshots/</url>
 		</repository>
-
+		
 		<!-- XAuth Repo -->
 		<repository>
 			<id>bukkit-plugins-releases</id>
 			<name>repo.luricos.de releases</name>
 			<url>http://repo.luricos.de/content/repositories/releases/</url>
 		</repository>
-
+		
 		<!-- SpoutCraft Repo -->
 		<repository>
 			<id>sonatype-nexus-releases</id>
@@ -141,51 +135,53 @@
 		<repository>
 			<id>sonatype-nexus-snapshots</id>
 			<url>https://oss.sonatype.org/content/repositories/snapshots</url>
-			<!-- <snapshots> <enabled>true</enabled> <updatePolicy>always</updatePolicy> 
+			<!-- <snapshots>
-				</snapshots> -->
+				<enabled>true</enabled>
+				<updatePolicy>always</updatePolicy>
+			</snapshots> -->
 		</repository>
 		<!-- End of Spout Repo -->
-
+		
 		<!-- Attribute Repo -->
 		<repository>
 			<id>comphenix-snapshots</id>
 			<name>Comphenix Maven Snapshots</name>
 			<url>http://repo.comphenix.net/content/repositories/snapshots/</url>
 		</repository>
-
+		
 		<!-- Multiverse Repo -->
 		<repository>
 			<id>onarandombox</id>
 			<url>http://repo.onarandombox.com/content/groups/public</url>
 		</repository>
-
+		
 	</repositories>
-
+	
 	<dependencies>
-
+		
 		<!-- Maven Dependencies -->
-
+		
 		<!-- MySql Library -->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<version>5.1.35</version>
 		</dependency>
-
+		
 		<!-- SQLite Library -->
 		<dependency>
 			<groupId>org.xerial</groupId>
 			<artifactId>sqlite-jdbc</artifactId>
 			<version>3.8.10.1</version>
 		</dependency>
-
+		
 		<!-- Database Library -->
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<version>1.4.187</version>
 		</dependency>
-
+		
 		<!-- Java Email API -->
 		<dependency>
 			<groupId>com.sun.mail</groupId>
@@ -197,14 +193,14 @@
 			<artifactId>mail</artifactId>
 			<version>1.5.0-b01</version>
 		</dependency>
-
+		
 		<!-- Maxmind GeoIp API -->
 		<dependency>
 			<groupId>com.maxmind.geoip</groupId>
 			<artifactId>geoip-api</artifactId>
 			<version>1.2.14</version>
 		</dependency>
-
+		
 		<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project, 
 			http://bukkit.org/ -->
 		<dependency>
@@ -212,7 +208,7 @@
 			<artifactId>spigot-api</artifactId>
 			<version>${bukkitVersion}</version>
 		</dependency>
-
+		
 		<dependency>
 			<groupId>com.comphenix.attribute</groupId>
 			<artifactId>AttributeStorage</artifactId>
@@ -226,9 +222,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Vault, http://dev.bukkit.org/bukkit-plugins/vault/ -->
 		<dependency>
 			<groupId>net.milkbowl.vault</groupId>
@@ -243,9 +239,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Citizens 2.X, NPC plugin, http://dev.bukkit.org/bukkit-plugins/citizens/ -->
 		<dependency>
 			<groupId>net.citizensnpcs</groupId>
@@ -260,9 +256,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Multi World plugin, http://www.spigotmc.org/resources/multiverse-core.390/ -->
 		<dependency>
 			<groupId>com.onarandombox.multiversecore</groupId>
@@ -279,9 +275,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Essentials plugin -->
 		<dependency>
 			<groupId>net.ess3</groupId>
@@ -296,9 +292,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Anti PvPLogging plugin, https://github.com/MinelinkNetwork/CombatTagPlus -->
 		<dependency>
 			<groupId>net.minelink</groupId>
@@ -313,9 +309,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Anti PvPLogging plugin, http://www.spigotmc.org/resources/combat-tag.3182/ -->
 		<dependency>
 			<groupId>com.trc202</groupId>
@@ -330,9 +326,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- XAuth, another authentication plugin, required by the database converter -->
 		<dependency>
 			<groupId>de.luricos.bukkit</groupId>
@@ -347,9 +343,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Spout API, https://spoutcraft.org/downloads/ -->
 		<dependency>
 			<groupId>org.spoutcraft</groupId>
@@ -364,11 +360,11 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Local Dependencies -->
-
+		
 		<!-- It doesn't have a Maven Repo, http://dev.bukkit.org/bukkit-plugins/chestshop/ -->
 		<dependency>
 			<groupId>com.Acrobot</groupId>
@@ -385,9 +381,9 @@
 					<groupId>org.bukkit</groupId>
 					<artifactId>craftbukkit</artifactId>
 				</exclusion>
-			</exclusions>
+			</exclusions> 
 		</dependency>
-
+		
 		<!-- Citizens 1.X (No API) -->
 		<dependency>
 			<groupId>net.citizensnpcs</groupId>
@@ -396,7 +392,7 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/libs/Citizens.jar</systemPath>
 		</dependency>
-
+		
 		<!-- Old version of xAuth by Cypherx -->
 		<dependency>
 			<groupId>com.cypherx</groupId>
@@ -405,7 +401,7 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/libs/xAuth.jar</systemPath>
 		</dependency>
-
+		
 		<!-- A SpoutApi Plugin, http://dev.bukkit.org/bukkit-plugins/notifications/ -->
 		<dependency>
 			<groupId>me.muizers</groupId>
@@ -414,6 +410,6 @@
 			<scope>system</scope>
 			<systemPath>${project.basedir}/libs/Notifications.jar</systemPath>
 		</dependency>
-
+		
 	</dependencies>
 </project>