Merge branch '5.0.0-dev' of https://github.com/codingapi/tx-lcn into …

…5.0.0-dev
codingapi · Feb 2, 2019 · 7544ff8 · 7544ff8
2 parents 031636d + 9cc577a
commit 7544ff8
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# tx-lcn分布式事务框架 (5.0.0.RC2)
+# tx-lcn分布式事务框架 (5.0.0)
 
 [![Gitter](https://badges.gitter.im/codingapi/tx-lcn.svg)](https://gitter.im/codingapi/tx-lcn?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![BBS](https://bbs.txlcn.org/style/Archlinux/txlcn-bbs.svg)](https://bbs.txlcn.org)

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.codingapi.txlcn</groupId>
     <artifactId>tx-lcn</artifactId>
-    <version>5.0.0.RC2</version>
+    <version>5.0.0</version>
     <packaging>pom</packaging>
 
 
@@ -43,7 +43,7 @@
         <maven.javadoc.plugin>2.10.3</maven.javadoc.plugin>
         <maven.gpg.plugin>1.6</maven.gpg.plugin>
 
-        <codingapi.txlcn.version>5.0.0.RC2</codingapi.txlcn.version>
+        <codingapi.txlcn.version>5.0.0</codingapi.txlcn.version>
 
         <txlcn-org.projectlombok.version>1.18.0</txlcn-org.projectlombok.version>
         <txlcn-spring-cloud.version>Finchley.SR2</txlcn-spring-cloud.version>

diff --git a/run.txmanager.bat b/run.txmanager.bat
@@ -1,4 +1,4 @@
 @echo off
 
-start java -jar  -Xms256m -Xmx512m  txlcn-tm/target/txlcn-tm-5.0.0.RC2.jar
+start java -jar  -Xms256m -Xmx512m  txlcn-tm/target/txlcn-tm-5.0.0.jar
 
diff --git a/txlcn-common/pom.xml b/txlcn-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0.RC2</version>
+        <version>5.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/txlcn-logger/pom.xml b/txlcn-logger/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0.RC2</version>
+        <version>5.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/txlcn-tc/pom.xml b/txlcn-tc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.codingapi.txlcn</groupId>
         <artifactId>tx-lcn</artifactId>
-        <version>5.0.0.RC2</version>
+        <version>5.0.0</version>
     </parent>
 
     <artifactId>txlcn-tc</artifactId>

diff --git a/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/config/EnableDistributedTransaction.java b/txlcn-tc/src/main/java/com/codingapi/txlcn/tc/config/EnableDistributedTransaction.java
@@ -25,7 +25,7 @@
  * Date: 1/19/19
  *
  * @author ujued
- * @since 5.0.0.RC2
+ * @since 5.0.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)

diff --git a/txlcn-tc/src/main/resources/banner.txt b/txlcn-tc/src/main/resources/banner.txt
@@ -7,4 +7,4 @@ ${AnsiColor.BRIGHT_GREEN}
          | | / /^\ \     | |___| \__/\| |\  |
          \_/ \/   \/     \_____/\____/\_| \_/
 
-         TX-LCN TxClient  version:5.0.0.RC2
+         TX-LCN TxClient  version:5.0.0
diff --git a/txlcn-tm/pom.xml b/txlcn-tm/pom.xml
@@ -6,11 +6,11 @@
     <parent>
         <groupId>com.codingapi.txlcn</groupId>
         <artifactId>tx-lcn</artifactId>
-        <version>5.0.0.RC2</version>
+        <version>5.0.0</version>
     </parent>
 
     <artifactId>txlcn-tm</artifactId>
-    <version>5.0.0.RC2</version>
+    <version>5.0.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

diff --git a/txlcn-tm/src/main/java/com/codingapi/txlcn/tm/support/TxLcnManagerBanner.java b/txlcn-tm/src/main/java/com/codingapi/txlcn/tm/support/TxLcnManagerBanner.java
@@ -32,7 +32,7 @@
  */
 public class TxLcnManagerBanner implements Banner {
 
-    public static final String VERSION = "5.0.0.RC2";
+    public static final String VERSION = "5.0.0";
 
     private static final String BANNER =
             "          _______   __      _     _____  _   _          \n" +

diff --git a/txlcn-tracing/pom.xml b/txlcn-tracing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0.RC2</version>
+        <version>5.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/txlcn-txmsg-netty/pom.xml b/txlcn-txmsg-netty/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0.RC2</version>
+        <version>5.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/txlcn-txmsg/pom.xml b/txlcn-txmsg/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tx-lcn</artifactId>
         <groupId>com.codingapi.txlcn</groupId>
-        <version>5.0.0.RC2</version>
+        <version>5.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>