Skip to content

Commit

Permalink
v6.5.0
Browse files Browse the repository at this point in the history
v6.5.0
  • Loading branch information
839128 committed Mar 25, 2022
2 parents bddf07b + 3158216 commit b3881e5
Show file tree
Hide file tree
Showing 3,118 changed files with 15,565 additions and 18,887 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: java

jdk:
- openjdk8
- openjdk17

notifications:
email: false
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
</p>
<p align="center">
<a target="_blank" href="https://search.maven.org/search?q=org.aoju">
<img src="https://img.shields.io/badge/maven--central-v6.3.1-blue.svg?label=Maven%20Central" />
<img src="https://img.shields.io/badge/maven--central-v6.5.0-blue.svg?label=Maven%20Central" />
</a>
<a target="_blank" href="https://travis-ci.org/aoju/bus">
<img src="https://travis-ci.org/aoju/bus.svg?branch=master">
<img src="https://travis-ci.org/aoju/bus.svg?branch=main">
</a>
<a target="_blank" href="https://www.oracle.com/technetwork/java/javase/downloads/index.html">
<img src="https://img.shields.io/badge/JDK-1.8+-green.svg">
<a target="_blank" href="https://jdk.java.net/">
<img src="https://img.shields.io/badge/Java-17+-green.svg">
</a>
<a target="_blank" href="https://spring.io/projects/spring-boot">
<img src="https://img.shields.io/badge/Spring Boot-2.5.6-brightgreen.svg">
<img src="https://img.shields.io/badge/Spring Boot-2.6.3-brightgreen.svg">
</a>
<a target="_blank" href="https://www.mysql.com">
<img src="https://img.shields.io/badge/Mysql-8.0-blue.svg">
<img src="https://img.shields.io/badge/Mysql-8.x-blue.svg">
</a>
<a target="_blank" href="http://dubbo.apache.org">
<img src="https://img.shields.io/badge/dubbo-3.0.5-yellow.svg">
Expand Down Expand Up @@ -97,7 +97,7 @@ Bus (应用/服务总线) 是一个基础框架、服务套件,它基于Java8
<dependency>
<groupId>org.aoju</groupId>
<artifactId>bus-all</artifactId>
<version>6.3.5</version>
<version>6.5.0</version>
</dependency>
```

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

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

源码分为两个分支,功能如下:

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

## 意见建议

Expand Down
14 changes: 7 additions & 7 deletions bus-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-all</artifactId>
<version>6.3.5</version>
<version>6.5.0</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -41,7 +41,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.compiler.version>1.8</project.compiler.version>
<project.compiler.version>17</project.compiler.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -202,7 +202,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
<configuration>
<source>${project.compiler.version}</source>
<target>${project.compiler.version}</target>
Expand All @@ -211,7 +211,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -245,7 +245,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down Expand Up @@ -288,7 +288,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sonatype-nexus-staging</id>
Expand All @@ -302,7 +302,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.12</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
Expand Down
4 changes: 2 additions & 2 deletions bus-all/src/main/java/org/aoju/bus/Bus.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
* </p>
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
public class Bus extends Version {

Expand Down
4 changes: 2 additions & 2 deletions bus-all/src/main/java/org/aoju/bus/package-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Bus (应用/服务总线) 是一个基础框架、服务套件
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
package org.aoju.bus;
14 changes: 7 additions & 7 deletions bus-base/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.aoju</groupId>
<artifactId>bus-base</artifactId>
<version>6.3.5</version>
<version>6.5.0</version>
<packaging>jar</packaging>

<name>${project.artifactId}</name>
Expand Down Expand Up @@ -41,7 +41,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.compiler.version>1.8</project.compiler.version>
<project.compiler.version>17</project.compiler.version>
<spring.boot.version>2.6.3</spring.boot.version>
<lombok.version>1.18.22</lombok.version>
<persistence.version>2.2</persistence.version>
Expand Down Expand Up @@ -78,7 +78,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<version>3.10.1</version>
<configuration>
<source>${project.compiler.version}</source>
<target>${project.compiler.version}</target>
Expand All @@ -87,7 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.2</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -121,7 +121,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand All @@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<version>3.0.1</version>
<executions>
<execution>
<id>sonatype-nexus-staging</id>
Expand All @@ -148,7 +148,7 @@
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.8</version>
<version>1.6.12</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@
* 异常信息拦截处理
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
@ControllerAdvice
@RestControllerAdvice
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* 异常信息处理
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
package org.aoju.bus.base.advice;
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/consts/Consts.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
* 公共常量
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
public class Consts extends Normal {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
* 系统响应码
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
public class ErrorCode {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* 基础常量
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
package org.aoju.bus.base.consts;
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
* Entity 基本信息
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
@Data
@EqualsAndHashCode(callSuper = true)
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Entity.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
* Entity 实体
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
@Data
public abstract class Entity implements Serializable {
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Message.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
* 返回值公用类
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
@Data
@Builder
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/OAuth2.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
* 授权公用类
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
@Data
@EqualsAndHashCode(callSuper = true)
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Result.java
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
* 返回结果公用
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
@Data
@EqualsAndHashCode(callSuper = true)
Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/entity/Tracer.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
* 访问链路跟踪
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
@Data
@EqualsAndHashCode(callSuper = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* 基础实体类
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
package org.aoju.bus.base.entity;
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
* BaseMapper 接口
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
public interface BaseMapper<T> extends Mapper<T> {

Expand Down
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/mapper/Mapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
* Core Mapper 接口
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
public interface Mapper<T> extends org.aoju.bus.mapper.Mapper<T> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* 基础持久化支持
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
package org.aoju.bus.base.mapper;
4 changes: 2 additions & 2 deletions bus-base/src/main/java/org/aoju/bus/base/package-info.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* 基础功能实现
*
* @author Kimi Liu
* @version 6.3.5
* @since JDK 1.8+
* @version 6.5.0
* @since Java 17+
*/
package org.aoju.bus.base;
Loading

0 comments on commit b3881e5

Please sign in to comment.