Skip to content

Commit e4a39b3

Browse files
839536839536
committed
v6.5.6
1 parent ee87489 commit e4a39b3

File tree

55 files changed

+242
-331
lines changed

Some content is hidden

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

55 files changed

+242
-331
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</p>
77
<p align="center">
88
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
9-
<img src="https://img.shields.io/badge/maven--central-v6.5.5-blue.svg?label=Maven%20Central" />
9+
<img src="https://img.shields.io/badge/maven--central-v6.5.6-blue.svg?label=Maven%20Central" />
1010
</a>
1111
<a target="_blank" href="https://travis-ci.org/aoju/bus">
1212
<img src="https://travis-ci.com/aoju/bus.svg?branch=main">
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java17
9797
<dependency>
9898
<groupId>org.aoju</groupId>
9999
<artifactId>bus-all</artifactId>
100-
<version>6.5.5</version>
100+
<version>6.5.6</version>
101101
</dependency>
102102
```
103103

‎bus-all/pom.xml‎

Lines changed: 2 additions & 2 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>6.5.5</version>
9+
<version>6.5.6</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -223,7 +223,7 @@
223223
<plugin>
224224
<groupId>org.apache.maven.plugins</groupId>
225225
<artifactId>maven-javadoc-plugin</artifactId>
226-
<version>3.4.0</version>
226+
<version>3.4.1</version>
227227
<executions>
228228
<execution>
229229
<id>attach-javadocs</id>

‎bus-base/pom.xml‎

Lines changed: 3 additions & 3 deletions
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>6.5.5</version>
9+
<version>6.5.6</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -42,7 +42,7 @@
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4444
<project.compiler.version>17</project.compiler.version>
45-
<spring.boot.version>2.7.0</spring.boot.version>
45+
<spring.boot.version>2.7.2</spring.boot.version>
4646
<lombok.version>1.18.24</lombok.version>
4747
<persistence.version>2.2</persistence.version>
4848
</properties>
@@ -92,7 +92,7 @@
9292
<plugin>
9393
<groupId>org.apache.maven.plugins</groupId>
9494
<artifactId>maven-javadoc-plugin</artifactId>
95-
<version>3.4.0</version>
95+
<version>3.4.1</version>
9696
<executions>
9797
<execution>
9898
<id>attach-javadocs</id>

‎bus-bom/pom.xml‎

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

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-bom</artifactId>
9-
<version>6.5.5</version>
9+
<version>6.5.6</version>
1010
<packaging>pom</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -191,7 +191,7 @@
191191
<plugin>
192192
<groupId>org.apache.maven.plugins</groupId>
193193
<artifactId>maven-javadoc-plugin</artifactId>
194-
<version>3.4.0</version>
194+
<version>3.4.1</version>
195195
<executions>
196196
<execution>
197197
<id>attach-javadocs</id>

‎bus-cache/pom.xml‎

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

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-cache</artifactId>
9-
<version>6.5.5</version>
9+
<version>6.5.6</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -42,17 +42,16 @@
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4444
<project.compiler.version>17</project.compiler.version>
45-
<spring.boot.version>2.7.0</spring.boot.version>
45+
<spring.boot.version>2.7.2</spring.boot.version>
4646
<lombok.version>1.18.24</lombok.version>
47-
<guice.version>5.0.1</guice.version>
48-
<jedis.version>4.2.2</jedis.version>
47+
<guice.version>5.1.0</guice.version>
48+
<jedis.version>4.2.3</jedis.version>
4949
<xmemcached.version>2.4.7</xmemcached.version>
50-
<ehcache.version>3.9.4</ehcache.version>
51-
<curator.version>5.2.1</curator.version>
50+
<ehcache.version>3.9.9</ehcache.version>
51+
<curator.version>5.3.0</curator.version>
5252
<guava.version>31.1-jre</guava.version>
53-
<hession.version>4.0.65</hession.version>
54-
<druid.version>1.2.8</druid.version>
55-
<mysql.version>8.0.29</mysql.version>
53+
<hession.version>4.0.66</hession.version>
54+
<mysql.version>8.0.30</mysql.version>
5655
</properties>
5756

5857
<dependencies>
@@ -185,7 +184,7 @@
185184
<plugin>
186185
<groupId>org.apache.maven.plugins</groupId>
187186
<artifactId>maven-javadoc-plugin</artifactId>
188-
<version>3.4.0</version>
187+
<version>3.4.1</version>
189188
<executions>
190189
<execution>
191190
<id>attach-javadocs</id>

‎bus-core/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>org.aoju</groupId>
1616
<artifactId>bus-core</artifactId>
17-
<version>6.5.5</version>
17+
<version>6.5.6</version>
1818
</dependency>
1919
```
2020

‎bus-core/pom.xml‎

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

77
<groupId>org.aoju</groupId>
88
<artifactId>bus-core</artifactId>
9-
<version>6.5.5</version>
9+
<version>6.5.6</version>
1010
<packaging>jar</packaging>
1111

1212
<name>${project.artifactId}</name>
@@ -68,7 +68,7 @@
6868
<plugin>
6969
<groupId>org.apache.maven.plugins</groupId>
7070
<artifactId>maven-javadoc-plugin</artifactId>
71-
<version>3.4.0</version>
71+
<version>3.4.1</version>
7272
<executions>
7373
<execution>
7474
<id>attach-javadocs</id>

‎bus-core/src/main/java/org/aoju/bus/core/Version.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class Version {
6060
* @return 项目的版本号
6161
*/
6262
public static String get() {
63-
return "6.5.5.RELEASE";
63+
return "6.5.6.RELEASE";
6464
}
6565

6666
/**

‎bus-core/src/main/java/org/aoju/bus/core/date/Formatter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ public static DateTime parseUTC(String text) {
810810
if (null == text) {
811811
return null;
812812
}
813-
int length = text.length();
813+
final int length = text.length();
814814
if (StringKit.contains(text, 'Z')) {
815815
if (length == Fields.UTC_PATTERN.length() - 4) {
816816
// 格式类似：2020-09-11T06:34:32Z，-4表示减去4个单引号的长度

‎bus-core/src/main/java/org/aoju/bus/core/toolkit/CollKit.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2472,6 +2472,33 @@ public static List<String> addAll(List<String> list, String part, boolean isTrim
24722472
return list;
24732473
}
24742474

2475+
/**
2476+
* 一个对象不为空且不存在于该集合中时，加入到该集合中
2477+
* <pre>
2478+
* null, null = false
2479+
* [], null = false
2480+
* null, "123" = false
2481+
* ["123"], "123" = false
2482+
* [], "123" => true
2483+
* ["456"], "123" = true
2484+
* [Animal{"name": "jack"}], Dog{"name": "jack"} = true
2485+
* </pre>
2486+
*
2487+
* @param collection 被加入的集合
2488+
* @param object 要添加到集合的对象
2489+
* @param <T> 集合元素类型
2490+
* @param <S> 要添加的元素类型【为集合元素类型的类型或子类型】
2491+
* @return 是否添加成功
2492+
* @author Cloud-Style
2493+
*/
2494+
public static <T, S extends T> boolean addIfAbsent(Collection<T> collection, S object) {
2495+
if (object == null || collection == null || collection.contains(object)) {
2496+
return false;
2497+
}
2498+
2499+
return collection.add(object);
2500+
}
2501+
24752502
/**
24762503
* 将另一个列表中的元素加入到列表中,如果列表中已经存在此元素则忽略之
24772504
*

0 commit comments

Comments
 (0)