1.4.2

noear · Jul 8, 2023 · a8221d4 · a8221d4
1 parent e81879d
commit a8221d4
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -73,7 +73,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <dependencies>
@@ -125,7 +125,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>marsh-parent</artifactId>
-        <version>1.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <dependencies>

diff --git a/UPDATE_LOG.md b/UPDATE_LOG.md
@@ -1,3 +1,7 @@
+#### 1.4.2
+* 升级 solon 为 2.3.8
+* 升级 grit 为 1.6.2
+
 #### 1.4.1
 * 升级 solon 为 2.3.6
 

diff --git 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.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <dependencies>

diff --git 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.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
     <artifactId>marsh-admin</artifactId>

diff --git 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.4.1</version>
+        <version>1.4.2</version>
     </parent>
 
     <dependencies>

diff --git 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.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 

diff --git 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.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 

diff --git 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.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/marsh-parent/pom.xml b/marsh-parent/pom.xml
@@ -6,13 +6,13 @@
 
     <groupId>org.noear</groupId>
     <artifactId>marsh-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2</version>
     <packaging>pom</packaging>
 
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.3.6</version>
+        <version>2.3.8</version>
         <relativePath />
     </parent>
 
@@ -47,10 +47,10 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
 
-        <marsh.version>1.4.1</marsh.version>
-        <water.version>2.11.0</water.version>
-        <rock.version>2.7.0</rock.version>
-        <grit.version>1.6.0</grit.version>
+        <marsh.version>1.4.2</marsh.version>
+        <water.version>2.11.1</water.version>
+        <rock.version>2.7.1</rock.version>
+        <grit.version>1.6.2</grit.version>
 
         <snack3.version>3.2.72</snack3.version>
         <wood.version>1.1.5</wood.version>

diff --git 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.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
 

diff --git 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.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>
     <artifactId>marsh.uadmin</artifactId>

diff --git 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.4.1</version>
+        <version>1.4.2</version>
         <relativePath>../marsh-parent/pom.xml</relativePath>
     </parent>