diff --git a/datagear-connection/pom.xml b/datagear-connection/pom.xml index 0f328ec6..1eddac2e 100644 --- a/datagear-connection/pom.xml +++ b/datagear-connection/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-connection diff --git a/datagear-dataexchange/pom.xml b/datagear-dataexchange/pom.xml index 5da2ef07..ab5c41f7 100644 --- a/datagear-dataexchange/pom.xml +++ b/datagear-dataexchange/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-dataexchange diff --git a/datagear-dbinfo/pom.xml b/datagear-dbinfo/pom.xml index 79a19a65..a00eba28 100644 --- a/datagear-dbinfo/pom.xml +++ b/datagear-dbinfo/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-dbinfo diff --git a/datagear-dbmodel/pom.xml b/datagear-dbmodel/pom.xml index eb5b7799..c685c17c 100644 --- a/datagear-dbmodel/pom.xml +++ b/datagear-dbmodel/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-dbmodel diff --git a/datagear-management/pom.xml b/datagear-management/pom.xml index 7a26fef0..1aee7a90 100644 --- a/datagear-management/pom.xml +++ b/datagear-management/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-management diff --git a/datagear-management/src/main/resources/org/datagear/management/ddl/datagear.sql b/datagear-management/src/main/resources/org/datagear/management/ddl/datagear.sql index 7381b963..13a5a1d7 100644 --- a/datagear-management/src/main/resources/org/datagear/management/ddl/datagear.sql +++ b/datagear-management/src/main/resources/org/datagear/management/ddl/datagear.sql @@ -98,3 +98,9 @@ CREATE TABLE DATAGEAR_SCHEMA --version[1.3.0], DO NOT EDIT THIS LINE! ----------------------------------------- + + +----------------------------------------- +--version[1.4.0], DO NOT EDIT THIS LINE! +----------------------------------------- + diff --git a/datagear-model/pom.xml b/datagear-model/pom.xml index 9e4a354a..39c3298a 100644 --- a/datagear-model/pom.xml +++ b/datagear-model/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-model diff --git a/datagear-persistence/pom.xml b/datagear-persistence/pom.xml index 408734ea..335bd627 100644 --- a/datagear-persistence/pom.xml +++ b/datagear-persistence/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-persistence diff --git a/datagear-util/pom.xml b/datagear-util/pom.xml index cd7fad67..18dc9f08 100644 --- a/datagear-util/pom.xml +++ b/datagear-util/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-util diff --git a/datagear-web/pom.xml b/datagear-web/pom.xml index 705ab54f..65dde7b9 100644 --- a/datagear-web/pom.xml +++ b/datagear-web/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-web diff --git a/datagear-web/src/main/resources/datagear-version.properties b/datagear-web/src/main/resources/datagear-version.properties index 68dd9a3a..321280df 100644 --- a/datagear-web/src/main/resources/datagear-version.properties +++ b/datagear-web/src/main/resources/datagear-version.properties @@ -1,7 +1,7 @@ #--UTF-8 file-- #系统版本号 -version=1.3.0 +version=1.4.0 #构建日期 buildDate=${buildtimestamp} \ No newline at end of file diff --git a/datagear-web/src/main/webapp/WEB-INF/changelog.txt b/datagear-web/src/main/webapp/WEB-INF/changelog.txt index 2554b49e..88ff8ae1 100644 --- a/datagear-web/src/main/webapp/WEB-INF/changelog.txt +++ b/datagear-web/src/main/webapp/WEB-INF/changelog.txt @@ -62,3 +62,9 @@ 修复:修复在服务器重启后SQL工作台会自动再次提交上一次执行SQL的BUG; 修复:修复服务端定时清理临时文件服务未正确执行的BUG; 修复:修复MySQL、Oracle数据管理表、字段悬浮提示未显示注释的BUG; + + +----------------------------------------- +--v1.4.0 +----------------------------------------- + diff --git a/datagear-web/src/main/webapp/readme.txt b/datagear-web/src/main/webapp/readme.txt index 9931c934..d3660a8e 100644 --- a/datagear-web/src/main/webapp/readme.txt +++ b/datagear-web/src/main/webapp/readme.txt @@ -1,4 +1,4 @@ -数据齿轮-v1.3.0 +数据齿轮-v1.4.0 数据齿轮是一款数据库管理系统,使用Java语言开发,采用浏览器/服务器架构,以数据管理为核心功能,支持多种数据库。 它的数据模型并不是原始的数据库表,而是融合了数据库表及表间关系,更偏向于领域模型的数据模型,能够更友好、方便、快速地查询和维护数据。 diff --git a/datagear-webembd/pom.xml b/datagear-webembd/pom.xml index 9ee8234c..1d7be8f0 100644 --- a/datagear-webembd/pom.xml +++ b/datagear-webembd/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 datagear-webembd diff --git a/datagear-webembd/src/main/dist/readme.txt b/datagear-webembd/src/main/dist/readme.txt index 4da5f51d..8d2760ec 100644 --- a/datagear-webembd/src/main/dist/readme.txt +++ b/datagear-webembd/src/main/dist/readme.txt @@ -1,4 +1,4 @@ -数据齿轮-v1.3.0 +数据齿轮-v1.4.0 数据齿轮是一款数据库管理系统,使用Java语言开发,采用浏览器/服务器架构,以数据管理为核心功能,支持多种数据库。 它的数据模型并不是原始的数据库表,而是融合了数据库表及表间关系,更偏向于领域模型的数据模型,能够更友好、方便、快速地查询和维护数据。 diff --git a/datagear-webembd/src/main/dist/startup.bat b/datagear-webembd/src/main/dist/startup.bat index a6db2a2a..d6165572 100644 --- a/datagear-webembd/src/main/dist/startup.bat +++ b/datagear-webembd/src/main/dist/startup.bat @@ -1 +1 @@ -java -cp lib\datagear-webembd-1.3.0.jar;lib\hamcrest-core-1.3.jar;lib\javax.servlet-3.0.0.v201112011016.jar;lib\jetty-all-8.1.22.v20160922.jar;lib\junit-4.11.jar;;lib\log4j-1.2.17.jar;lib\slf4j-api-1.7.9.jar;lib\slf4j-log4j12-1.7.9.jar org.datagear.webembd.App \ No newline at end of file +java -cp lib\datagear-webembd-1.4.0.jar;lib\hamcrest-core-1.3.jar;lib\javax.servlet-3.0.0.v201112011016.jar;lib\jetty-all-8.1.22.v20160922.jar;lib\junit-4.11.jar;;lib\log4j-1.2.17.jar;lib\slf4j-api-1.7.9.jar;lib\slf4j-log4j12-1.7.9.jar org.datagear.webembd.App \ No newline at end of file diff --git a/datagear-webembd/src/main/dist/startup.sh b/datagear-webembd/src/main/dist/startup.sh index e3403e92..0859ab1b 100644 --- a/datagear-webembd/src/main/dist/startup.sh +++ b/datagear-webembd/src/main/dist/startup.sh @@ -3,7 +3,7 @@ JAVA_HOME=$JAVA_HOME JAVA_OPTS=$JAVA_OPTS -APP_CLASSPATH=.:lib/datagear-webembd-1.3.0.jar:lib/hamcrest-core-1.3.jar:lib/javax.servlet-3.0.0.v201112011016.jar:lib/jetty-all-8.1.22.v20160922.jar:lib/junit-4.11.jar::lib/log4j-1.2.17.jar:lib/slf4j-api-1.7.9.jar:lib/slf4j-log4j12-1.7.9.jar +APP_CLASSPATH=.:lib/datagear-webembd-1.4.0.jar:lib/hamcrest-core-1.3.jar:lib/javax.servlet-3.0.0.v201112011016.jar:lib/jetty-all-8.1.22.v20160922.jar:lib/junit-4.11.jar::lib/log4j-1.2.17.jar:lib/slf4j-api-1.7.9.jar:lib/slf4j-log4j12-1.7.9.jar APP_NAME="Data Gear" ECHO_PREFIX="[$APP_NAME] :" diff --git a/pom.xml b/pom.xml index cbe68c61..706dc61c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.datagear datagear - 1.3.0 + 1.4.0 pom datagear