diff --git a/common/pom.xml b/common/pom.xml index 07201ccb..1ad560e4 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT ../parent/pom.xml diff --git a/modules/cms/pom.xml b/modules/cms/pom.xml index 4b3e9b25..45f99ff4 100644 --- a/modules/cms/pom.xml +++ b/modules/cms/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT ../../parent/pom.xml diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions index 20570e75..46b591df 100644 --- a/modules/cms/src/main/resources/db/upgrade/cms/versions +++ b/modules/cms/src/main/resources/db/upgrade/cms/versions @@ -14,4 +14,5 @@ 5.1.0 5.2.0 5.2.1 -5.3.0 \ No newline at end of file +5.3.0 +5.3.1 \ No newline at end of file diff --git a/modules/core/pom.xml b/modules/core/pom.xml index 3defb8ee..bb11ccf0 100644 --- a/modules/core/pom.xml +++ b/modules/core/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT ../../parent/pom.xml @@ -40,11 +40,13 @@ com.oracle.ojdbc ojdbc8 + 19.3.0.0 runtime com.oracle.ojdbc orai18n + 19.3.0.0 runtime --> diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml index e2d81f79..f0b1f49a 100644 --- a/modules/core/src/main/resources/templates/modules/gen/config.xml +++ b/modules/core/src/main/resources/templates/modules/gen/config.xml @@ -233,6 +233,7 @@ + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml new file mode 100644 index 00000000..fde90e59 --- /dev/null +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/pom.xml @@ -0,0 +1,46 @@ + + + \ No newline at end of file diff --git a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml index 11adc86f..36858952 100644 --- a/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml +++ b/modules/core/src/main/resources/templates/modules/gen/module_cloud/web/pom.xml @@ -18,10 +18,10 @@ ../../../parent/web/pom.xml - jeesite-cloud-module-${moduleCode} + jeesite-cloud-module-${moduleCode}-web war - JeeSite Cloud Module ${moduleName} + JeeSite Cloud Module ${moduleName} Web http://jeesite.com 2013-Now diff --git a/modules/pom.xml b/modules/pom.xml new file mode 100644 index 00000000..aef32382 --- /dev/null +++ b/modules/pom.xml @@ -0,0 +1,35 @@ + + + 4.0.0 + + com.jeesite + jeesite-modules + 5.3.1-SNAPSHOT + pom + + JeeSite Modules + http://jeesite.com + 2013-Now + + + core + cms + + + + + thinkgem + WangZhen + thinkgem at 163.com + Project lead + +8 + + + + + JeeSite + http://jeesite.com + + + diff --git a/parent/pom.xml b/parent/pom.xml index 9cbf8799..8fc50420 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -12,7 +12,7 @@ com.jeesite jeesite-parent - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT pom JeeSite Parent diff --git a/pom.xml b/pom.xml index ba1ba55c..4556053c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.jeesite jeesite - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT pom JeeSite diff --git a/root/pom.xml b/root/pom.xml index 1b9d82c1..14bb0832 100644 --- a/root/pom.xml +++ b/root/pom.xml @@ -5,7 +5,7 @@ com.jeesite jeesite-root - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT pom JeeSite Root @@ -15,8 +15,7 @@ ../parent ../common - ../modules/core - ../modules/cms + ../modules ../web ../web-api ../web-fast diff --git a/web-api/bin/run-web.sh b/web-api/bin/run-web.sh index 6cb3043f..d570fe4b 100644 --- a/web-api/bin/run-web.sh +++ b/web-api/bin/run-web.sh @@ -24,4 +24,4 @@ cd app jar -xvf web.war rm web.war cd WEB-INF -sh ./startup.sh +sh ./startup.sh \ No newline at end of file diff --git a/web-api/pom.xml b/web-api/pom.xml index 3bd76f3b..e869cec6 100644 --- a/web-api/pom.xml +++ b/web-api/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT ../parent/pom.xml @@ -88,7 +88,7 @@ ${finalName} - ${project.basedir}/src/main/webapp/WEB-INF/classes/ + diff --git a/web-fast/bin/run-web.sh b/web-fast/bin/run-web.sh index 2a8318bd..20fa7fe5 100644 --- a/web-fast/bin/run-web.sh +++ b/web-fast/bin/run-web.sh @@ -17,4 +17,4 @@ mvn clean package spring-boot:repackage -Dmaven.test.skip=true -U # 启动服务 cd target -java -jar web.jar +java -jar web.jar \ No newline at end of file diff --git a/web-fast/pom.xml b/web-fast/pom.xml index 815bdf87..984c0cb8 100644 --- a/web-fast/pom.xml +++ b/web-fast/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT ../parent/pom.xml @@ -97,7 +97,7 @@ ${finalName} - ${project.basedir}/src/main/webapp/WEB-INF/classes/ + diff --git a/web/bin/run-web.sh b/web/bin/run-web.sh index 6cb3043f..d570fe4b 100644 --- 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 -sh ./startup.sh +sh ./startup.sh \ No newline at end of file diff --git a/web/pom.xml b/web/pom.xml index ad87d4ad..9f175a78 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -6,7 +6,7 @@ com.jeesite jeesite-parent - 5.3.0-SNAPSHOT + 5.3.1-SNAPSHOT ../parent/pom.xml @@ -88,7 +88,7 @@ ${finalName} - ${project.basedir}/src/main/webapp/WEB-INF/classes/ +