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

🎉 引入blade-bom统一版本控制

test
smallchill 5 years ago
parent
932793e138
commit
22b0144eac
21 changed files with 11 additions and 79 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. 3
      blade-auth/pom.xml
  2. 2
      blade-common/pom.xml
  3. 8
      blade-gateway/pom.xml
  4. 2
      blade-ops-api/pom.xml
  5. 4
      blade-ops/blade-admin/pom.xml
  6. 3
      blade-ops/blade-develop/pom.xml
  7. 5
      blade-ops/blade-flow-design/pom.xml
  8. 8
      blade-ops/blade-flow/pom.xml
  9. 2
      blade-ops/blade-log/pom.xml
  10. 7
      blade-ops/blade-resource/pom.xml
  11. 3
      blade-ops/blade-turbine/pom.xml
  12. 1
      blade-service-api/blade-dict-api/pom.xml
  13. 3
      blade-service-api/blade-scope-api/pom.xml
  14. 1
      blade-service-api/blade-system-api/pom.xml
  15. 1
      blade-service-api/blade-user-api/pom.xml
  16. 5
      blade-service-api/pom.xml
  17. 5
      blade-service/blade-desk/pom.xml
  18. 2
      blade-service/blade-system/pom.xml
  19. 2
      blade-service/blade-user/pom.xml
  20. 3
      blade-service/pom.xml
  21. 20
      pom.xml

3
blade-auth/pom.xml
Unescape View File

@ -32,12 +32,10 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-db</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId>
<version>${bladex.tool.version}</version>
<exclusions>
<exclusion>
<groupId>org.springblade</groupId>
@ -70,7 +68,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-swagger</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

2
blade-common/pom.xml
Unescape View File

@ -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>

8
blade-gateway/pom.xml
Unescape View File

@ -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>
@ -45,7 +44,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-jwt</artifactId>
<version>${bladex.project.version}</version>
</dependency>
<!--Spring-->
<dependency>
@ -59,7 +57,6 @@
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-client</artifactId>
<version>${spring.boot.admin.version}</version>
</dependency>
<!--Hystrix-->
<dependency>
@ -76,18 +73,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 +92,6 @@
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
<version>${swagger.models.version}</version>
</dependency>
<!--<dependency>
<groupId>io.springfox</groupId>
@ -108,7 +101,6 @@
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>${swagger.bootstrapui.version}</version>
</dependency>
</dependencies>

2
blade-ops-api/pom.xml
Unescape View File

@ -23,7 +23,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-mybatis</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@ -32,7 +31,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-auto</artifactId>
<version>${bladex.tool.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

4
blade-ops/blade-admin/pom.xml
Unescape View File

@ -24,17 +24,14 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-tool</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId>
<version>${bladex.tool.version}</version>
<exclusions>
<exclusion>
<groupId>org.springblade</groupId>
@ -46,7 +43,6 @@
<dependency>
<groupId>de.codecentric</groupId>
<artifactId>spring-boot-admin-starter-server</artifactId>
<version>${spring.boot.admin.version}</version>
</dependency>
</dependencies>

3
blade-ops/blade-develop/pom.xml
Unescape View File

@ -21,17 +21,14 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-boot</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-develop</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>

5
blade-ops/blade-flow-design/pom.xml
Unescape View File

@ -18,7 +18,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@ -75,24 +74,20 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>${mysql.connector.version}</version>
</dependency>
<!-- Oracle -->
<dependency>
<groupId>com.hynnet</groupId>
<artifactId>oracle-driver-ojdbc6</artifactId>
<version>${oracle.connector.version}</version>
</dependency>
<!-- PostgreSql -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.connector.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>1.1.18</version>
</dependency>
</dependencies>

8
blade-ops/blade-flow/pom.xml
Unescape View File

@ -24,17 +24,14 @@
<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-transaction</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
@ -49,18 +46,17 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-auto</artifactId>
<version>${bladex.tool.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-user-api</artifactId>
<version>${bladex.tool.version}</version>
<version>${bladex.project.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-flow-api</artifactId>
<version>${bladex.tool.version}</version>
<version>${bladex.project.version}</version>
</dependency>
<!-- 工作流 -->
<dependency>

2
blade-ops/blade-log/pom.xml
Unescape View File

@ -24,12 +24,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-tenant</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

7
blade-ops/blade-resource/pom.xml
Unescape View File

@ -23,32 +23,27 @@
<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>
<artifactId>blade-starter-alioss</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-dict-api</artifactId>
<version>${bladex.tool.version}</version>
<version>${bladex.project.version}</version>
</dependency>
</dependencies>

3
blade-ops/blade-turbine/pom.xml
Unescape View File

@ -21,17 +21,14 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-launch</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-tool</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-cloud</artifactId>
<version>${bladex.tool.version}</version>
<exclusions>
<exclusion>
<groupId>org.springblade</groupId>

1
blade-service-api/blade-dict-api/pom.xml
Unescape View File

@ -18,7 +18,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-cache</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

3
blade-service-api/blade-scope-api/pom.xml
Unescape View File

@ -18,17 +18,14 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-core-secure</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-cache</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-datascope</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

1
blade-service-api/blade-system-api/pom.xml
Unescape View File

@ -18,7 +18,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-cache</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

1
blade-service-api/blade-user-api/pom.xml
Unescape View File

@ -18,7 +18,6 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-cache</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

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

@ -27,12 +27,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>
@ -41,7 +39,6 @@
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
<version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
@ -52,12 +49,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>

5
blade-service/blade-desk/pom.xml
Unescape View File

@ -20,12 +20,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>
@ -45,17 +43,14 @@
<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>
<artifactId>blade-starter-transaction</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
</dependencies>

2
blade-service/blade-system/pom.xml
Unescape View File

@ -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>

2
blade-service/blade-user/pom.xml
Unescape View File

@ -19,12 +19,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>

3
blade-service/pom.xml
Unescape View File

@ -32,12 +32,11 @@
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-starter-tenant</artifactId>
<version>${bladex.tool.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>
<artifactId>blade-dict-api</artifactId>
<version>${bladex.tool.version}</version>
<version>${bladex.project.version}</version>
</dependency>
<dependency>
<groupId>org.springblade</groupId>

20
pom.xml
Unescape View File

@ -9,7 +9,6 @@
<packaging>pom</packaging>
<properties>
<bladex.tool.version>2.1.0.RELEASE</bladex.tool.version>
<bladex.project.version>2.1.0.RELEASE</bladex.project.version>
<java.version>1.8</java.version>
@ -17,19 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<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.2.0</mybatis.plus.version>
<curator.framework.version>4.0.1</curator.framework.version>
<protostuff.version>1.6.0</protostuff.version>
<flowable.version>6.4.2</flowable.version>
<mysql.connector.version>8.0.17</mysql.connector.version>
<oracle.connector.version>12.1.0.1</oracle.connector.version>
<postgresql.connector.version>42.2.6</postgresql.connector.version>
<spring.boot.admin.version>2.1.5</spring.boot.admin.version>
<alibaba.cloud.version>2.1.0.RELEASE</alibaba.cloud.version>
<spring.boot.version>2.1.9.RELEASE</spring.boot.version>
<spring.cloud.version>Greenwich.SR3</spring.cloud.version>
@ -74,6 +61,13 @@
<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>
</dependencies>
</dependencyManagement>

Write Preview
Loading…
Cancel
Save