From 29f9673615ce56d450db990a3a69017687f80e79 Mon Sep 17 00:00:00 2001
From: wfifi <wfifi@163.com>
Date: Mon, 9 Nov 2015 13:50:21 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0.gitignore=E5=BF=BD?=
 =?UTF-8?q?=E7=95=A5=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..c1c2bdfb6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+**/target/**
+**/TESTDB/**
+**/file.log
+**/derby.log
+**/*.log4j
-- 
Gitee


From 81362c9bb6750b5ab2736d4e21dfb719f17b4451 Mon Sep 17 00:00:00 2001
From: wfifi <wfifi@163.com>
Date: Mon, 9 Nov 2015 13:52:17 +0800
Subject: [PATCH 2/4] =?UTF-8?q?TestObjectJackJson=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/java/org/tinygroup/convert/TestObjectJackJson.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java b/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java
index 4e2cca3f7..a6cad2c5b 100644
--- a/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java
+++ b/framework/org.tinygroup.convert/src/test/java/org/tinygroup/convert/TestObjectJackJson.java
@@ -58,11 +58,10 @@ public class TestObjectJackJson extends AbstractConvertTestCase {
         maps.put("student", student);
         maps.put("id", 1234);
         ObjectToJson objectToXml = new ObjectToJson(JsonSerialize.Inclusion.NON_NULL);
-        assertEquals(objectToXml.convert(maps), "{\"id\":1234,\"student\":{\"id\":1,\"name\":\"haha\",\"email\":\"email\",\"address\":\"address\",\"birthday\":{\"birthday\":\"2010-11-22\"}}}");
+        assertEquals(objectToXml.convert(maps), "{\"student\":{\"id\":1,\"name\":\"haha\",\"email\":\"email\",\"address\":\"address\",\"birthday\":{\"birthday\":\"2010-11-22\"}},\"id\":1234}");
     }
 
     public void testJson2Map() throws ConvertException {
-
         String json = "{\"student\":{\"id\":1,\"name\":\"haha\",\"email\":\"email\",\"address\":\"address\",\"birthday\":{\"birthday\":\"2010-11-22\"}},\"id\":1234}";
         JsonToObject jsonToObject = new JsonToObject(HashMap.class);
         Map<String, Object> maps = (Map<String, Object>) jsonToObject.convert(json);
-- 
Gitee


From 7b1ceddd94b7552f40f1713b85eafffbf407b67f Mon Sep 17 00:00:00 2001
From: wfifi <wfifi@163.com>
Date: Mon, 9 Nov 2015 13:53:20 +0800
Subject: [PATCH 3/4] =?UTF-8?q?spring-orm=E4=BE=9D=E8=B5=96=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=9A=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 framework/org.tinygroup.spring305/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/framework/org.tinygroup.spring305/pom.xml b/framework/org.tinygroup.spring305/pom.xml
index abb587ecb..49bb96a50 100644
--- a/framework/org.tinygroup.spring305/pom.xml
+++ b/framework/org.tinygroup.spring305/pom.xml
@@ -52,11 +52,6 @@
       <artifactId>spring-orm</artifactId>
       <version>3.0.5.RELEASE</version>
     </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-orm</artifactId>
-      <version>3.0.5.RELEASE</version>
-    </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-webmvc</artifactId>
-- 
Gitee


From 76e1974ef258544a7be0bd5d94a2d4d4984a4404 Mon Sep 17 00:00:00 2001
From: wfifi <wfifi@163.com>
Date: Mon, 9 Nov 2015 13:55:20 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E7=A4=BAjavax.resource.connector?=
 =?UTF-8?q?=201.0=E6=97=A0=E6=B3=95=E4=B8=8B=E8=BD=BD=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E9=80=9A=E4=B8=8D=E8=BF=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/org.tinygroup.dbrouter/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/org.tinygroup.dbrouter/pom.xml b/db/org.tinygroup.dbrouter/pom.xml
index a8d100017..d7cb173f7 100644
--- a/db/org.tinygroup.dbrouter/pom.xml
+++ b/db/org.tinygroup.dbrouter/pom.xml
@@ -48,6 +48,10 @@
           <groupId>javax.transaction</groupId>
           <artifactId>jta</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.resource</groupId>
+          <artifactId>connector</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
-- 
Gitee