4.6.0

2022-11-08 14:10:09 +08:00
parent a029e6d56a
commit fe18621aa9
13 changed files with 14 additions and 13 deletions
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.5.1-SNAPSHOT</version>
+		<version>4.6.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/modules/cms/pom.xml
+++ b/modules/cms/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.5.1-SNAPSHOT</version>
+		<version>4.6.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>

--- a/modules/cms/src/main/resources/db/upgrade/cms/versions
+++ b/modules/cms/src/main/resources/db/upgrade/cms/versions
@@ -13,4 +13,5 @@
 4.3.3
 4.4.0
 4.4.1
-4.5.0
+4.5.0
+4.6.0
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.5.1-SNAPSHOT</version>
+		<version>4.6.0-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/bin/run-web.sh.xml
@@ -31,7 +31,7 @@ cd app
 jar -xvf web.war
 rm web.war
 cd WEB-INF
-exec ./startup.sh
+sh ./startup.sh
 ]]>
 	</content>
 </template>
--- a/modules/core/src/test/resources/application.yml
+++ b/modules/core/src/test/resources/application.yml
@@ -4,7 +4,7 @@ productName: JeeSite Demo
 companyName: ThinkGem

 # 产品版本、版权年份
-productVersion: V4.5
+productVersion: V4.6
 copyrightYear: 2022

 # 数据库连接
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@

 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-parent</artifactId>
-	<version>4.5.1-SNAPSHOT</version>
+	<version>4.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Parent</name>
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite</artifactId>
-	<version>4.5.1-SNAPSHOT</version>
+	<version>4.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite</name>
--- a/root/pom.xml
+++ b/root/pom.xml
@@ -5,7 +5,7 @@
 	
 	<groupId>com.jeesite</groupId>
 	<artifactId>jeesite-root</artifactId>
-	<version>4.5.1-SNAPSHOT</version>
+	<version>4.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	
 	<name>JeeSite Root</name>
--- a/web/bin/docker/Dockerfile
+++ b/web/bin/docker/Dockerfile
@@ -18,4 +18,4 @@ ENTRYPOINT jar -xvf app.war && rm app.war && cd WEB-INF && sh startup.sh

 EXPOSE 8980

-#docker run -p 8980:8980 thinkgem/jeesite-web:4.4
+#docker run -p 8980:8980 thinkgem/jeesite-web:4.6
--- a/web/bin/run-web.sh
+++ b/web/bin/run-web.sh
@@ -24,4 +24,4 @@ cd app
 jar -xvf web.war
 rm web.war
 cd WEB-INF
-exec ./startup.sh
+sh ./startup.sh
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>com.jeesite</groupId>
 		<artifactId>jeesite-parent</artifactId>
-		<version>4.5.1-SNAPSHOT</version>
+		<version>4.6.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -8,7 +8,7 @@ productName: JeeSite Demo
 companyName: ThinkGem

 # 产品版本、版权年份
-productVersion: V4.5
+productVersion: V4.6
 copyrightYear: 2022

 # 是否演示模式