diff --git a/datagear-analysis/pom.xml b/datagear-analysis/pom.xml index 7e30c4d4..02aa7c78 100644 --- a/datagear-analysis/pom.xml +++ b/datagear-analysis/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-analysis diff --git a/datagear-connection/pom.xml b/datagear-connection/pom.xml index 7178e629..665b680e 100644 --- a/datagear-connection/pom.xml +++ b/datagear-connection/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-connection diff --git a/datagear-dataexchange/pom.xml b/datagear-dataexchange/pom.xml index 4ee896e1..1202b70d 100644 --- a/datagear-dataexchange/pom.xml +++ b/datagear-dataexchange/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-dataexchange diff --git a/datagear-dbinfo/pom.xml b/datagear-dbinfo/pom.xml index 6a35bdbf..b35177a0 100644 --- a/datagear-dbinfo/pom.xml +++ b/datagear-dbinfo/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-dbinfo diff --git a/datagear-dbmodel/pom.xml b/datagear-dbmodel/pom.xml index 71e6dd3a..3879ea90 100644 --- a/datagear-dbmodel/pom.xml +++ b/datagear-dbmodel/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-dbmodel diff --git a/datagear-management/pom.xml b/datagear-management/pom.xml index 01101ed4..c63a89df 100644 --- a/datagear-management/pom.xml +++ b/datagear-management/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 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 ef25d4d2..7664b791 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 @@ -227,9 +227,8 @@ CREATE TABLE DATAGEAR_HTML_DASHBOARD ----------------------------------------- ALTER TABLE DATAGEAR_HTML_DASHBOARD ALTER COLUMN HD_TEMPLATE SET DATA TYPE VARCHAR(500); - ----------------------------------------- ---version[1.7.0], DO NOT EDIT THIS LINE! +--version[1.6.1], DO NOT EDIT THIS LINE! ----------------------------------------- diff --git a/datagear-model/pom.xml b/datagear-model/pom.xml index 054b5728..31e1a221 100644 --- a/datagear-model/pom.xml +++ b/datagear-model/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-model diff --git a/datagear-persistence/pom.xml b/datagear-persistence/pom.xml index 54698a01..9046132b 100644 --- a/datagear-persistence/pom.xml +++ b/datagear-persistence/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-persistence diff --git a/datagear-util/pom.xml b/datagear-util/pom.xml index 76816ce2..91ff0140 100644 --- a/datagear-util/pom.xml +++ b/datagear-util/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 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 f92fe00b..df5a221e 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.7.0"; + public static final String VERSION = "1.6.1"; /** 中文产品名称 */ public static final String PRODUCT_NAME_ZH = "数据齿轮"; diff --git a/datagear-web/pom.xml b/datagear-web/pom.xml index a87d0e2b..bceba00d 100644 --- a/datagear-web/pom.xml +++ b/datagear-web/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 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 360adf4a..ed0a121a 100644 --- a/datagear-web/src/main/resources/org/datagear/web/changelog.txt +++ b/datagear-web/src/main/resources/org/datagear/web/changelog.txt @@ -115,6 +115,7 @@ DataGear版本更新日志 修复:修复某些cookie在主页地址没有'/'结尾时不起作用的BUG; ----------------------------------------- ---v1.7.0 +--v1.6.1 ----------------------------------------- +修复:修复新版本图表插件未能替换旧版本插件的BUG; \ No newline at end of file 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 6fafd415..bac581f9 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.7.0 +version=1.6.1 #构建日期 buildDate=${buildtimestamp} \ No newline at end of file diff --git a/datagear-webapp/pom.xml b/datagear-webapp/pom.xml index d8390576..460ec54e 100644 --- a/datagear-webapp/pom.xml +++ b/datagear-webapp/pom.xml @@ -7,7 +7,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-webapp diff --git a/datagear-webapp/src/main/webapp/readme.txt b/datagear-webapp/src/main/webapp/readme.txt index 7ba61252..807afd66 100644 --- a/datagear-webapp/src/main/webapp/readme.txt +++ b/datagear-webapp/src/main/webapp/readme.txt @@ -1,4 +1,4 @@ -DataGear-v1.7.0 +DataGear-v1.6.1 DataGear是一款数据管理与可视化分析平台,使用Java语言开发,采用浏览器/服务器架构,支持多种数据库, 主要功能包括数据管理、SQL工作台、数据导入/导出、数据集管理、图表管理、看板管理等。 diff --git a/datagear-webappembd/pom.xml b/datagear-webappembd/pom.xml index 34c04d4a..8d7e3315 100644 --- a/datagear-webappembd/pom.xml +++ b/datagear-webappembd/pom.xml @@ -6,7 +6,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 datagear-webappembd diff --git a/datagear-webappembd/src/main/dist/readme.txt b/datagear-webappembd/src/main/dist/readme.txt index a0042561..1abeb25b 100644 --- a/datagear-webappembd/src/main/dist/readme.txt +++ b/datagear-webappembd/src/main/dist/readme.txt @@ -1,4 +1,4 @@ -DataGear-v1.7.0 +DataGear-v1.6.1 DataGear是一款数据管理与可视化分析平台,使用Java语言开发,采用浏览器/服务器架构,支持多种数据库, 主要功能包括数据管理、SQL工作台、数据导入/导出、数据集管理、图表管理、看板管理等。 diff --git a/datagear-webappembd/src/main/dist/startup.bat b/datagear-webappembd/src/main/dist/startup.bat index 14fe71cd..97905998 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.7.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.webappembd.App \ No newline at end of file +java -cp lib\datagear-webappembd-1.6.1.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.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 9cbcc108..0a78d1b9 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.7.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-webappembd-1.6.1.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 cb26c09a..2be748a5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.datagear datagear - 1.7.0 + 1.6.1 pom datagear