From 5d686103fbb4361bebc305c731c9358d038e2836 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Thu, 02 Nov 2017 13:41:24 +0800
Subject: [PATCH] Merge branch 'master' of http://xufenglei@blit.7drlb.com:8888/r/task.git
---
.idea/artifacts/task_war_exploded.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.idea/artifacts/task_war_exploded.xml b/.idea/artifacts/task_war_exploded.xml
index fbae2ee..f7210a8 100644
--- a/.idea/artifacts/task_war_exploded.xml
+++ b/.idea/artifacts/task_war_exploded.xml
@@ -17,7 +17,7 @@
<element id="library" level="project" name="Maven: org.springframework:spring-jdbc:4.3.7.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.7.RELEASE" />
<element id="library" level="project" name="Maven: javax.servlet:jstl:1.2" />
- <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.7" />
+ <element id="library" level="project" name="Maven: com.alibaba:fastjson:1.2.39" />
<element id="library" level="project" name="Maven: com.alibaba:druid:1.0.18" />
<element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.30" />
<element id="library" level="project" name="Maven: org.mybatis:mybatis:3.4.1" />
@@ -59,11 +59,14 @@
<element id="library" level="project" name="Maven: io.netty:netty-all:4.1.7.Final" />
<element id="library" level="project" name="Maven: org.springframework.data:spring-data-redis:1.8.7.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework.data:spring-data-keyvalue:1.2.7.RELEASE" />
- <element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:1.13.7.RELEASE" />
<element id="library" level="project" name="Maven: org.springframework:spring-oxm:4.3.11.RELEASE" />
<element id="library" level="project" name="Maven: org.slf4j:jcl-over-slf4j:1.7.25" />
<element id="library" level="project" name="Maven: redis.clients:jedis:2.9.0" />
<element id="library" level="project" name="Maven: org.apache.commons:commons-pool2:2.4.2" />
+ <element id="library" level="project" name="Maven: org.springframework:spring-test:4.1.6.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework.data:spring-data-mongodb:2.0.0.RELEASE" />
+ <element id="library" level="project" name="Maven: org.springframework.data:spring-data-commons:2.0.0.RELEASE" />
+ <element id="library" level="project" name="Maven: org.mongodb:mongo-java-driver:3.5.0" />
</element>
</element>
<element id="directory" name="META-INF">
--
Gitblit v1.8.0