From 82c9bc702e6aa72cd205c390846ee1e5856e67d9 Mon Sep 17 00:00:00 2001
From: 502647092 <jtb1@163.com>
Date: Wed, 21 Oct 2015 20:08:40 +0800
Subject: [PATCH] use 7boos gson lib and update to 1.7.1...

Signed-off-by: 502647092 <jtb1@163.com>
---
 pom.xml                                       | 26 +++++--------------
 src/main/java/cn/citycraft/Yum/Yum.java       |  8 ------
 .../Yum/manager/RepositoryManager.java        |  5 ++--
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/pom.xml b/pom.xml
index f8b8eba..17a1ce2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>cn.citycraft</groupId>
 	<artifactId>Yum</artifactId>
-	<version>1.7</version>
+	<version>1.7.1</version>
 	<name>Yum</name>
 	<description>Minecraft 服务器插件管理系统</description>
 	<build>
@@ -33,14 +33,9 @@
 					<artifactSet>
 						<includes>
 							<include>cn.citycraft:PluginHelper</include>
-							<include>org.mcstats.*:*</include>
 						</includes>
 					</artifactSet>
 					<relocations>
-						<relocation>
-							<pattern>org.mcstats</pattern>
-							<shadedPattern>${project.groupId}.${project.artifactId}.mcstats</shadedPattern>
-						</relocation>
 						<relocation>
 							<pattern>cn.citycraft.PluginHelper</pattern>
 							<shadedPattern>${project.groupId}.${project.artifactId}</shadedPattern>
@@ -58,6 +53,11 @@
 			</plugin>
 		</plugins>
 	</build>
+	<properties>
+		<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
+		<update.description>更新7老板底层Gson库 移除Plugin Metrics...</update.description>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 	<repositories>
 		<repository>
 			<id>spigot-repo</id>
@@ -67,10 +67,6 @@
 			<id>citycraft-repo</id>
 			<url>${jenkins.url}/plugin/repository/everything/</url>
 		</repository>
-		<repository>
-			<id>Plugin Metrics</id>
-			<url>http://repo.mcstats.org/content/repositories/public</url>
-		</repository>
 	</repositories>
 	<dependencies>
 		<dependency>
@@ -85,15 +81,5 @@
 			<type>jar</type>
 			<version>1.0</version>
 		</dependency>
-		<dependency>
-			<groupId>org.mcstats.bukkit</groupId>
-			<artifactId>metrics</artifactId>
-			<version>R8-SNAPSHOT</version>
-			<scope>compile</scope>
-		</dependency>
 	</dependencies>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<jenkins.url>http://ci.citycraft.cn:8080</jenkins.url>
-	</properties>
 </project>
\ No newline at end of file
diff --git a/src/main/java/cn/citycraft/Yum/Yum.java b/src/main/java/cn/citycraft/Yum/Yum.java
index b989703..46b051f 100644
--- a/src/main/java/cn/citycraft/Yum/Yum.java
+++ b/src/main/java/cn/citycraft/Yum/Yum.java
@@ -3,10 +3,7 @@
  */
 package cn.citycraft.Yum;
 
-import java.io.IOException;
-
 import org.bukkit.plugin.java.JavaPlugin;
-import org.mcstats.Metrics;
 
 import cn.citycraft.PluginHelper.commands.HandlerSubCommand;
 import cn.citycraft.PluginHelper.config.FileConfig;
@@ -61,11 +58,6 @@ public class Yum extends JavaPlugin {
 		YumManager.repo.jsonToCache(config);
 		YumManager.updaterepo();
 		new VersionChecker(this);
-		try {
-			final Metrics metrics = new Metrics(this);
-			metrics.start();
-		} catch (final IOException e) {
-		}
 	}
 
 	@Override
diff --git a/src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java b/src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java
index 457822a..6a78668 100644
--- a/src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java
+++ b/src/main/java/cn/citycraft/Yum/manager/RepositoryManager.java
@@ -17,10 +17,11 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 
 import com.google.common.base.Charsets;
-import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 
+import cn.citycraft.PluginHelper.gson.GsonLib;
+import cn.citycraft.PluginHelper.gson.api.Gson;
 import cn.citycraft.Yum.manager.Repositories.PackageInfo;
 import cn.citycraft.Yum.manager.Repositories.Plugin;
 import cn.citycraft.Yum.manager.Repositories.Repository;;
@@ -39,7 +40,7 @@ public class RepositoryManager {
 
 	public RepositoryManager(final org.bukkit.plugin.Plugin plugin) {
 		this.main = plugin;
-		gson = new Gson();
+		gson = GsonLib.newGson();
 		plugins = new HashMap<String, PluginInfo>();
 		repos = new ArrayList<String>();
 	}