From ff0faefac3fc66f5e9d418d04f0b48258a10da1c Mon Sep 17 00:00:00 2001
From: jinyu <foxinmy@gmail.com>
Date: Tue, 17 May 2016 11:57:41 +0800
Subject: [PATCH] version upgrade to 1.1.8

---
 weixin4j-server/CHANGE.md                                  | 7 +++++--
 weixin4j-server/pom.xml                                    | 4 ++--
 .../foxinmy/weixin4j/startup/WeixinServerBootstrap.java    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/weixin4j-server/CHANGE.md b/weixin4j-server/CHANGE.md
index 1aa2122d..7cba9eaf 100644
--- a/weixin4j-server/CHANGE.md
+++ b/weixin4j-server/CHANGE.md
@@ -136,9 +136,12 @@
 
   + version upgrade to 1.1.6
   
-  
 * 2015-03-12
 
   + 修改ClassUtil获取class不到的bug
   
-  + ~~新增MultipleMessageHandlerAdapter多个消息适配类~~
\ No newline at end of file
+  + ~~新增MultipleMessageHandlerAdapter多个消息适配类~~
+  
+* 2016-05-17
+
+  + version upgrade to 1.1.8
\ No newline at end of file
diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml
index 2c71d381..11ef19e9 100644
--- a/weixin4j-server/pom.xml
+++ b/weixin4j-server/pom.xml
@@ -8,7 +8,7 @@
 		<version>1.6.9</version>
 	</parent>
 	<artifactId>weixin4j-server</artifactId>
-	<version>1.1.7</version>
+	<version>1.1.8</version>
 	<name>weixin4j-server</name>
 	<url>https://github.com/foxinmy/weixin4j/tree/master/weixin4j-server</url>
 	<description>微信消息netty服务器</description>
@@ -48,7 +48,7 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 			<version>4.2.0.RELEASE</version>
-			<optional>true</optional>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 </project>
\ No newline at end of file
diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java
index 49d317e4..3751b0a4 100644
--- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java
+++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java
@@ -307,5 +307,5 @@ public WeixinServerBootstrap openAlwaysResponse() {
 		return this;
 	}
 
-	public final static String VERSION = "1.1.7";
+	public final static String VERSION = "1.1.8";
 }
\ No newline at end of file