升级版本号至1.12.0，标识新功能开发

isgasho · Aug 26, 2020 · 7d51ae5 · 7d51ae5
1 parent a7165b5
commit 7d51ae5
Show file tree

Hide file tree

Showing 19 changed files with 29 additions and 17 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.11.1</version>
+		<version>1.12.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.11.1</version>
+		<version>1.12.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.11.1</version>
+		<version>1.12.0</version>
 	</parent>
 
 	<artifactId>datagear-dataexchange</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.11.1</version>
+		<version>1.12.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
@@ -506,3 +506,9 @@ ALTER TABLE DATAGEAR_DATA_SET_JSON_FILE ADD FOREIGN KEY (DS_ID) REFERENCES DATAG
 --version[1.11.1], DO NOT EDIT THIS LINE!
 -----------------------------------------
 
+
+
+-----------------------------------------
+--version[1.12.0], DO NOT EDIT THIS LINE!
+-----------------------------------------
+
diff --git a/datagear-meta/pom.xml b/datagear-meta/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.datagear</groupId>
 		<artifactId>datagear</artifactId>
-		<version>1.11.1</version>
+		<version>1.12.0</version>
 	</parent>
 
 	<artifactId>datagear-meta</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.11.1</version>
+		<version>1.12.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.11.1</version>
+		<version>1.12.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.11.1";
+	public static final String VERSION = "1.12.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.11.1</version>
+		<version>1.12.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
@@ -249,3 +249,9 @@ DataGear版本更新日志
 改进：匿名用户创建的数据集、图表、看板在登录后将被迁移至登录用户；
 改进：SQL数据集预览SQL出错时给出友好提示；
 改进：导入看板模板文件不存在时给出友好提示；
+
+
+-----------------------------------------
+--v1.12.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.11.1
+version=1.12.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.11.1</version>
+		<version>1.12.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.11.1
+DataGear-v1.12.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.11.1</version>
+		<version>1.12.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.11.1
+DataGear-v1.12.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.11.1.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
+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
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.11.1.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.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_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.11.1</version>
+	<version>1.12.0</version>
 	<packaging>pom</packaging>
 
 	<name>datagear</name>
-Original file line number
+Diff line change
@@ Expand Up @@
     --version[1.11.1], DO NOT EDIT THIS LINE!
     -----------------------------------------
+    -----------------------------------------
+    --version[1.12.0], DO NOT EDIT THIS LINE!
+    -----------------------------------------
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		java -cp lib\datagear-webappembd-1.11.1.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
		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