Skip to content

Commit 47305e4

Browse files
839536839536
authored
Merge pull request #31 from aoju/develop
Develop
2 parents f396ac3 + dedcdfc commit 47305e4

File tree

1,288 files changed

+1421
-2765
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,288 files changed

+1421
-2765
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
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-v3.1.9-blue.svg?label=Maven%20Central" ></img>
3+
<img src="https://img.shields.io/badge/maven--central-v3.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">

‎bus-all/pom.xml‎

Lines changed: 1 addition & 22 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>3.1.9</version>
9+
<version>3.2.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>bus-all</name>
@@ -42,7 +42,6 @@
4242
<emoji-java.version>4.0.0</emoji-java.version>
4343
<servlet.version>4.0.1</servlet.version>
4444
<!--bus-limiter-->
45-
<curator.recipes.version>4.2.0</curator.recipes.version>
4645
<redisson.version>3.11.2</redisson.version>
4746
<!--bus-logger-->
4847
<slf4j.version>1.7.26</slf4j.version>
@@ -363,26 +362,6 @@
363362
</exclusion>
364363
</exclusions>
365364
</dependency>
366-
<dependency>
367-
<groupId>org.apache.curator</groupId>
368-
<artifactId>curator-recipes</artifactId>
369-
<version>${curator.recipes.version}</version>
370-
<optional>true</optional>
371-
<exclusions>
372-
<exclusion>
373-
<groupId>log4j</groupId>
374-
<artifactId>log4j</artifactId>
375-
</exclusion>
376-
<exclusion>
377-
<groupId>com.google.guava</groupId>
378-
<artifactId>guava</artifactId>
379-
</exclusion>
380-
<exclusion>
381-
<groupId>org.slf4j</groupId>
382-
<artifactId>slf4j-api</artifactId>
383-
</exclusion>
384-
</exclusions>
385-
</dependency>
386365
<!--bus-logger-->
387366
<dependency>
388367
<groupId>ch.qos.logback</groupId>

‎bus-all/src/main/java/org/aoju/Bus.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* Version is Licensed under the MIT License, Version 3.0.0 (the "License")
3131
*
3232
* @author Kimi Liu
33-
* @version 3.1.9
33+
* @version 3.2.0
3434
* @since JDK 1.8
3535
*/
3636
public final class Bus extends Version {

‎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>3.1.9</version>
9+
<version>3.2.0</version>
1010
<packaging>jar</packaging>
1111

1212
<name>bus-base</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 3.1.9
34+
* @version 3.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
@@ -29,7 +29,7 @@
2929
* 系统响应码
3030
*
3131
* @author Kimi Liu
32-
* @version 3.1.9
32+
* @version 3.2.0
3333
* @since JDK 1.8
3434
*/
3535
public enum 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
@@ -35,7 +35,7 @@
3535
* </p>
3636
*
3737
* @author Kimi Liu
38-
* @version 3.1.9
38+
* @version 3.2.0
3939
* @since JDK 1.8
4040
*/
4141
@MappedSuperclass

‎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 3.1.9
39+
* @version 3.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
@@ -31,7 +31,7 @@
3131
* </p>
3232
*
3333
* @author Kimi Liu
34-
* @version 3.1.9
34+
* @version 3.2.0
3535
* @since JDK 1.8
3636
*/
3737
@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
@@ -34,7 +34,7 @@
3434
* </p>
3535
*
3636
* @author Kimi Liu
37-
* @version 3.1.9
37+
* @version 3.2.0
3838
* @since JDK 1.8
3939
*/
4040
@Data

0 commit comments

Comments
 (0)