Skip to content

Commit b3881e5

Browse files
839536839536
authored
v6.5.0
v6.5.0
2 parents bddf07b + 3158216 commit b3881e5

File tree

3,118 files changed

+15565
-18887
lines changed

Some content is hidden

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

3,118 files changed

+15565
-18887
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: java
22

33
jdk:
4-
- openjdk8
4+
- openjdk17
55

66
notifications:
77
email: false

‎README.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
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.3.1-blue.svg?label=Maven%20Central" />
9+
<img src="https://img.shields.io/badge/maven--central-v6.5.0-blue.svg?label=Maven%20Central" />
1010
</a>
1111
<a target="_blank" href="https://travis-ci.org/aoju/bus">
12-
<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
12+
<img src="https://travis-ci.org/aoju/bus.svg?branch=main">
1313
</a>
14-
<a target="_blank" href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
15-
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg">
14+
<a target="_blank" href="https://jdk.java.net/">
15+
<img src="https://img.shields.io/badge/Java-17+-green.svg">
1616
</a>
1717
<a target="_blank" href="https://spring.io/projects/spring-boot">
18-
<img src="https://img.shields.io/badge/Spring Boot-2.5.6-brightgreen.svg">
18+
<img src="https://img.shields.io/badge/Spring Boot-2.6.3-brightgreen.svg">
1919
</a>
2020
<a target="_blank" href="https://www.mysql.com">
21-
<img src="https://img.shields.io/badge/Mysql-8.0-blue.svg">
21+
<img src="https://img.shields.io/badge/Mysql-8.x-blue.svg">
2222
</a>
2323
<a target="_blank" href="http://dubbo.apache.org">
2424
<img src="https://img.shields.io/badge/dubbo-3.0.5-yellow.svg">
@@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件，它基于Java8
9797
<dependency>
9898
<groupId>org.aoju</groupId>
9999
<artifactId>bus-all</artifactId>
100-
<version>6.3.5</version>
100+
<version>6.5.0</version>
101101
</dependency>
102102
```
103103

@@ -130,16 +130,16 @@ implementation 'org.aoju:bus-all:x.x.x'
130130
- 地址: [https://github.com/aoju/abarth](https://github.com/aoju/abarth)
131131

132132
> 注意
133-
> Bus项目支持JDK8+，对Android平台部分模块没有测试，不能保证所有工具类或工具方法可用。
133+
> Bus项目支持Java 17+，对Android平台部分模块没有测试，不能保证所有工具类或工具方法可用。
134134
135135
## 分支说明
136136

137137
源码分为两个分支，功能如下：
138138

139-
| 分支 | 作用 |
140-
|-----------|---------------------------------------------------------------|
141-
| master | 主分支，即稳定版本使用的分支，与中央库提交的jar一致，不接收任何PR或修改 |
142-
| develop | 开发分支，默认为下个版本的更新或者修复等，接受修改或PR |
139+
| 分支 | 作用 |
140+
|------|---------------------------------------------------------------|
141+
| main | 主分支，即稳定版本使用的分支，与中央库提交的jar一致，不接收任何PR或修改 |
142+
| dev | 开发分支，默认为下个版本的更新或者修复等，接受修改或PR |
143143

144144
## 意见建议
145145

‎bus-all/pom.xml‎

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

1212
<name>${project.artifactId}</name>
@@ -41,7 +41,7 @@
4141
<properties>
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
44-
<project.compiler.version>1.8</project.compiler.version>
44+
<project.compiler.version>17</project.compiler.version>
4545
</properties>
4646

4747
<dependencies>
@@ -202,7 +202,7 @@
202202
<plugin>
203203
<groupId>org.apache.maven.plugins</groupId>
204204
<artifactId>maven-compiler-plugin</artifactId>
205-
<version>3.8.1</version>
205+
<version>3.10.1</version>
206206
<configuration>
207207
<source>${project.compiler.version}</source>
208208
<target>${project.compiler.version}</target>
@@ -211,7 +211,7 @@
211211
<plugin>
212212
<groupId>org.apache.maven.plugins</groupId>
213213
<artifactId>maven-javadoc-plugin</artifactId>
214-
<version>3.2.0</version>
214+
<version>3.3.2</version>
215215
<executions>
216216
<execution>
217217
<id>attach-javadocs</id>
@@ -245,7 +245,7 @@
245245
<plugin>
246246
<groupId>org.apache.maven.plugins</groupId>
247247
<artifactId>maven-source-plugin</artifactId>
248-
<version>3.2.0</version>
248+
<version>3.2.1</version>
249249
<executions>
250250
<execution>
251251
<id>attach-sources</id>
@@ -288,7 +288,7 @@
288288
<plugin>
289289
<groupId>org.apache.maven.plugins</groupId>
290290
<artifactId>maven-gpg-plugin</artifactId>
291-
<version>1.6</version>
291+
<version>3.0.1</version>
292292
<executions>
293293
<execution>
294294
<id>sonatype-nexus-staging</id>
@@ -302,7 +302,7 @@
302302
<plugin>
303303
<groupId>org.sonatype.plugins</groupId>
304304
<artifactId>nexus-staging-maven-plugin</artifactId>
305-
<version>1.6.8</version>
305+
<version>1.6.12</version>
306306
<extensions>true</extensions>
307307
<configuration>
308308
<serverId>sonatype-nexus-staging</serverId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
* </p>
4444
*
4545
* @author Kimi Liu
46-
* @version 6.3.5
47-
* @since JDK 1.8+
46+
* @version 6.5.0
47+
* @since Java 17+
4848
*/
4949
public class Bus extends Version {
5050

‎bus-all/src/main/java/org/aoju/bus/package-info.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Bus (应用/服务总线) 是一个基础框架、服务套件
33
*
44
* @author Kimi Liu
5-
* @version 6.3.5
6-
* @since JDK 1.8+
5+
* @version 6.5.0
6+
* @since Java 17+
77
*/
88
package org.aoju.bus;

‎bus-base/pom.xml‎

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

1212
<name>${project.artifactId}</name>
@@ -41,7 +41,7 @@
4141
<properties>
4242
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
4343
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
44-
<project.compiler.version>1.8</project.compiler.version>
44+
<project.compiler.version>17</project.compiler.version>
4545
<spring.boot.version>2.6.3</spring.boot.version>
4646
<lombok.version>1.18.22</lombok.version>
4747
<persistence.version>2.2</persistence.version>
@@ -78,7 +78,7 @@
7878
<plugin>
7979
<groupId>org.apache.maven.plugins</groupId>
8080
<artifactId>maven-compiler-plugin</artifactId>
81-
<version>3.8.1</version>
81+
<version>3.10.1</version>
8282
<configuration>
8383
<source>${project.compiler.version}</source>
8484
<target>${project.compiler.version}</target>
@@ -87,7 +87,7 @@
8787
<plugin>
8888
<groupId>org.apache.maven.plugins</groupId>
8989
<artifactId>maven-javadoc-plugin</artifactId>
90-
<version>3.2.0</version>
90+
<version>3.3.2</version>
9191
<executions>
9292
<execution>
9393
<id>attach-javadocs</id>
@@ -121,7 +121,7 @@
121121
<plugin>
122122
<groupId>org.apache.maven.plugins</groupId>
123123
<artifactId>maven-source-plugin</artifactId>
124-
<version>3.2.0</version>
124+
<version>3.2.1</version>
125125
<executions>
126126
<execution>
127127
<id>attach-sources</id>
@@ -134,7 +134,7 @@
134134
<plugin>
135135
<groupId>org.apache.maven.plugins</groupId>
136136
<artifactId>maven-gpg-plugin</artifactId>
137-
<version>1.6</version>
137+
<version>3.0.1</version>
138138
<executions>
139139
<execution>
140140
<id>sonatype-nexus-staging</id>
@@ -148,7 +148,7 @@
148148
<plugin>
149149
<groupId>org.sonatype.plugins</groupId>
150150
<artifactId>nexus-staging-maven-plugin</artifactId>
151-
<version>1.6.8</version>
151+
<version>1.6.12</version>
152152
<extensions>true</extensions>
153153
<configuration>
154154
<serverId>sonatype-nexus-staging</serverId>

‎bus-base/src/main/java/org/aoju/bus/base/advice/BaseAdvice.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
* 异常信息拦截处理
5050
*
5151
* @author Kimi Liu
52-
* @version 6.3.5
53-
* @since JDK 1.8+
52+
* @version 6.5.0
53+
* @since Java 17+
5454
*/
5555
@ControllerAdvice
5656
@RestControllerAdvice

‎bus-base/src/main/java/org/aoju/bus/base/advice/package-info.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* 异常信息处理
33
*
44
* @author Kimi Liu
5-
* @version 6.3.5
6-
* @since JDK 1.8+
5+
* @version 6.5.0
6+
* @since Java 17+
77
*/
88
package org.aoju.bus.base.advice;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
* 公共常量
3333
*
3434
* @author Kimi Liu
35-
* @version 6.3.5
36-
* @since JDK 1.8+
35+
* @version 6.5.0
36+
* @since Java 17+
3737
*/
3838
public class Consts extends Normal {
3939

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
* 系统响应码
3636
*
3737
* @author Kimi Liu
38-
* @version 6.3.5
39-
* @since JDK 1.8+
38+
* @version 6.5.0
39+
* @since Java 17+
4040
*/
4141
public class ErrorCode {
4242

0 commit comments

Comments
 (0)