Просмотр исходного кода

:arrow_up: 升级springboot至2.1.16,seata至1.3.0,nacos至1.3.1

smallchill 5 лет назад
Родитель
Сommit
13f74cf1e2

+ 1 - 1
blade-biz-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example-api/blade-dubbo-provider-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example-api/blade-stream-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
blade-example-api/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.5.1.RELEASE</version>
+    <version>2.5.2.SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例API集合</description>
 

+ 1 - 1
blade-example/blade-dubbo-consumer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-dubbo-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-easypoi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-mq-kafka/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-mq-rabbit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-seata-order/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-seata-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-stream-consumer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-stream-provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-example/blade-websocket/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-example</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
blade-example/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-example</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.5.1.RELEASE</version>
+    <version>2.5.2.SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务范例集合</description>
 

+ 1 - 1
blade-gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 1 - 1
blade-service-api/blade-demo-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>blade-service-api</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

+ 2 - 2
blade-service-api/pom.xml

@@ -5,14 +5,14 @@
     <parent>
         <artifactId>BladeX-Biz</artifactId>
         <groupId>org.springblade</groupId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>blade-service-api</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.5.1.RELEASE</version>
+    <version>2.5.2.SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务API集合</description>
 

+ 1 - 1
blade-service/blade-demo/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>blade-service</artifactId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

+ 2 - 2
blade-service/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>org.springblade</groupId>
         <artifactId>BladeX-Biz</artifactId>
-        <version>2.5.1.RELEASE</version>
+        <version>2.5.2.SNAPSHOT</version>
     </parent>
 
     <artifactId>blade-service</artifactId>
     <name>${project.artifactId}</name>
-    <version>2.5.1.RELEASE</version>
+    <version>2.5.2.SNAPSHOT</version>
     <packaging>pom</packaging>
     <description>BladeX 微服务集合</description>
 

+ 3 - 3
pom.xml

@@ -5,11 +5,11 @@
 
     <groupId>org.springblade</groupId>
     <artifactId>BladeX-Biz</artifactId>
-    <version>2.5.1.RELEASE</version>
+    <version>2.5.2.SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <bladex.project.version>2.5.1.RELEASE</bladex.project.version>
+        <bladex.project.version>2.5.2.SNAPSHOT</bladex.project.version>
 
         <java.version>1.8</java.version>
         <maven.plugin.version>3.8.1</maven.plugin.version>
@@ -19,7 +19,7 @@
         <flowable.version>6.4.2</flowable.version>
         <dubbo.version>2.7.5</dubbo.version>
 
-        <spring.boot.version>2.1.14.RELEASE</spring.boot.version>
+        <spring.boot.version>2.1.16.RELEASE</spring.boot.version>
         <spring.cloud.version>Greenwich.SR6</spring.cloud.version>
         <spring.platform.version>Cairo-SR8</spring.platform.version>
 

+ 1 - 1
script/docker/app/.env

@@ -1,2 +1,2 @@
 REGISTER=192.168.0.157/blade
-TAG=2.5.1.RELEASE
+TAG=2.5.2.SNAPSHOT

+ 1 - 1
script/docker/app/docker-compose.yml

@@ -28,7 +28,7 @@ services:
         ipv4_address: 172.30.0.58
 
   seata-server:
-    image: seataio/seata-server:1.2.0
+    image: seataio/seata-server:1.3.0
     hostname: "seata-server"
     ports:
       - 8091:8091