release: release 1.1.0 (apache#2272)

hejy12 · Feb 19, 2020 · e81ae8d · e81ae8d
1 parent f8d3916
commit e81ae8d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -81,7 +81,7 @@ For more details about principle and design, please go to [Seata wiki page](http
 
 ## Maven dependency
 ```xml
-<seata.version>1.0.0</seata.version>
+<seata.version>1.1.0</seata.version>
 
 <dependency>
     <groupId>io.seata</groupId>
@@ -96,6 +96,7 @@ For more details about principle and design, please go to [Seata wiki page](http
 
 ## Documentation
 
+
 You can view the full documentation from the wiki: [Seata wiki page](https://github.com/seata/seata/wiki).
 
 ## Reporting bugs

diff --git a/all/pom.xml b/all/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>io.seata</groupId>
     <artifactId>seata-all</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
 
     <name>Seata All-in-one ${project.version}</name>
     <url>http://seata.io</url>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -20,7 +20,7 @@
 
     <groupId>io.seata</groupId>
     <artifactId>seata-bom</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/core/src/main/java/io/seata/core/protocol/Version.java b/core/src/main/java/io/seata/core/protocol/Version.java
@@ -31,7 +31,7 @@ public class Version {
     /**
      * The constant CURRENT.
      */
-    public static final String CURRENT = "1.1.0-SNAPSHOT";
+    public static final String CURRENT = "1.1.0";
 
     /**
      * The constant VERSION_MAP.

diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,7 @@
 
     <properties>
         <!-- seata version -->
-        <revision>1.1.0-SNAPSHOT</revision>
+        <revision>1.1.0</revision>
 
         <!-- Compiler settings properties -->
         <maven.compiler.source>1.8</maven.compiler.source>

diff --git a/script/client/spring/application.properties b/script/client/spring/application.properties
@@ -55,8 +55,6 @@ seata.transport.enable-client-batch-send-request=true
 
 seata.config.type=file
 
-seata.config.file.name=file.conf
-
 seata.config.consul.server-addr=127.0.0.1:8500
 
 seata.config.apollo.apollo-meta=http://192.168.1.204:8801
@@ -77,8 +75,6 @@ seata.config.zk.password=
 
 seata.registry.type=file
 
-seata.registry.file.name=file.conf
-
 seata.registry.consul.cluster=default
 seata.registry.consul.server-addr=127.0.0.1:8500
 

diff --git a/script/client/spring/application.yml b/script/client/spring/application.yml
@@ -51,8 +51,6 @@ seata:
     enable-client-batch-send-request: true
   config:
     type: file
-    file:
-      name: file.conf
     consul:
       server-addr: 127.0.0.1:8500
     apollo: