Update version to 1.0.2

hy7873 · Jun 28, 2019 · 4605733 · 4605733
1 parent 86f0f3c
commit 4605733
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 24 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/client/pom.xml b/client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/cmdb/pom.xml b/cmdb/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>nacos-all</artifactId>
         <groupId>com.alibaba.nacos</groupId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/pom.xml b/common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/config/pom.xml b/config/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/console/pom.xml b/console/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
     </parent>
     <artifactId>nacos-console</artifactId>
     <!--<packaging>war</packaging>-->

diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/distribution/conf/application.properties b/distribution/conf/application.properties
@@ -4,10 +4,10 @@ server.contextPath=/nacos
 server.servlet.contextPath=/nacos
 server.port=8848
 
-nacos.cmdb.dumpTaskInterval=3600
-nacos.cmdb.eventTaskInterval=10
-nacos.cmdb.labelTaskInterval=300
-nacos.cmdb.loadDataAtStart=false
+# nacos.cmdb.dumpTaskInterval=3600
+# nacos.cmdb.eventTaskInterval=10
+# nacos.cmdb.labelTaskInterval=300
+# nacos.cmdb.loadDataAtStart=false
 
 
 # metrics for prometheus
@@ -39,8 +39,8 @@ server.tomcat.basedir=
 
 nacos.security.ignore.urls=/,/**/*.css,/**/*.js,/**/*.html,/**/*.map,/**/*.svg,/**/*.png,/**/*.ico,/console-fe/public/**,/v1/auth/login,/v1/console/health/**,/v1/cs/**,/v1/ns/**,/v1/cmdb/**,/actuator/**,/v1/console/server/**
 
-nacos.naming.distro.taskDispatchPeriod=200
-nacos.naming.distro.batchSyncKeyCount=1000
-nacos.naming.distro.syncRetryDelay=5000
-nacos.naming.data.warmup=true
-nacos.naming.expireInstance=true
+# nacos.naming.distro.taskDispatchPeriod=200
+# nacos.naming.distro.batchSyncKeyCount=1000
+# nacos.naming.distro.syncRetryDelay=5000
+# nacos.naming.data.warmup=true
+# nacos.naming.expireInstance=true
diff --git a/distribution/plugins/cmdb/nacos-cmdb-plugin-example.jar b/distribution/plugins/cmdb/nacos-cmdb-plugin-example.jar
diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

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

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/ServiceController.java
@@ -407,10 +407,12 @@ public JSONObject subscribers(HttpServletRequest request) {
             result.put("count", count);
 
             return result;
-        } catch (InterruptedException e) {
-
+        } catch (Exception e) {
+            Loggers.SRV_LOG.warn("query subscribers failed!", e);
+            result.put("subscribers", new JSONArray());
+            result.put("count", 0);
+            return result;
         }
-        return result;
     }
 
     private List<String> filterInstanceMetadata(String namespaceId, List<String> serviceNames, String key, String value) {

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <inceptionYear>2018</inceptionYear>
     <groupId>com.alibaba.nacos</groupId>
     <artifactId>nacos-all</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2</version>
     <packaging>pom</packaging>
 
     <name>Alibaba NACOS ${project.version}</name>

diff --git a/test/pom.xml b/test/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>