From be64c1acf77905c984f92ae749005524a580cc78 Mon Sep 17 00:00:00 2001 From: nkorange Date: Fri, 14 Dec 2018 17:48:57 +0800 Subject: [PATCH] Update version to 0.7.0 --- CHANGELOG.md | 16 ++++++++-------- api/pom.xml | 2 +- client/pom.xml | 2 +- .../client/config/impl/HttpSimpleClient.java | 2 +- .../nacos/client/naming/net/NamingProxy.java | 2 +- common/pom.xml | 2 +- config/pom.xml | 7 ++++++- console/pom.xml | 2 +- .../resources/static/console-fe/src/i18ndoc.js | 4 ++-- .../static/console-fe/src/locales/en-US.js | 2 +- .../static/console-fe/src/locales/zh-CN.js | 2 +- core/pom.xml | 2 +- distribution/pom.xml | 2 +- example/pom.xml | 2 +- naming/pom.xml | 2 +- pom.xml | 2 +- test/pom.xml | 8 +++++++- 17 files changed, 36 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca639f871..aa841c7b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,13 @@ ## 0.6.0(Dec, 2018) -[#388] Cluster name should be provided in the Instance -[#377] Clean up messy code in Naming module -[#369] Support instance list persisted on disk -[#366] findbugs-maven-plugin version -[#362] The metadata will lost when online or offline instance through web ui -[#352] Refactoring internationalization Nacos console -[#278] Nacos docker img -[#243] optimize the efficiency of integration testing, it’s taking too long now +* [#388] Cluster name should be provided in the Instance +* [#377] Clean up messy code in Naming module +* [#369] Support instance list persisted on disk +* [#366] findbugs-maven-plugin version +* [#362] The metadata will lost when online or offline instance through web ui +* [#352] Refactoring internationalization Nacos console +* [#278] Nacos docker img +* [#243] optimize the efficiency of integration testing, it’s taking too long now ## 0.5.0(Nov, 2018) diff --git a/api/pom.xml b/api/pom.xml index eb5a663dc..05dfc4dce 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,7 +16,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 53b1959cd..13e8fa403 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -16,7 +16,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 ../pom.xml diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java index a18d6bd33..d2f016e2d 100644 --- a/client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java +++ b/client/src/main/java/com/alibaba/nacos/client/config/impl/HttpSimpleClient.java @@ -217,7 +217,7 @@ public class HttpSimpleClient { newHeaders.add("exConfigInfo"); newHeaders.add("true"); newHeaders.add("RequestId"); - newHeaders.add(UuidUtil.generateUuid()); + newHeaders.add(UuidUtils.generateUuid()); if (headers != null) { newHeaders.addAll(headers); } diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java b/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java index 7782aee09..aff9176b8 100644 --- a/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java +++ b/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java @@ -293,7 +293,7 @@ public class NamingProxy { List headers = Arrays.asList("Client-Version", UtilAndComs.VERSION, "Accept-Encoding", "gzip,deflate,sdch", "Connection", "Keep-Alive", - "RequestId", UuidUtil.generateUuid()); + "RequestId", UuidUtils.generateUuid()); String url; diff --git a/common/pom.xml b/common/pom.xml index 58a5e2d98..a46306dab 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 ../pom.xml 4.0.0 diff --git a/config/pom.xml b/config/pom.xml index 0dadee126..b212285d8 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -17,7 +17,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 4.0.0 @@ -121,6 +121,11 @@ mockito-core test + + org.apache.commons + commons-lang3 + 3.4 + diff --git a/console/pom.xml b/console/pom.xml index 67bf8ce13..b3451649a 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 nacos-console diff --git a/console/src/main/resources/static/console-fe/src/i18ndoc.js b/console/src/main/resources/static/console-fe/src/i18ndoc.js index 44516d164..b4675bbfd 100644 --- a/console/src/main/resources/static/console-fe/src/i18ndoc.js +++ b/console/src/main/resources/static/console-fe/src/i18ndoc.js @@ -12,7 +12,7 @@ */ module.exports = { 'zh-cn': { - 'com.alibaba.nacos.layout.noenv.nacosversion': '0.6.0', + 'com.alibaba.nacos.layout.noenv.nacosversion': '0.7.0', 'com.alibaba.nacos.page.configurationManagementVirtual': '配置管理', 'com.alibaba.nacos.page.serviceManagementVirtual': '服务管理', 'nacos.component.ExportDialog.tags2': '标签:', @@ -574,7 +574,7 @@ module.exports = { 'nacos.page.ConfigEditor.submit_failed': '不能为空, 提交失败', }, 'en-us': { - 'com.alibaba.nacos.layout.noenv.nacosversion': '0.6.0', + 'com.alibaba.nacos.layout.noenv.nacosversion': '0.7.0', 'com.alibaba.nacos.page.configurationManagementVirtual': 'ConfigManagement', 'com.alibaba.nacos.page.serviceManagementVirtual': 'ServiceManagement', 'nacos.component.CloneDialog.the_same_configuration': 'Conflict:', diff --git a/console/src/main/resources/static/console-fe/src/locales/en-US.js b/console/src/main/resources/static/console-fe/src/locales/en-US.js index cb9e05593..3ee2a2529 100644 --- a/console/src/main/resources/static/console-fe/src/locales/en-US.js +++ b/console/src/main/resources/static/console-fe/src/locales/en-US.js @@ -21,7 +21,7 @@ const I18N_CONF = { }, MainLayout: { nacosName: 'NACOS', - nacosVersion: '0.6.0', + nacosVersion: '0.7.0', doesNotExist: 'The page you visit does not exist', configurationManagementVirtual: 'ConfigManagement', configurationManagement: 'Configurations', diff --git a/console/src/main/resources/static/console-fe/src/locales/zh-CN.js b/console/src/main/resources/static/console-fe/src/locales/zh-CN.js index c6db4e99d..c9ba921a2 100644 --- a/console/src/main/resources/static/console-fe/src/locales/zh-CN.js +++ b/console/src/main/resources/static/console-fe/src/locales/zh-CN.js @@ -21,7 +21,7 @@ const I18N_CONF = { }, MainLayout: { nacosName: 'NACOS', - nacosVersion: '0.6.0', + nacosVersion: '0.7.0', doesNotExist: '您访问的页面不存在', configurationManagementVirtual: '配置管理', configurationManagement: '配置列表', diff --git a/core/pom.xml b/core/pom.xml index 1c506063a..50ae32073 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 ../pom.xml diff --git a/distribution/pom.xml b/distribution/pom.xml index 633e4ae2c..481ea6a56 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 ../pom.xml diff --git a/example/pom.xml b/example/pom.xml index c03356812..788442c8f 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 ../pom.xml diff --git a/naming/pom.xml b/naming/pom.xml index 97b559ea7..ef0450326 100644 --- a/naming/pom.xml +++ b/naming/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 ../pom.xml diff --git a/pom.xml b/pom.xml index 2b91fbc4a..cdcc43450 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 2018 com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 pom Alibaba NACOS ${project.version} diff --git a/test/pom.xml b/test/pom.xml index 6913199b4..ef0162483 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -17,7 +17,7 @@ com.alibaba.nacos nacos-all - 0.6.0 + 0.7.0 ../pom.xml 4.0.0 @@ -53,6 +53,11 @@ 0.30 + + ${project.groupId} + nacos-api + + ${project.groupId} nacos-client @@ -87,6 +92,7 @@ spring-boot-test test +