From e7ae3bb8b5ec468fd6c0ad7bc5788032fb446064 Mon Sep 17 00:00:00 2001
From: "Gabriele C." <sgdc3.mail@gmail.com>
Date: Mon, 6 Jul 2015 15:34:11 +0200
Subject: [PATCH 1/7] Create circle.yml

---
 circle.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 circle.yml

diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..85064c5c
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,9 @@
+machine:
+  java:
+    version: oraclejdk7
+general:
+  artifacts:
+    - "target/*.jar"
+test:
+  override:
+    - mvn clean install

From 4c2cad16842dd421b1976a3d1657c883804b5f41 Mon Sep 17 00:00:00 2001
From: "Gabriele C." <sgdc3.mail@gmail.com>
Date: Mon, 6 Jul 2015 15:43:30 +0200
Subject: [PATCH 2/7] Update pom.xml

---
 pom.xml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pom.xml b/pom.xml
index c6f2877a..a2194e6a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,8 +90,15 @@
 							<include>com.sun.mail:*</include>
 							<include>javax.mail:*</include>
 							<include>com.comphenix.attribute:*</include>
+							<include>org.mcstats.*:*</include>
 						</includes>
 					</artifactSet>
+					<relocations>
+						<relocation>
+							<pattern>org.mcstats</pattern>
+							<shadedPattern>fr.xephi.authme.AuthMe</shadedPattern>
+						</relocation>
+					</relocations>
 				</configuration>
 				<executions>
 					<execution>
@@ -113,6 +120,12 @@
 			<url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
 		</repository>
 
+		<!-- Mcstats.org Metrics Repo -->
+		<repository>
+			<id>Plugin Metrics</id>
+			<url>http://repo.mcstats.org/content/repositories/public</url>
+		</repository>
+
 		<!-- Vault Repo (Already in ess repo!) -->
 		<repository>
 			<id>vault-repo</id>
@@ -202,6 +215,13 @@
 			<version>1.2.14</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.mcstats.MOD</groupId>
+			<artifactId>metrics</artifactId>
+			<version>R7</version>
+			<scope>compile</scope>
+		</dependency>
+
 		<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project, 
 			http://bukkit.org/ -->
 		<dependency>

From 4f78e862d24a4a3f5a2dc71bb799516dd7fdba2b Mon Sep 17 00:00:00 2001
From: "Gabriele C." <sgdc3.mail@gmail.com>
Date: Mon, 6 Jul 2015 15:44:51 +0200
Subject: [PATCH 3/7] Update pom.xml

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a2194e6a..1c73de2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,8 +3,8 @@
 	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</groupId>
-	<artifactId>AuthMe</artifactId>
+	<groupId>fr.xephi</groupId>
+	<artifactId>authme</artifactId>
 	<version>5.0-SNAPSHOT</version>
 
 	<name>AuthMeReloaded</name>
@@ -96,7 +96,7 @@
 					<relocations>
 						<relocation>
 							<pattern>org.mcstats</pattern>
-							<shadedPattern>fr.xephi.authme.AuthMe</shadedPattern>
+							<shadedPattern>fr.xephi.authme</shadedPattern>
 						</relocation>
 					</relocations>
 				</configuration>

From b371e883cf406c0ff883dfbb7fdbead8dec2e871 Mon Sep 17 00:00:00 2001
From: "Gabriele C." <sgdc3.mail@gmail.com>
Date: Mon, 6 Jul 2015 15:47:09 +0200
Subject: [PATCH 4/7] Update pom.xml

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c73de2f..f743c34a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,8 +216,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.mcstats.MOD</groupId>
-			<artifactId>metrics</artifactId>
+			<groupId>org.mcstats.bukkit</groupId>
+			<artifactId>metrics-lite</artifactId>
 			<version>R7</version>
 			<scope>compile</scope>
 		</dependency>

From 354c62358b1697b7b940c28dab1748f6736dbdc7 Mon Sep 17 00:00:00 2001
From: "Gabriele C." <sgdc3.mail@gmail.com>
Date: Mon, 6 Jul 2015 15:52:36 +0200
Subject: [PATCH 5/7] Update AuthMe.java

---
 src/main/java/fr/xephi/authme/AuthMe.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 4f44363a..65805c60 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -127,7 +127,16 @@ public class AuthMe extends JavaPlugin {
             this.getServer().shutdown();
             return;
         }
-
+        
+        try {
+            MetricsLite metrics = new MetricsLite(this);
+            metrics.start();
+            ConsoleLogger.info("Metrics-Lite started successfully!");
+        } catch (IOException e) {
+            // Failed to submit the stats :-(
+            ConsoleLogger.showError("Can't start Metrics-Lite! The plugin will work anyway...");
+        }
+        
         citizens = new CitizensCommunicator(this);
 
         if (Settings.enableAntiBot) {

From 923340d983d3e4abd6c06edd365ea7bbbeddf9b5 Mon Sep 17 00:00:00 2001
From: "Gabriele C." <sgdc3.mail@gmail.com>
Date: Mon, 6 Jul 2015 15:59:20 +0200
Subject: [PATCH 6/7] Update pom.xml

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index f743c34a..a1a113f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,8 +22,6 @@
 
 		<!-- 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! -->

From 256336979a99751a96a1027bd89f646e7b9e561f Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Mon, 6 Jul 2015 16:09:56 +0200
Subject: [PATCH 7/7] Fixed metrics

---
 pom.xml                                   | 10 ++++++++++
 src/main/java/fr/xephi/authme/AuthMe.java |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/pom.xml b/pom.xml
index a1a113f7..5db7114c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,6 +218,16 @@
 			<artifactId>metrics-lite</artifactId>
 			<version>R7</version>
 			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>bukkit</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.bukkit</groupId>
+					<artifactId>craftbukkit</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<!-- Spigot-Api, http://www.spigotmc.org/ Based on the Bukkit project, 
diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index 65805c60..77629313 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -3,6 +3,7 @@ package fr.xephi.authme;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
@@ -31,6 +32,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
+import org.mcstats.MetricsLite;
 
 import com.earth2me.essentials.Essentials;
 import com.maxmind.geoip.LookupService;