From c187cc3d78c0142aa3262128d12ad1d122c86d26 Mon Sep 17 00:00:00 2001 From: datagear Date: Fri, 18 Sep 2020 19:52:12 +0800 Subject: [PATCH] =?UTF-8?q?v1.13.0=E7=89=88=E6=9C=AC=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datagear-analysis/pom.xml | 2 +- datagear-connection/pom.xml | 2 +- datagear-dataexchange/pom.xml | 2 +- datagear-management/pom.xml | 2 +- .../main/resources/org/datagear/management/ddl/datagear.sql | 6 ++++++ datagear-meta/pom.xml | 2 +- datagear-persistence/pom.xml | 2 +- datagear-util/pom.xml | 2 +- datagear-util/src/main/java/org/datagear/util/Global.java | 2 +- datagear-web/pom.xml | 2 +- .../src/main/resources/org/datagear/web/changelog.txt | 6 ++++++ .../resources/org/datagear/web/datagear-version.properties | 2 +- datagear-webapp/pom.xml | 2 +- datagear-webapp/src/main/webapp/readme.txt | 2 +- datagear-webappembd/pom.xml | 2 +- datagear-webappembd/src/main/dist/readme.txt | 2 +- datagear-webappembd/src/main/dist/startup.bat | 2 +- datagear-webappembd/src/main/dist/startup.sh | 2 +- pom.xml | 2 +- 19 files changed, 29 insertions(+), 17 deletions(-) diff --git a/datagear-analysis/pom.xml b/datagear-analysis/pom.xml index c5fc9bf5..8bf791c4 100644 --- a/datagear-analysis/pom.xml +++ b/datagear-analysis/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-analysis diff --git a/datagear-connection/pom.xml b/datagear-connection/pom.xml index 1f4c4db4..0df77fe4 100644 --- a/datagear-connection/pom.xml +++ b/datagear-connection/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-connection diff --git a/datagear-dataexchange/pom.xml b/datagear-dataexchange/pom.xml index b5c937a5..277cf621 100644 --- a/datagear-dataexchange/pom.xml +++ b/datagear-dataexchange/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-dataexchange diff --git a/datagear-management/pom.xml b/datagear-management/pom.xml index 809309d3..ca1b7f17 100644 --- a/datagear-management/pom.xml +++ b/datagear-management/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.12.0 + 1.13.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 cb44ff61..0e6a0b17 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 @@ -579,3 +579,9 @@ CREATE TABLE DATAGEAR_DATA_SET_HTTP ); ALTER TABLE DATAGEAR_DATA_SET_HTTP ADD FOREIGN KEY (DS_ID) REFERENCES DATAGEAR_DATA_SET (DS_ID) ON DELETE CASCADE; + + +----------------------------------------- +--version[1.13.0], DO NOT EDIT THIS LINE! +----------------------------------------- + diff --git a/datagear-meta/pom.xml b/datagear-meta/pom.xml index 3188f27c..15fbc219 100644 --- a/datagear-meta/pom.xml +++ b/datagear-meta/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-meta diff --git a/datagear-persistence/pom.xml b/datagear-persistence/pom.xml index 48cedd08..daa90a7b 100644 --- a/datagear-persistence/pom.xml +++ b/datagear-persistence/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-persistence diff --git a/datagear-util/pom.xml b/datagear-util/pom.xml index 806cda8f..b8706ecc 100644 --- a/datagear-util/pom.xml +++ b/datagear-util/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-util diff --git a/datagear-util/src/main/java/org/datagear/util/Global.java b/datagear-util/src/main/java/org/datagear/util/Global.java index cf825d0e..21bc8951 100644 --- a/datagear-util/src/main/java/org/datagear/util/Global.java +++ b/datagear-util/src/main/java/org/datagear/util/Global.java @@ -21,7 +21,7 @@ public final class Global } /** 当前版本号 */ - public static final String VERSION = "1.12.0"; + public static final String VERSION = "1.13.0"; /** 中文产品名称 */ public static final String PRODUCT_NAME_ZH = "数据齿轮"; diff --git a/datagear-web/pom.xml b/datagear-web/pom.xml index bf01a9f2..83a3bb09 100644 --- a/datagear-web/pom.xml +++ b/datagear-web/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-web diff --git a/datagear-web/src/main/resources/org/datagear/web/changelog.txt b/datagear-web/src/main/resources/org/datagear/web/changelog.txt index dd0db1e5..a96bfebc 100644 --- a/datagear-web/src/main/resources/org/datagear/web/changelog.txt +++ b/datagear-web/src/main/resources/org/datagear/web/changelog.txt @@ -272,3 +272,9 @@ DataGear版本更新日志 改进：数据集预览时参数化语句解析结果改为通过按钮点击后显示浮动面板，避免影响页面布局； 改进：图表、数据集页面日期类的参数输入框禁用浏览器自动补全功能，避免遮挡日期选择器； 改进：看板编辑页编辑区最大化按钮移至底部； + + +----------------------------------------- +--v1.13.0 +----------------------------------------- + diff --git a/datagear-web/src/main/resources/org/datagear/web/datagear-version.properties b/datagear-web/src/main/resources/org/datagear/web/datagear-version.properties index 7bdec02a..2a8b02ec 100644 --- a/datagear-web/src/main/resources/org/datagear/web/datagear-version.properties +++ b/datagear-web/src/main/resources/org/datagear/web/datagear-version.properties @@ -1,7 +1,7 @@ #--UTF-8 file-- #系统版本号 -version=1.12.0 +version=1.13.0 #构建日期 buildDate=${buildtimestamp} \ No newline at end of file diff --git a/datagear-webapp/pom.xml b/datagear-webapp/pom.xml index 5dff36fa..8b7c429c 100644 --- a/datagear-webapp/pom.xml +++ b/datagear-webapp/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-webapp diff --git a/datagear-webapp/src/main/webapp/readme.txt b/datagear-webapp/src/main/webapp/readme.txt index 3f89dfea..6f89711b 100644 --- a/datagear-webapp/src/main/webapp/readme.txt +++ b/datagear-webapp/src/main/webapp/readme.txt @@ -1,4 +1,4 @@ -DataGear-v1.12.0 +DataGear-v1.13.0 DataGear是一款数据可视化分析平台，使用Java语言开发，采用浏览器/服务器架构，支持SQL、CSV、Excel、HTTP接口、JSON等多种数据源， 主要功能包括数据管理、SQL工作台、数据导入/导出、数据集管理、图表管理、看板管理等。 diff --git a/datagear-webappembd/pom.xml b/datagear-webappembd/pom.xml index 65ed09b8..541d58bc 100644 --- a/datagear-webappembd/pom.xml +++ b/datagear-webappembd/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 datagear-webappembd diff --git a/datagear-webappembd/src/main/dist/readme.txt b/datagear-webappembd/src/main/dist/readme.txt index 1faea736..0d752481 100644 --- a/datagear-webappembd/src/main/dist/readme.txt +++ b/datagear-webappembd/src/main/dist/readme.txt @@ -1,4 +1,4 @@ -DataGear-v1.12.0 +DataGear-v1.13.0 DataGear是一款数据可视化分析平台，使用Java语言开发，采用浏览器/服务器架构，支持SQL、CSV、Excel、HTTP接口、JSON等多种数据源， 主要功能包括数据管理、SQL工作台、数据导入/导出、数据集管理、图表管理、看板管理等。 diff --git a/datagear-webappembd/src/main/dist/startup.bat b/datagear-webappembd/src/main/dist/startup.bat index 066bf331..4cd7d10c 100644 --- a/datagear-webappembd/src/main/dist/startup.bat +++ b/datagear-webappembd/src/main/dist/startup.bat @@ -1 +1 @@ -java -cp lib\datagear-webappembd-1.12.0.jar;lib\javax.servlet-3.0.0.v201112011016.jar;lib\jetty-all-8.1.22.v20160922.jar;lib\log4j-1.2.17.jar;lib\slf4j-api-1.7.9.jar;lib\slf4j-log4j12-1.7.9.jar org.datagear.webappembd.App \ No newline at end of file +java -cp lib\datagear-webappembd-1.13.0.jar;lib\javax.servlet-3.0.0.v201112011016.jar;lib\jetty-all-8.1.22.v20160922.jar;lib\log4j-1.2.17.jar;lib\slf4j-api-1.7.9.jar;lib\slf4j-log4j12-1.7.9.jar org.datagear.webappembd.App \ No newline at end of file diff --git a/datagear-webappembd/src/main/dist/startup.sh b/datagear-webappembd/src/main/dist/startup.sh index 465c7224..65d4ca9f 100755 --- a/datagear-webappembd/src/main/dist/startup.sh +++ b/datagear-webappembd/src/main/dist/startup.sh @@ -4,7 +4,7 @@ JAVA_HOME=$JAVA_HOME JAVA_OPTS=$JAVA_OPTS JAVA_VERSION="" -APP_CLASSPATH=.:lib/datagear-webappembd-1.12.0.jar:lib/javax.servlet-3.0.0.v201112011016.jar:lib/jetty-all-8.1.22.v20160922.jar:lib/slf4j-api-1.7.9.jar:lib/slf4j-log4j12-1.7.9.jar:lib/log4j-1.2.17.jar +APP_CLASSPATH=.:lib/datagear-webappembd-1.13.0.jar:lib/javax.servlet-3.0.0.v201112011016.jar:lib/jetty-all-8.1.22.v20160922.jar:lib/slf4j-api-1.7.9.jar:lib/slf4j-log4j12-1.7.9.jar:lib/log4j-1.2.17.jar APP_NAME="Data Gear" ECHO_PREFIX="[$APP_NAME] :" diff --git a/pom.xml b/pom.xml index 28217287..e1332c6c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.datagear datagear - 1.12.0 + 1.13.0 pom datagear