升级版本号，用于标识新版本开发

isgasho · Mar 9, 2020 · da1c922 · da1c922
1 parent 486aa7c
commit da1c922
Show file tree

Hide file tree

Showing 21 changed files with 31 additions and 20 deletions.
diff --git a/datagear-analysis/pom.xml b/datagear-analysis/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-analysis</artifactId>

diff --git a/datagear-connection/pom.xml b/datagear-connection/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-connection</artifactId>

diff --git a/datagear-dataexchange/pom.xml b/datagear-dataexchange/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-dataexchange</artifactId>

diff --git a/datagear-dbinfo/pom.xml b/datagear-dbinfo/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-dbinfo</artifactId>

diff --git a/datagear-dbmodel/pom.xml b/datagear-dbmodel/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-dbmodel</artifactId>

diff --git a/datagear-management/pom.xml b/datagear-management/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-management</artifactId>

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
@@ -227,3 +227,9 @@ 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!
+-----------------------------------------
+
diff --git a/datagear-model/pom.xml b/datagear-model/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-model</artifactId>

diff --git a/datagear-persistence/pom.xml b/datagear-persistence/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-persistence</artifactId>

diff --git a/datagear-util/pom.xml b/datagear-util/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-util</artifactId>

diff --git 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 @@ private Global()
 	}
 
 	/** 当前版本号 */
-	public static final String VERSION = "1.6.0";
+	public static final String VERSION = "1.7.0";
 
 	/** 中文产品名称 */
 	public static final String PRODUCT_NAME_ZH = "数据齿轮";

diff --git a/datagear-web/pom.xml b/datagear-web/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-web</artifactId>

diff --git a/datagear-web/src/main/resources/org/datagear/web/changelog.txt b/datagear-web/src/main/resources/org/datagear/web/changelog.txt
@@ -112,4 +112,9 @@ DataGear版本更新日志
 改进：改进主页数据源栏下拉操作菜单功能，选中表时也可以激活SQL工作台、数据导入/导出等功能菜单；
 修复：修复展示看板时，点击某些资源链接后显示源码的BUG；
 修复：修复看板在展示后，无法删除某些看板资源的BUG；
-修复：修复某些cookie在主页地址没有'/'结尾时不起作用的BUG；
+修复：修复某些cookie在主页地址没有'/'结尾时不起作用的BUG；
+
+-----------------------------------------
+--v1.7.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
@@ -1,7 +1,7 @@
 #--UTF-8 file--
 
 #系统版本号
-version=1.6.0
+version=1.7.0
 
 #构建日期
 buildDate=${buildtimestamp}
diff --git a/datagear-webapp/pom.xml b/datagear-webapp/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-webapp</artifactId>

diff --git a/datagear-webapp/src/main/webapp/readme.txt b/datagear-webapp/src/main/webapp/readme.txt
@@ -1,4 +1,4 @@
-DataGear-v1.6.0
+DataGear-v1.7.0
 
 DataGear是一款数据管理与可视化分析平台，使用Java语言开发，采用浏览器/服务器架构，支持多种数据库，
 主要功能包括数据管理、SQL工作台、数据导入/导出、数据集管理、图表管理、看板管理等。

diff --git a/datagear-webappembd/pom.xml b/datagear-webappembd/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.6.0</version>
+		<version>1.7.0</version>
 	</parent>
 
 	<artifactId>datagear-webappembd</artifactId>

diff --git a/datagear-webappembd/src/main/dist/readme.txt b/datagear-webappembd/src/main/dist/readme.txt
@@ -1,4 +1,4 @@
-DataGear-v1.6.0
+DataGear-v1.7.0
 
 DataGear是一款数据管理与可视化分析平台，使用Java语言开发，采用浏览器/服务器架构，支持多种数据库，
 主要功能包括数据管理、SQL工作台、数据导入/导出、数据集管理、图表管理、看板管理等。

diff --git a/datagear-webappembd/src/main/dist/startup.bat b/datagear-webappembd/src/main/dist/startup.bat
@@ -1 +1 @@
-java -cp lib\datagear-webappembd-1.6.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
+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
diff --git 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.6.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.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_NAME="Data Gear"
 ECHO_PREFIX="[$APP_NAME]  :"

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.datagear</groupId>
 	<artifactId>datagear</artifactId>
-	<version>1.6.0</version>
+	<version>1.7.0</version>
 	<packaging>pom</packaging>
 
 	<name>datagear</name>
-Original file line number
+Diff line change
@@ Expand Up / @@ -227,3 +227,9 @@ 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!
+    -----------------------------------------
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		java -cp lib\datagear-webappembd-1.6.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
		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