java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

🎉 2.2.0.RELEASE

test
smallchill 6 years ago
parent
8ecaaa9047
commit
3597bbf909
15 changed files with 33 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      blade-common/pom.xml
  2. 2
      blade-example-api/blade-dubbo-provider-api/pom.xml
  3. 4
      blade-example-api/pom.xml
  4. 4
      blade-example/blade-dubbo-consumer/pom.xml
  5. 4
      blade-example/blade-dubbo-provider/pom.xml
  6. 4
      blade-example/blade-seata-order/pom.xml
  7. 4
      blade-example/blade-seata-storage/pom.xml
  8. 5
      blade-example/pom.xml
  9. 11
      blade-gateway/pom.xml
  10. 2
      blade-service-api/blade-demo-api/pom.xml
  11. 9
      blade-service-api/pom.xml
  12. 8
      blade-service/blade-demo/pom.xml
  13. 6
      blade-service/pom.xml
  14. 28
      pom.xml
  15. 2
      script/docker/.env

4
blade-common/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -18,12 +18,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-auto</artifactId>
<version>${bladex.tool.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

2
blade-example-api/blade-dubbo-provider-api/pom.xml
Unescape View File

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

4
blade-example-api/pom.xml
Unescape View File

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

4
blade-example/blade-dubbo-consumer/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -18,12 +18,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>

4
blade-example/blade-dubbo-provider/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -18,12 +18,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>

4
blade-example/blade-seata-order/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -18,12 +18,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-transaction</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

4
blade-example/blade-seata-storage/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>blade-example</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -18,12 +18,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-transaction</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

5
blade-example/pom.xml
Unescape View File

@ -5,13 +5,13 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-example</artifactId>
<name>${project.artifactId}</name>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务范例集合</description>
@ -26,7 +26,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
</dependencies>

11
blade-gateway/pom.xml
Unescape View File

@ -5,7 +5,7 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -19,7 +19,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId>
<version>${bladex.tool.version}</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@ -34,7 +33,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId>
<version>${bladex.project.version}</version>
<exclusions>
<exclusion>
<groupId>org.springblade</groupId>
@ -45,7 +43,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-jwt</artifactId>
<version>${bladex.project.version}</version>
</dependency>
<!--Spring-->
<dependency>
@ -59,7 +56,6 @@
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring.boot.admin.version}</version>
</dependency>
<!--Hystrix-->
<dependency>
@ -76,18 +72,15 @@
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
<version>${alibaba.cloud.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
<version>${alibaba.cloud.version}</version>
</dependency>
<!--Swagger-->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
@ -98,7 +91,6 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>${swagger.models.version}</version>
</dependency>
<!--<dependency>
<groupId>io.springfox</groupId>
@ -108,7 +100,6 @@
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>${swagger.bootstrapui.version}</version>
</dependency>
</dependencies>

2
blade-service-api/blade-demo-api/pom.xml
Unescape View File

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

9
blade-service-api/pom.xml
Unescape View File

@ -5,14 +5,14 @@
<parent>
<artifactId>BladeX-Biz</artifactId>
<groupId>org.springblade</groupId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>blade-service-api</artifactId>
<name>${project.artifactId}</name>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务API集合</description>
@ -24,12 +24,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-mybatis</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-tenant</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@ -38,7 +36,6 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
@ -49,12 +46,10 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>${swagger.models.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-auto</artifactId>
<version>${bladex.tool.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

8
blade-service/blade-demo/pom.xml
Unescape View File

@ -6,7 +6,7 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>blade-service</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@ -20,22 +20,18 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-minio</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-qiniu</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
@ -50,13 +46,11 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-test</artifactId>
<version>${bladex.tool.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-auto</artifactId>
<version>${bladex.tool.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

6
blade-service/pom.xml
Unescape View File

@ -7,12 +7,12 @@
<parent>
<groupId>org.springblade</groupId>
<artifactId>BladeX-Biz</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
</parent>
<artifactId>blade-service</artifactId>
<name>${project.artifactId}</name>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
<packaging>pom</packaging>
<description>BladeX 微服务集合</description>
@ -24,12 +24,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId>
<version>${bladex.project.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-tenant</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

28
pom.xml
Unescape View File

@ -5,25 +5,15 @@
<groupId>org.springblade</groupId>
<artifactId>BladeX-Biz</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.2.0.RELEASE</version>
<packaging>pom</packaging>
<properties>
<bladex.tool.version>2.1.0.RELEASE</bladex.tool.version>
<bladex.project.version>2.1.0.RELEASE</bladex.project.version>
<bladex.project.version>2.2.0.RELEASE</bladex.project.version>
<java.version>1.8</java.version>
<swagger.version>2.9.2</swagger.version>
<swagger.models.version>1.5.21</swagger.models.version>
<swagger.bootstrapui.version>1.9.6</swagger.bootstrapui.version>
<mybatis.plus.version>3.1.0</mybatis.plus.version>
<curator.framework.version>4.0.1</curator.framework.version>
<protostuff.version>1.6.0</protostuff.version>
<flowable.version>6.4.1</flowable.version>
<mysql.connector.version>8.0.16</mysql.connector.version>
<spring.boot.admin.version>2.1.4</spring.boot.admin.version>
<alibaba.cloud.version>2.1.0.RELEASE</alibaba.cloud.version>
<flowable.version>6.4.2</flowable.version>
<dubbo.version>2.7.3</dubbo.version>
<spring.boot.version>2.1.8.RELEASE</spring.boot.version>
@ -68,6 +58,18 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springblade.platform</groupId>
<artifactId>blade-bom</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-common</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

2
script/docker/.env
Unescape View File

@ -1,2 +1,2 @@
REGISTER=192.168.0.157/blade
TAG=2.1.0.RELEASE
TAG=2.2.0.RELEASE

Write Preview
Loading…
Cancel
Save