Skip to content

Commit 37236d3

Browse files
839536839536
authored
Merge pull request #68 from aoju/develop
5.2.0
2 parents 44680c2 + 0de9773 commit 37236d3

File tree

1,590 files changed

+2103
-5117
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,590 files changed

+2103
-5117
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ script:
2929
- cd ../bus-pager && mvn install -DskipTests=true
3030
- cd ../bus-sensitive && mvn install -DskipTests=true
3131
- cd ../bus-socket && mvn install -DskipTests=true
32-
- cd ../bus-swagger && mvn install -DskipTests=true
3332
- cd ../bus-validate && mvn install -DskipTests=true
3433
- cd ../bus-tracer && mvn install -DskipTests=true
3534
- cd ../bus-base && mvn install -DskipTests=true

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<p align="center">
22
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
3-
<img src="https://img.shields.io/badge/maven--central-v5.1.0-blue.svg?label=Maven%20Central" ></img>
3+
<img src="https://img.shields.io/badge/maven--central-v5.2.0-blue.svg?label=Maven%20Central" ></img>
44
</a>
55
<a target="_blank" href="https://travis-ci.org/aoju/bus">
66
<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
@@ -96,13 +96,13 @@ Bus (应用/服务总线) 是一个微服务套件、基础框架，它基于Jav
9696
<dependency>
9797
<groupId>org.aoju</groupId>
9898
<artifactId>bus-all</artifactId>
99-
<version>5.1.0</version>
99+
<version>5.2.0</version>
100100
</dependency>
101101
```
102102

103103
### Gradle
104104
```
105-
implementation 'org.aoju:bus-all:5.1.0'
105+
implementation 'org.aoju:bus-all:5.2.0'
106106
```
107107

108108
### Other

‎bus-all/pom.xml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-all</artifactId>
9-
<version>5.1.0</version>
9+
<version>5.2.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -23,6 +23,8 @@
2323
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2424
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
2525
<project.compiler.version>1.8</project.compiler.version>
26+
<!--bus-base-->
27+
<swagger.version>2.9.2</swagger.version>
2628
<!--bus-cache-->
2729
<aspectj.version>1.9.4</aspectj.version>
2830
<guice.version>4.2.0</guice.version>
@@ -45,6 +47,9 @@
4547
<net.version>3.6</net.version>
4648
<emoji-java.version>4.0.0</emoji-java.version>
4749
<servlet.version>4.0.1</servlet.version>
50+
<!--bus-forest-->
51+
<compress.version>1.19</compress.version>
52+
<loader.version>2.0.1.RELEASE</loader.version>
4853
<!--bus-limiter-->
4954
<redisson.version>3.11.2</redisson.version>
5055
<!--bus-logger-->
@@ -86,8 +91,6 @@
8691
<qiniu.oss.version>[7.2.0, 7.2.99]</qiniu.oss.version>
8792
<tencent.oss.version>5.5.9</tencent.oss.version>
8893
<upyun.oss.version>4.0.1</upyun.oss.version>
89-
<!--bus-swagger-->
90-
<swagger.version>2.9.2</swagger.version>
9194
<!--bus-tracer-->
9295
<cxf.version>2.7.18</cxf.version>
9396
<httpclient.version>4.5.2</httpclient.version>
@@ -236,6 +239,18 @@
236239
<version>${emoji-java.version}</version>
237240
<scope>provided</scope>
238241
</dependency>
242+
<!--bus-forest-->
243+
<dependency>
244+
<groupId>org.apache.commons</groupId>
245+
<artifactId>commons-compress</artifactId>
246+
<version>${compress.version}</version>
247+
</dependency>
248+
<dependency>
249+
<groupId>org.springframework.boot</groupId>
250+
<artifactId>spring-boot-loader</artifactId>
251+
<version>${loader.version}</version>
252+
<scope>provided</scope>
253+
</dependency>
239254
<!--bus-limiter-->
240255
<dependency>
241256
<groupId>org.redisson</groupId>

‎bus-base/pom.xml‎

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,24 @@
66

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-base</artifactId>
9-
<version>5.1.0</version>
9+
<version>5.2.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
1313
<description>Bus Base</description>
1414
<url>https://github.com/aoju/bus</url>
1515

16+
<parent>
17+
<groupId>org.springframework.boot</groupId>
18+
<artifactId>spring-boot-starter-parent</artifactId>
19+
<version>2.1.9.RELEASE</version>
20+
</parent>
21+
1622
<properties>
1723
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1824
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1925
<project.compiler.version>1.8</project.compiler.version>
26+
<swagger.version>2.9.2</swagger.version>
2027
</properties>
2128

2229
<dependencies>
@@ -32,13 +39,85 @@
3239
</dependency>
3340
<dependency>
3441
<groupId>org.aoju</groupId>
35-
<artifactId>bus-swagger</artifactId>
42+
<artifactId>bus-logger</artifactId>
3643
<version>${project.version}</version>
3744
</dependency>
3845
<dependency>
39-
<groupId>org.aoju</groupId>
40-
<artifactId>bus-logger</artifactId>
41-
<version>${project.version}</version>
46+
<groupId>io.springfox</groupId>
47+
<artifactId>springfox-swagger2</artifactId>
48+
<version>${swagger.version}</version>
49+
<exclusions>
50+
<exclusion>
51+
<groupId>org.springframework</groupId>
52+
<artifactId>spring-core</artifactId>
53+
</exclusion>
54+
<exclusion>
55+
<groupId>org.springframework</groupId>
56+
<artifactId>spring-aop</artifactId>
57+
</exclusion>
58+
<exclusion>
59+
<groupId>org.springframework</groupId>
60+
<artifactId>spring-beans</artifactId>
61+
</exclusion>
62+
<exclusion>
63+
<groupId>org.springframework</groupId>
64+
<artifactId>spring-context</artifactId>
65+
</exclusion>
66+
<exclusion>
67+
<groupId>org.springframework</groupId>
68+
<artifactId>spring-expression</artifactId>
69+
</exclusion>
70+
<exclusion>
71+
<groupId>com.fasterxml.jackson.core</groupId>
72+
<artifactId>jackson-databind</artifactId>
73+
</exclusion>
74+
<exclusion>
75+
<groupId>com.fasterxml.jackson.core</groupId>
76+
<artifactId>jackson-core</artifactId>
77+
</exclusion>
78+
<exclusion>
79+
<groupId>com.fasterxml.jackson.core</groupId>
80+
<artifactId>jackson-annotations</artifactId>
81+
</exclusion>
82+
<exclusion>
83+
<artifactId>byte-buddy</artifactId>
84+
<groupId>net.bytebuddy</groupId>
85+
</exclusion>
86+
<exclusion>
87+
<artifactId>slf4j-api</artifactId>
88+
<groupId>org.slf4j</groupId>
89+
</exclusion>
90+
<exclusion>
91+
<groupId>com.google.guava</groupId>
92+
<artifactId>guava</artifactId>
93+
</exclusion>
94+
<exclusion>
95+
<groupId>com.fasterxml.jackson.core</groupId>
96+
<artifactId>jackson-annotations</artifactId>
97+
</exclusion>
98+
<exclusion>
99+
<groupId>io.swagger</groupId>
100+
<artifactId>swagger-annotations</artifactId>
101+
</exclusion>
102+
<exclusion>
103+
<groupId>io.swagger</groupId>
104+
<artifactId>swagger-models</artifactId>
105+
</exclusion>
106+
</exclusions>
107+
</dependency>
108+
<dependency>
109+
<groupId>io.swagger</groupId>
110+
<artifactId>swagger-annotations</artifactId>
111+
<version>1.5.22</version>
112+
</dependency>
113+
<dependency>
114+
<groupId>io.swagger</groupId>
115+
<artifactId>swagger-models</artifactId>
116+
<version>1.5.22</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.springframework.boot</groupId>
120+
<artifactId>spring-boot-starter-web</artifactId>
42121
</dependency>
43122
</dependencies>
44123

‎bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* </p>
3232
*
3333
* @author Kimi Liu
34-
* @version 5.1.0
34+
* @version 5.2.0
3535
* @since JDK 1.8+
3636
*/
3737
public class Consts extends Normal {

‎bus-base/src/main/java/org/aoju/bus/base/consts/ErrorCode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* 系统响应码
3333
*
3434
* @author Kimi Liu
35-
* @version 5.1.0
35+
* @version 5.2.0
3636
* @since JDK 1.8+
3737
*/
3838
public class ErrorCode {

‎bus-base/src/main/java/org/aoju/bus/base/entity/BaseEntity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* </p>
4040
*
4141
* @author Kimi Liu
42-
* @version 5.1.0
42+
* @version 5.2.0
4343
* @since JDK 1.8+
4444
*/
4545
@Data

‎bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
* </p>
3737
*
3838
* @author Kimi Liu
39-
* @version 5.1.0
39+
* @version 5.2.0
4040
* @since JDK 1.8+
4141
*/
4242
@Data

‎bus-base/src/main/java/org/aoju/bus/base/entity/Message.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* </p>
3333
*
3434
* @author Kimi Liu
35-
* @version 5.1.0
35+
* @version 5.2.0
3636
* @since JDK 1.8+
3737
*/
3838
@Data

‎bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* </p>
3636
*
3737
* @author Kimi Liu
38-
* @version 5.1.0
38+
* @version 5.2.0
3939
* @since JDK 1.8+
4040
*/
4141
@Data

0 commit comments

Comments
 (0)