Enable new version number

FederatedAI · Nov 11, 2021 · 4e4a80e · 4e4a80e
1 parent 137ee09
commit 4e4a80e
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 40 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,7 @@
+# Release 2.1.1
+## Major Features and Improvements
+* Fix the bug of starting the serving-server service when Zookeeper is not enabled.
+
 # Release 2.1.0
 ## Major Features and Improvements
 * Support multi-host algorithm model online prediction,currently, the supported multi-host algorithms include HeteroLR and HeteroSecureBoost.

diff --git a/document/docs/quickstart/quickstart.md b/document/docs/quickstart/quickstart.md
@@ -15,9 +15,9 @@ $ mvn clean package
 随后拷贝，比如 serving-server/target/fate-serving-server-{version}-release.zip 到想要部署的路径下，并解压。（version为当前版本号）
 
 用户也可选择下载已编译好的版本，链接如下:   
-•	[fate-serving-server-2.1.0-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-server-2.1.0-release.zip)  
-•	[fate-serving-proxy-2.1.0-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-proxy-2.1.0-release.zip)    
-•	[fate-serving-admin-2.1.0-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-admin-2.1.0-release.zip)  
+•	[fate-serving-server-2.1.1-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-server-2.1.1-release.zip)  
+•	[fate-serving-proxy-2.1.1-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-proxy-2.1.1-release.zip)    
+•	[fate-serving-admin-2.1.1-release.zip](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-admin-2.1.1-release.zip)  
 
 
 ### zookeeper部署

diff --git a/document/docs/service/client.md b/document/docs/service/client.md
@@ -1,9 +1,9 @@
 FATE-Serving提供了fate-serving-client工具
 ### 下载对应版本的fate-serving-client
->linux版本：[fate-serving-client-2.1.0-linux.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.0-linux.tar.gz )     
->mac版本：[fate-serving-client-2.1.0-darwin.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.0-darwin.tar.gz)
+>linux版本：[fate-serving-client-2.1.1-linux.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.1-linux.tar.gz )     
+>mac版本：[fate-serving-client-2.1.1-darwin.tar.gz](https://webank-ai-1251170195.cos.ap-guangzhou.myqcloud.com/fate-serving-client-2.1.1-darwin.tar.gz)
 
-需要先确认下载解压出来的文件有没有可执行权限，没有权限就执行 `chmod +777 fate-serving-client-2.1.0-linux`授权。
+需要先确认下载解压出来的文件有没有可执行权限，没有权限就执行 `chmod +777 fate-serving-client-2.1.1-linux`授权。
 
 ### 启动client    
 在终端中使用`./fate-serving-client`启动client  

diff --git a/fate-serving-admin-ui/package.json b/fate-serving-admin-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "FATE-Serving",
-  "version": "2.0.0",
+  "version": "2.1.1",
   "private": true,
   "author": "FATE Serving",
   "scripts": {

diff --git a/fate-serving-admin-ui/pom.xml b/fate-serving-admin-ui/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/fate-serving-admin/bin/service.sh b/fate-serving-admin/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-admin
 main_class=com.webank.ai.fate.serving.admin.Bootstrap
-module_version=2.1.0
+module_version=2.1.1
 
 case "$1" in
     start)

diff --git a/fate-serving-admin/pom.xml b/fate-serving-admin/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <artifactId>fate-serving-admin</artifactId>
@@ -36,19 +36,19 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-admin-ui</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <!--<dependency>
@@ -118,7 +118,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
     </dependencies>

diff --git a/fate-serving-common/pom.xml b/fate-serving-common/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
         <dependency>
             <groupId>com.lmax</groupId>

diff --git a/fate-serving-core/pom.xml b/fate-serving-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/MetaInfo.java b/fate-serving-core/src/main/java/com/webank/ai/fate/serving/core/bean/MetaInfo.java
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 public class MetaInfo {
-    public static final long CURRENT_VERSION = 210;
+    public static final long CURRENT_VERSION = 211;
     public static List<AdaptorDescriptor.ParamDescriptor> inferenceParamDescriptorList;
     public static List<AdaptorDescriptor.ParamDescriptor> batchInferenceParamDescriptorList;
     public static Boolean PROPERTY_REMOTE_MODEL_INFERENCE_RESULT_CACHE_SWITCH;

diff --git a/fate-serving-extension/pom.xml b/fate-serving-extension/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,7 +31,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/fate-serving-federatedml/pom.xml b/fate-serving-federatedml/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,19 +31,19 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/fate-serving-proxy/bin/service.sh b/fate-serving-proxy/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-proxy
 main_class=com.webank.ai.fate.serving.proxy.bootstrap.Bootstrap
-module_version=2.1.0
+module_version=2.1.1
 
 
 case "$1" in

diff --git a/fate-serving-proxy/pom.xml b/fate-serving-proxy/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <packaging>jar</packaging>
@@ -76,7 +76,7 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-common</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>

diff --git a/fate-serving-register/pom.xml b/fate-serving-register/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <packaging>jar</packaging>

diff --git a/fate-serving-sdk/pom.xml b/fate-serving-sdk/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,13 +31,13 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/fate-serving-server/bin/service.sh b/fate-serving-server/bin/service.sh
@@ -24,7 +24,7 @@ basepath=$(cd `dirname $0`;pwd)
 configpath=$(cd $basepath/conf;pwd)
 module=serving-server
 main_class=com.webank.ai.fate.serving.Bootstrap
-module_version=2.1.0
+module_version=2.1.1
 
 
 case "$1" in

diff --git a/fate-serving-server/pom.xml b/fate-serving-server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>fate-serving</artifactId>
         <groupId>com.webank.ai.fate</groupId>
-        <version>2.1.0</version>
+        <version>${fate.version}</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -31,25 +31,25 @@
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-core</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-federatedml</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-register</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
         <dependency>
             <groupId>com.webank.ai.fate</groupId>
             <artifactId>fate-serving-extension</artifactId>
-            <version>2.1.0</version>
+            <version>${fate.version}</version>
         </dependency>
 
 

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <groupId>com.webank.ai.fate</groupId>
     <artifactId>fate-serving</artifactId>
-    <version>2.1.0</version>
+    <version>${fate.version}</version>
     <packaging>pom</packaging>
     <modelVersion>4.0.0</modelVersion>
 
@@ -37,7 +37,7 @@
     </modules>
 
     <properties>
-        <fate.version>2.1.0</fate.version>
+        <fate.version>2.1.1</fate.version>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>