Skip to content

Commit a8221d4

Browse files
noearnoear
committed
1.4.2
1 parent e81879d commit a8221d4

File tree

12 files changed

+21
-17
lines changed

12 files changed

+21
-17
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<parent>
7474
<groupId>org.noear</groupId>
7575
<artifactId>marsh-parent</artifactId>
76-
<version>1.4.1</version>
76+
<version>1.4.2</version>
7777
</parent>
7878

7979
<dependencies>
@@ -125,7 +125,7 @@
125125
<parent>
126126
<groupId>org.noear</groupId>
127127
<artifactId>marsh-parent</artifactId>
128-
<version>1.4.1</version>
128+
<version>1.4.2</version>
129129
</parent>
130130

131131
<dependencies>

‎UPDATE_LOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#### 1.4.2
2+
* 升级 solon 为 2.3.8
3+
* 升级 grit 为 1.6.2
4+
15
#### 1.4.1
26
* 升级 solon 为 2.3.6
37

‎marsh-admin/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<parent>
3636
<groupId>org.noear</groupId>
3737
<artifactId>marsh-parent</artifactId>
38-
<version>1.4.1</version>
38+
<version>1.4.2</version>
3939
</parent>
4040

4141
<dependencies>

‎marsh-admin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>marsh-parent</artifactId>
10-
<version>1.4.1</version>
10+
<version>1.4.2</version>
1111
<relativePath>../marsh-parent/pom.xml</relativePath>
1212
</parent>
1313
<artifactId>marsh-admin</artifactId>

‎marsh-api/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<parent>
3535
<groupId>org.noear</groupId>
3636
<artifactId>marsh-parent</artifactId>
37-
<version>1.4.1</version>
37+
<version>1.4.2</version>
3838
</parent>
3939

4040
<dependencies>

‎marsh-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>marsh-parent</artifactId>
10-
<version>1.4.1</version>
10+
<version>1.4.2</version>
1111
<relativePath>../marsh-parent/pom.xml</relativePath>
1212
</parent>
1313

‎marsh-job/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>marsh-parent</artifactId>
10-
<version>1.4.1</version>
10+
<version>1.4.2</version>
1111
<relativePath>../marsh-parent/pom.xml</relativePath>
1212
</parent>
1313

‎marsh-lib/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>marsh-parent</artifactId>
10-
<version>1.4.1</version>
10+
<version>1.4.2</version>
1111
<relativePath>../marsh-parent/pom.xml</relativePath>
1212
</parent>
1313

‎marsh-parent/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66

77
<groupId>org.noear</groupId>
88
<artifactId>marsh-parent</artifactId>
9-
<version>1.4.1</version>
9+
<version>1.4.2</version>
1010
<packaging>pom</packaging>
1111

1212
<parent>
1313
<groupId>org.noear</groupId>
1414
<artifactId>solon-parent</artifactId>
15-
<version>2.3.6</version>
15+
<version>2.3.8</version>
1616
<relativePath />
1717
</parent>
1818

@@ -47,10 +47,10 @@
4747
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4848
<java.version>1.8</java.version>
4949

50-
<marsh.version>1.4.1</marsh.version>
51-
<water.version>2.11.0</water.version>
52-
<rock.version>2.7.0</rock.version>
53-
<grit.version>1.6.0</grit.version>
50+
<marsh.version>1.4.2</marsh.version>
51+
<water.version>2.11.1</water.version>
52+
<rock.version>2.7.1</rock.version>
53+
<grit.version>1.6.2</grit.version>
5454

5555
<snack3.version>3.2.72</snack3.version>
5656
<wood.version>1.1.5</wood.version>

‎marsh.base/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>marsh-parent</artifactId>
10-
<version>1.4.1</version>
10+
<version>1.4.2</version>
1111
<relativePath>../marsh-parent/pom.xml</relativePath>
1212
</parent>
1313

‎marsh.uadmin/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>marsh-parent</artifactId>
10-
<version>1.4.1</version>
10+
<version>1.4.2</version>
1111
<relativePath>../marsh-parent/pom.xml</relativePath>
1212
</parent>
1313
<artifactId>marsh.uadmin</artifactId>

‎marsh.uapi/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.noear</groupId>
99
<artifactId>marsh-parent</artifactId>
10-
<version>1.4.1</version>
10+
<version>1.4.2</version>
1111
<relativePath>../marsh-parent/pom.xml</relativePath>
1212
</parent>
1313

0 commit comments

Comments
 (0)