Skip to content

Commit 0badd24

Browse files
839536839536
authored
Merge pull request #70 from aoju/develop
Develop
2 parents 6187d5b + d011ba1 commit 0badd24

File tree

1,415 files changed

+1670
-1631
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,415 files changed

+1670
-1631
lines changed

‎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.2.0-blue.svg?label=Maven%20Central" ></img>
3+
<img src="https://img.shields.io/badge/maven--central-v5.2.1-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.2.0</version>
99+
<version>5.2.1</version>
100100
</dependency>
101101
```
102102

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

108108
### Other

‎bus-all/pom.xml‎

Lines changed: 75 additions & 75 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.2.0</version>
9+
<version>5.2.1</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -100,6 +100,80 @@
100100
</properties>
101101

102102
<dependencies>
103+
<!--bus-base-->
104+
<dependency>
105+
<groupId>io.springfox</groupId>
106+
<artifactId>springfox-swagger2</artifactId>
107+
<version>${swagger.version}</version>
108+
<exclusions>
109+
<exclusion>
110+
<groupId>org.springframework</groupId>
111+
<artifactId>spring-core</artifactId>
112+
</exclusion>
113+
<exclusion>
114+
<groupId>org.springframework</groupId>
115+
<artifactId>spring-aop</artifactId>
116+
</exclusion>
117+
<exclusion>
118+
<groupId>org.springframework</groupId>
119+
<artifactId>spring-beans</artifactId>
120+
</exclusion>
121+
<exclusion>
122+
<groupId>org.springframework</groupId>
123+
<artifactId>spring-context</artifactId>
124+
</exclusion>
125+
<exclusion>
126+
<groupId>org.springframework</groupId>
127+
<artifactId>spring-expression</artifactId>
128+
</exclusion>
129+
<exclusion>
130+
<groupId>com.fasterxml.jackson.core</groupId>
131+
<artifactId>jackson-databind</artifactId>
132+
</exclusion>
133+
<exclusion>
134+
<groupId>com.fasterxml.jackson.core</groupId>
135+
<artifactId>jackson-core</artifactId>
136+
</exclusion>
137+
<exclusion>
138+
<groupId>com.fasterxml.jackson.core</groupId>
139+
<artifactId>jackson-annotations</artifactId>
140+
</exclusion>
141+
<exclusion>
142+
<artifactId>byte-buddy</artifactId>
143+
<groupId>net.bytebuddy</groupId>
144+
</exclusion>
145+
<exclusion>
146+
<artifactId>slf4j-api</artifactId>
147+
<groupId>org.slf4j</groupId>
148+
</exclusion>
149+
<exclusion>
150+
<groupId>com.google.guava</groupId>
151+
<artifactId>guava</artifactId>
152+
</exclusion>
153+
<exclusion>
154+
<groupId>com.fasterxml.jackson.core</groupId>
155+
<artifactId>jackson-annotations</artifactId>
156+
</exclusion>
157+
<exclusion>
158+
<groupId>io.swagger</groupId>
159+
<artifactId>swagger-annotations</artifactId>
160+
</exclusion>
161+
<exclusion>
162+
<groupId>io.swagger</groupId>
163+
<artifactId>swagger-models</artifactId>
164+
</exclusion>
165+
</exclusions>
166+
</dependency>
167+
<dependency>
168+
<groupId>io.swagger</groupId>
169+
<artifactId>swagger-annotations</artifactId>
170+
<version>1.5.22</version>
171+
</dependency>
172+
<dependency>
173+
<groupId>io.swagger</groupId>
174+
<artifactId>swagger-models</artifactId>
175+
<version>1.5.22</version>
176+
</dependency>
103177
<!--bus-cache-->
104178
<dependency>
105179
<groupId>org.aspectj</groupId>
@@ -521,80 +595,6 @@
521595
<version>${upyun.oss.version}</version>
522596
<optional>true</optional>
523597
</dependency>
524-
<!--bus-swagger-->
525-
<dependency>
526-
<groupId>io.springfox</groupId>
527-
<artifactId>springfox-swagger2</artifactId>
528-
<version>${swagger.version}</version>
529-
<exclusions>
530-
<exclusion>
531-
<groupId>org.springframework</groupId>
532-
<artifactId>spring-core</artifactId>
533-
</exclusion>
534-
<exclusion>
535-
<groupId>org.springframework</groupId>
536-
<artifactId>spring-aop</artifactId>
537-
</exclusion>
538-
<exclusion>
539-
<groupId>org.springframework</groupId>
540-
<artifactId>spring-beans</artifactId>
541-
</exclusion>
542-
<exclusion>
543-
<groupId>org.springframework</groupId>
544-
<artifactId>spring-context</artifactId>
545-
</exclusion>
546-
<exclusion>
547-
<groupId>org.springframework</groupId>
548-
<artifactId>spring-expression</artifactId>
549-
</exclusion>
550-
<exclusion>
551-
<groupId>com.fasterxml.jackson.core</groupId>
552-
<artifactId>jackson-databind</artifactId>
553-
</exclusion>
554-
<exclusion>
555-
<groupId>com.fasterxml.jackson.core</groupId>
556-
<artifactId>jackson-core</artifactId>
557-
</exclusion>
558-
<exclusion>
559-
<groupId>com.fasterxml.jackson.core</groupId>
560-
<artifactId>jackson-annotations</artifactId>
561-
</exclusion>
562-
<exclusion>
563-
<artifactId>byte-buddy</artifactId>
564-
<groupId>net.bytebuddy</groupId>
565-
</exclusion>
566-
<exclusion>
567-
<artifactId>slf4j-api</artifactId>
568-
<groupId>org.slf4j</groupId>
569-
</exclusion>
570-
<exclusion>
571-
<groupId>com.google.guava</groupId>
572-
<artifactId>guava</artifactId>
573-
</exclusion>
574-
<exclusion>
575-
<groupId>com.fasterxml.jackson.core</groupId>
576-
<artifactId>jackson-annotations</artifactId>
577-
</exclusion>
578-
<exclusion>
579-
<groupId>io.swagger</groupId>
580-
<artifactId>swagger-annotations</artifactId>
581-
</exclusion>
582-
<exclusion>
583-
<groupId>io.swagger</groupId>
584-
<artifactId>swagger-models</artifactId>
585-
</exclusion>
586-
</exclusions>
587-
</dependency>
588-
<dependency>
589-
<groupId>io.swagger</groupId>
590-
<artifactId>swagger-annotations</artifactId>
591-
<version>1.5.22</version>
592-
</dependency>
593-
<dependency>
594-
<groupId>io.swagger</groupId>
595-
<artifactId>swagger-models</artifactId>
596-
<version>1.5.22</version>
597-
</dependency>
598598
<!--bus-tracer-->
599599
<dependency>
600600
<groupId>org.apache.httpcomponents</groupId>

‎bus-base/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

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

1212
<name>${project.artifactId}</name>

‎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.2.0
34+
* @version 5.2.1
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.2.0
35+
* @version 5.2.1
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.2.0
42+
* @version 5.2.1
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.2.0
39+
* @version 5.2.1
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.2.0
35+
* @version 5.2.1
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.2.0
38+
* @version 5.2.1
3939
* @since JDK 1.8+
4040
*/
4141
@Data

‎bus-base/src/main/java/org/aoju/bus/base/entity/Result.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.2.0
39+
* @version 5.2.1
4040
* @since JDK 1.8+
4141
*/
4242
@Data

0 commit comments

Comments
 (0)