升级正式版本 v1.4.2

xuxueli · May 30, 2018 · 72838e4 · 72838e4
1 parent 53e9d8f
commit 72838e4
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/doc/XXL-CONF官方文档.md b/doc/XXL-CONF官方文档.md
@@ -475,7 +475,7 @@ http://{Agent部署路径}/confagent?confKeys=key01,key02
 - 2、XML配置方式，Bean初始化时配置加载逻辑优化；
 - 3、升级多项依赖至较新版本：spring、spring-boot、jackson、freemarker、mybatis等；
 
-### 6.9 版本 v1.4.2 新特性[迭代中]
+### 6.9 版本 v1.4.2 新特性[2018-05-30]
 - 1、多环境支持：单个调度中心集群，支持自定义多套环境，管理多个环境的的配置数据；环境之间相互隔离；
 - 2、多数据类型配置：支持多种数据类型配置，如：String、Boolean、Short、Integer、Long、Float、Double 等；
 - 3、多语言支持：提供配置Agent服务，可据此通过Http获取配置数据，从而实现多语言支持。Agent存在Ehcache缓存性能极高，并且支持集群横向扩展；
@@ -492,7 +492,6 @@ http://{Agent部署路径}/confagent?confKeys=key01,key02
 - 14、升级pom依赖至较新版本，如Spring、Zookeeper等；
 
 
-
 ### TODO LIST
 - 1、本地优先配置：优先加载该配置中数据，常用于本地调试。早期版本功能用处不大，现已移除，考虑是否完全移除；
 - 2、zookeeper客户端迁移至curator；

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.xuxueli</groupId>
 	<artifactId>xxl-conf</artifactId>
-	<version>1.4.2-SNAPSHOT</version>
+	<version>1.4.2</version>
 	<packaging>pom</packaging>
 
 	<name>xxl-conf</name>

diff --git a/xxl-conf-admin/pom.xml b/xxl-conf-admin/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-conf</artifactId>
-		<version>1.4.2-SNAPSHOT</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>xxl-conf-admin</artifactId>
 	<packaging>war</packaging>

diff --git a/xxl-conf-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl b/xxl-conf-admin/src/main/webapp/WEB-INF/template/common/common.macro.ftl
@@ -149,7 +149,7 @@
 
 <#macro commonFooter >
 	<footer class="main-footer">
-		Powered by <b>XXL-CONF</b> 1.4.2-SNAPSHOT
+		Powered by <b>XXL-CONF</b> 1.4.2
 		<div class="pull-right hidden-xs">
 			<strong>Copyright &copy; 2015-${.now?string('yyyy')} &nbsp;
                 <a href="http://www.xuxueli.com/" target="_blank" >xuxueli</a>

diff --git a/xxl-conf-core/pom.xml b/xxl-conf-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-conf</artifactId>
-		<version>1.4.2-SNAPSHOT</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>xxl-conf-core</artifactId>
 	<packaging>jar</packaging>

diff --git a/xxl-conf-samples/pom.xml b/xxl-conf-samples/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-conf</artifactId>
-		<version>1.4.2-SNAPSHOT</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>xxl-conf-samples</artifactId>
 	<packaging>pom</packaging>

diff --git a/xxl-conf-samples/xxl-conf-sample-jfinal/pom.xml b/xxl-conf-samples/xxl-conf-sample-jfinal/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>xxl-conf-samples</artifactId>
         <groupId>com.xuxueli</groupId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xxl-conf-sample-jfinal</artifactId>

diff --git a/xxl-conf-samples/xxl-conf-sample-nutz/pom.xml b/xxl-conf-samples/xxl-conf-sample-nutz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>xxl-conf-samples</artifactId>
         <groupId>com.xuxueli</groupId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>xxl-conf-sample-nutz</artifactId>

diff --git a/xxl-conf-samples/xxl-conf-sample-spring/pom.xml b/xxl-conf-samples/xxl-conf-sample-spring/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.xuxueli</groupId>
 		<artifactId>xxl-conf-samples</artifactId>
-		<version>1.4.2-SNAPSHOT</version>
+		<version>1.4.2</version>
 	</parent>
 	<artifactId>xxl-conf-sample-spring</artifactId>
 	<packaging>war</packaging>

diff --git a/xxl-conf-samples/xxl-conf-sample-springboot/pom.xml b/xxl-conf-samples/xxl-conf-sample-springboot/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.xuxueli</groupId>
         <artifactId>xxl-conf-samples</artifactId>
-        <version>1.4.2-SNAPSHOT</version>
+        <version>1.4.2</version>
     </parent>
     <artifactId>xxl-conf-sample-springboot</artifactId>
     <packaging>jar</packaging>