Update version to 0.7.0

2018-12-14 17:48:57 +08:00 · 2018-12-14 17:48:57 +08:00 · be64c1acf7
commit be64c1acf7
parent d2e4f4e6b4
17 changed files with 36 additions and 25 deletions
--- 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)

--- a/api/pom.xml
+++ b/api/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/client/pom.xml
+++ b/client/pom.xml
@ -16,7 +16,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- 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);
        }
--- 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<String> headers = Arrays.asList("Client-Version", UtilAndComs.VERSION,
            "Accept-Encoding", "gzip,deflate,sdch",
            "Connection", "Keep-Alive",
-            "RequestId", UuidUtil.generateUuid());
+            "RequestId", UuidUtils.generateUuid());

        String url;

--- a/common/pom.xml
+++ b/common/pom.xml
@ -18,7 +18,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/config/pom.xml
+++ b/config/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
@ -121,6 +121,11 @@
            <artifactId>mockito-core</artifactId>
            <scope>test</scope>
        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.4</version>
+        </dependency>
    </dependencies>
    <build>
        <plugins>
--- a/console/pom.xml
+++ b/console/pom.xml
@ -18,7 +18,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
    </parent>
    <artifactId>nacos-console</artifactId>
    <!--<packaging>war</packaging>-->
--- 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:',
--- 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',
--- 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: '配置列表',
--- a/core/pom.xml
+++ b/core/pom.xml
@ -18,7 +18,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@ -18,7 +18,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/example/pom.xml
+++ b/example/pom.xml
@ -18,7 +18,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/naming/pom.xml
+++ b/naming/pom.xml
@ -18,7 +18,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -21,7 +21,7 @@
    <inceptionYear>2018</inceptionYear>
    <groupId>com.alibaba.nacos</groupId>
    <artifactId>nacos-all</artifactId>
-    <version>0.6.0</version>
+    <version>0.7.0</version>
    <packaging>pom</packaging>

    <name>Alibaba NACOS ${project.version}</name>
--- a/test/pom.xml
+++ b/test/pom.xml
@ -17,7 +17,7 @@
    <parent>
        <groupId>com.alibaba.nacos</groupId>
        <artifactId>nacos-all</artifactId>
-        <version>0.6.0</version>
+        <version>0.7.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
@ -53,6 +53,11 @@
            <version>0.30</version>
        </dependency>

+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>nacos-api</artifactId>
+        </dependency>
+
        <dependency>
            <groupId>${project.groupId}</groupId>
            <artifactId>nacos-client</artifactId>
@ -87,6 +92,7 @@
            <artifactId>spring-boot-test</artifactId>
            <scope>test</scope>
        </dependency>
+
    </dependencies>

    <build>