Merge remote-tracking branch 'remotes/origin/release'

# Conflicts:
#	pom.xml

pom.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>com.chinaweal.test</groupId>
+  <artifactId>test-server</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>war</packaging>
+
+  <name>TEST-SERVER</name>
+  <description>描述</description>
+  <url>http://www.chinaweal.com.cn</url>
+
+  <properties>
+  </properties>
+
+  <dependencies>
+    <!-- 基础开发环境 -->
+    <dependency>
+      <groupId>com.chinaweal.youfool</groupId>
+      <artifactId>youfool-framework</artifactId>
+      <version>1.0.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.12</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>com.chinaweal</groupId>
+      <artifactId>chinaweal-publibv2</artifactId>
+      <version>2.0.2-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.chinaweal</groupId>
+      <artifactId>memcached</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+
+</project>