From f47974bbedab64be9e574dd123978f5f4a3dff46 Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Wed, 15 Mar 2023 11:44:13 +0800
Subject: [PATCH] 1.3.6

---
 README.md                       | 4 ++--
 UPDATE_LOG.md                   | 4 ++++
 _demo/marsh-admin-demo0/pom.xml | 2 +-
 _demo/marsh-admin-demo1/pom.xml | 2 +-
 _demo/marsh-admin-demo2/pom.xml | 2 +-
 _demo/marsh-api-demo0/pom.xml   | 2 +-
 _demo/marsh-api-demo1/pom.xml   | 2 +-
 _demo/marsh-api-demo2/pom.xml   | 2 +-
 marsh-admin/README.md           | 2 +-
 marsh-admin/pom.xml             | 2 +-
 marsh-api/README.md             | 2 +-
 marsh-api/pom.xml               | 2 +-
 marsh-job/pom.xml               | 2 +-
 marsh-lib/pom.xml               | 2 +-
 marsh-parent/pom.xml            | 8 ++++----
 marsh.base/pom.xml              | 2 +-
 marsh.uadmin/pom.xml            | 2 +-
 marsh.uapi/pom.xml              | 2 +-
 18 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index b49a7a5..8c2d0b6 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
     </parent>
     
     <dependencies>
@@ -125,7 +125,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
     </parent>
     
     <dependencies>
diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md
index 241506d..6249eb5 100644
--- a/UPDATE_LOG.md
+++ b/UPDATE_LOG.md
@@ -1,3 +1,7 @@
+#### 1.3.6
+* 升级 solon 为 2.2.4
+* 升级 snack3 为 3.2.60
+
 #### 1.3.4
 * 升级 solon 为 2.2.1
 * 升级 snack3 为 3.2.56
diff --git a/_demo/marsh-admin-demo0/pom.xml b/_demo/marsh-admin-demo0/pom.xml
index e6955ff..5f036f9 100755
--- a/_demo/marsh-admin-demo0/pom.xml
+++ b/_demo/marsh-admin-demo0/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/_demo/marsh-admin-demo1/pom.xml b/_demo/marsh-admin-demo1/pom.xml
index 2e3b9ae..688aac0 100755
--- a/_demo/marsh-admin-demo1/pom.xml
+++ b/_demo/marsh-admin-demo1/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/_demo/marsh-admin-demo2/pom.xml b/_demo/marsh-admin-demo2/pom.xml
index 7ee961a..dda1059 100755
--- a/_demo/marsh-admin-demo2/pom.xml
+++ b/_demo/marsh-admin-demo2/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/_demo/marsh-api-demo0/pom.xml b/_demo/marsh-api-demo0/pom.xml
index dc1158e..7814dee 100755
--- a/_demo/marsh-api-demo0/pom.xml
+++ b/_demo/marsh-api-demo0/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/_demo/marsh-api-demo1/pom.xml b/_demo/marsh-api-demo1/pom.xml
index 139e828..a283472 100755
--- a/_demo/marsh-api-demo1/pom.xml
+++ b/_demo/marsh-api-demo1/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/_demo/marsh-api-demo2/pom.xml b/_demo/marsh-api-demo2/pom.xml
index 308cded..403b0cb 100755
--- a/_demo/marsh-api-demo2/pom.xml
+++ b/_demo/marsh-api-demo2/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/marsh-admin/README.md b/marsh-admin/README.md
index 39e4021..b2dbf57 100644
--- a/marsh-admin/README.md
+++ b/marsh-admin/README.md
@@ -35,7 +35,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
     </parent>
     
     <dependencies>
diff --git a/marsh-admin/pom.xml b/marsh-admin/pom.xml
index 7816dfb..408b3fb 100644
--- a/marsh-admin/pom.xml
+++ b/marsh-admin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
     <artifactId>marsh-admin</artifactId>
diff --git a/marsh-api/README.md b/marsh-api/README.md
index 697abe7..ecf87ab 100644
--- a/marsh-api/README.md
+++ b/marsh-api/README.md
@@ -34,7 +34,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
     </parent>
     
     <dependencies>
diff --git a/marsh-api/pom.xml b/marsh-api/pom.xml
index 26b2fa3..e1ee3bd 100644
--- a/marsh-api/pom.xml
+++ b/marsh-api/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/marsh-job/pom.xml b/marsh-job/pom.xml
index f5ebd51..bfb3887 100644
--- a/marsh-job/pom.xml
+++ b/marsh-job/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/marsh-lib/pom.xml b/marsh-lib/pom.xml
index 3e2592d..c77e161 100644
--- a/marsh-lib/pom.xml
+++ b/marsh-lib/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/marsh-parent/pom.xml b/marsh-parent/pom.xml
index 895feff..cd47621 100644
--- a/marsh-parent/pom.xml
+++ b/marsh-parent/pom.xml
@@ -6,13 +6,13 @@
 
     <groupId>org.noear</groupId>
     <artifactId>marsh-parent</artifactId>
-    <version>1.3.5</version>
+    <version>1.3.6</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.2.2</version>
+        <version>2.2.4</version>
         <relativePath />
     </parent>
 
@@ -51,12 +51,12 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <marsh.ver>1.3.5</marsh.ver>
+        <marsh.ver>1.3.6</marsh.ver>
         <water.ver>2.10.1</water.ver>
         <rock.ver>2.6.0</rock.ver>
         <grit.ver>1.5.0</grit.ver>
 
-        <snack3.ver>3.2.59</snack3.ver>
+        <snack3.ver>3.2.60</snack3.ver>
         <wood.ver>1.0.7</wood.ver>
         <mongox.ver>1.0.0</mongox.ver>
         <redisx.ver>1.4.5</redisx.ver>
diff --git a/marsh.base/pom.xml b/marsh.base/pom.xml
index 978fc92..f5e39c9 100644
--- a/marsh.base/pom.xml
+++ b/marsh.base/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 
diff --git a/marsh.uadmin/pom.xml b/marsh.uadmin/pom.xml
index 5657d09..e240470 100644
--- a/marsh.uadmin/pom.xml
+++ b/marsh.uadmin/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
     <artifactId>marsh.uadmin</artifactId>
diff --git a/marsh.uapi/pom.xml b/marsh.uapi/pom.xml
index 5b3e563..cb2853d 100644
--- a/marsh.uapi/pom.xml
+++ b/marsh.uapi/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.3.5</version>
+        <version>1.3.6</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>