Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update 更新部分依赖包版本 #3851

Open
wants to merge 13 commits into
base: 2023.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Spring Cloud 使用 Maven 来构建,最快的使用方式是将本项目 clone
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2023.0.1.0</version>
<version>2023.0.1.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ These artifacts are available from Maven Central and Spring Release repository v
<dependency>
<groupId>com.alibaba.cloud</groupId>
<artifactId>spring-cloud-alibaba-dependencies</artifactId>
<version>2023.0.1.0</version>
<version>2023.0.1.2</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
19 changes: 9 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,20 +86,19 @@
<spring.cloud.version>2023.0.3</spring.cloud.version>

<!-- Spring Boot -->
<spring-boot.version>3.2.9</spring-boot.version>
<spring-boot.version>3.3.5</spring-boot.version>

<!-- Maven Plugin Versions -->
<maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
<maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
<!-- JUnit 5 requires Surefire version 2.22.0 or higher -->
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.5.1</maven-surefire-plugin.version>
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
<gmavenplus-plugin.version>1.6</gmavenplus-plugin.version>
<jacoco.version>0.8.8</jacoco.version>
<native-maven-plugin.version>0.10.2</native-maven-plugin.version>
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
<jacoco.version>0.8.12</jacoco.version>
<native-maven-plugin.version>0.10.3</native-maven-plugin.version>
</properties>

<modules>
Expand Down
27 changes: 19 additions & 8 deletions spring-cloud-alibaba-dependencies/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies-parent</artifactId>
<version>4.1.0</version>
<version>4.1.3</version>
<relativePath/>
</parent>

Expand All @@ -20,24 +20,24 @@
<properties>
<revision>2023.0.1.2</revision>
<sentinel.version>1.8.8</sentinel.version>
<nacos.client.version>2.4.2</nacos.client.version>
<nacos.client.version>2.4.3</nacos.client.version>
<seata.version>2.1.0</seata.version>
<!-- Apache RocketMQ -->
<rocketmq.version>5.1.4</rocketmq.version>

<!-- Spring AI -->
<spring.ai.version>1.0.0-M1</spring.ai.version>
<dashscope-sdk-java.version>2.15.1</dashscope-sdk-java.version>
<dashscope-sdk-java.version>2.16.8</dashscope-sdk-java.version>

<!-- scheduling -->
<shedlock.version>4.23.0</shedlock.version>
<schedulerx.worker.version>1.11.4</schedulerx.worker.version>
<shedlock.version>5.16.0</shedlock.version>
<schedulerx.worker.version>1.11.6</schedulerx.worker.version>

<!-- Maven Plugin Versions -->
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
<maven-javadoc-plugin.version>3.2.0</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
<maven-javadoc-plugin.version>3.10.1</maven-javadoc-plugin.version>
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
<flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -291,6 +291,17 @@
<scope>test</scope>
</dependency>

<dependency>
yuluo-yx marked this conversation as resolved.
Show resolved Hide resolved
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.53</version>
</dependency>

<dependency>
<groupId>com.alibaba.fastjson</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.53</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

<properties>
<spring.ai.version>1.0.0-M1</spring.ai.version>
<redis.jedis.version>5.1.0</redis.jedis.version>
<redis.jedis.version>5.1.5</redis.jedis.version>
</properties>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:

# nacos
nacos:
image: nacos/nacos-server:v2.4.2
image: nacos/nacos-server:v2.4.3
hostname: nacos-server
restart: always
container_name: integrated-example-nacos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>Spring Cloud Alibaba Integrated Order Example</name>

<properties>
<druid.version>1.1.10</druid.version>
<druid.version>1.2.23</druid.version>
<mybatis.version>3.0.3</mybatis.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>Spring Cloud Alibaba Integrated Praise Consumer Example</name>

<properties>
<druid.version>1.1.10</druid.version>
<druid.version>1.2.23</druid.version>
<mybatis.version>3.0.3</mybatis.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<name>Spring Cloud Alibaba Integrated Storage Example</name>

<properties>
<druid.version>1.1.10</druid.version>
<druid.version>1.2.23</druid.version>
<mybatis.version>3.0.3</mybatis.version>
</properties>

Expand Down
16 changes: 8 additions & 8 deletions spring-cloud-alibaba-examples/nacos-example/readme-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@

[Nacos](https://github.com/alibaba/Nacos) 是阿里巴巴开源的一个更易于构建云原生应用的动态服务发现、配置管理和服务管理平台。

## 正确配置并启动 Nacos Server 2.4.2
## 正确配置并启动 Nacos Server 2.4.3

在 Nacos 2.4.2 中,加入了用户鉴权相关的功能,在首次启动 Nacos Server 时,需要正确配置,避免出现启动失败的问题。
在 Nacos 2.4.3 中,加入了用户鉴权相关的功能,在首次启动 Nacos Server 时,需要正确配置,避免出现启动失败的问题。

### 下载 Nacos Server

> 本示例中使用 Nacos Server 版本为 2.4.2
> 本示例中使用 Nacos Server 版本为 2.4.3

Nacos 支持直接下载和源码构建两种方式。**推荐在 Spring Cloud Alibaba 2023.x 中使用 Nacos Server 2.4.2 版本。**
Nacos 支持直接下载和源码构建两种方式。**推荐在 Spring Cloud Alibaba 2023.x 中使用 Nacos Server 2.4.3 版本。**

1. 直接下载:[Nacos Server 下载页](https://github.com/alibaba/nacos/releases)
2. 源码构建:进入 Nacos [Github 项目页面](https://github.com/alibaba/nacos),将代码 git clone 到本地自行编译打包,[参考文档](https://nacos.io/zh-cn/docs/quick-start.html)。

### 配置 Nacos Server

打开 `\nacos-server-2.4.2\conf\application.properties` 配置文件,修改以下配置项:
打开 `\nacos-server-2.4.3\conf\application.properties` 配置文件,修改以下配置项:

#### 配置数据源

此处以 MySQL 数据库为例,使用 `nacos-server-2.4.2\conf\mysql-schema.sql` 初始化数据库表文件。同时修改以下配置
此处以 MySQL 数据库为例,使用 `nacos-server-2.4.3\conf\mysql-schema.sql` 初始化数据库表文件。同时修改以下配置

```properties
#*************** Config Module Related Configurations ***************#
Expand All @@ -49,7 +49,7 @@ db.pool.config.minimumIdle=2

#### 开启鉴权

**注意:不开启在 2.4.2 中会出现登陆失败异常!**
**注意:不开启在 2.4.3 中会出现登陆失败异常!**

```properties
### The auth system to use, currently only 'nacos' and 'ldap' is supported:
Expand Down Expand Up @@ -77,7 +77,7 @@ nacos.core.auth.plugin.nacos.token.secret.key=SecretKey0123456789012345678901234

#### Open API 鉴权

在 nacos server 2.4.2 中使用 Open api 接口时需要鉴权:更多细节请参考:[Nacos api 鉴权](https://nacos.io/zh-cn/docs/auth.html)
在 nacos server 2.4.3 中使用 Open api 接口时需要鉴权:更多细节请参考:[Nacos api 鉴权](https://nacos.io/zh-cn/docs/auth.html)

1. 获取 accessToken:使用用户名和密码登陆 nacos server:

Expand Down
8 changes: 4 additions & 4 deletions spring-cloud-alibaba-examples/nacos-example/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ This project demonstrates how to use Spring Cloud Alibaba Nacos related Starters

[Nacos](https://github.com/alibaba/Nacos) It is Alibaba's open source dynamic service discovery, configuration management and service management platform that is easier to build cloud-native applications.

## Nacos Server 2.4.2 is properly configured and started
## Nacos Server 2.4.3 is properly configured and started

In Nacos 2.4.2, functions related to user authentication are added. When starting Nacos Server for the first time, it needs to be configured correctly to avoid the problem of startup failure.
In Nacos 2.4.3, functions related to user authentication are added. When starting Nacos Server for the first time, it needs to be configured correctly to avoid the problem of startup failure.

### Download Nacos Server

Expand Down Expand Up @@ -49,7 +49,7 @@ db.pool.config.minimumIdle=2

#### Turn on authentication

**Note: If it is not enabled, login failure exception will occur in 2.4.2!**
**Note: If it is not enabled, login failure exception will occur in 2.4.3!**

```properties
### The auth system to use, currently only 'nacos' and 'ldap' is supported:
Expand Down Expand Up @@ -77,7 +77,7 @@ nacos.core.auth.plugin.nacos.token.secret.key=SecretKey0123456789012345678901234

#### Open API authentication

Authentication is required when using the Open api interface in nacos server 2.4.2: For more details, please refer to: [Nacos api authentication](https://nacos.io/zh-cn/docs/auth.html)
Authentication is required when using the Open api interface in nacos server 2.4.3: For more details, please refer to: [Nacos api authentication](https://nacos.io/zh-cn/docs/auth.html)

1. Obtain accessToken: Use username and password to log in to the nacos server:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.0</version>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.0</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion spring-cloud-alibaba-examples/seata-example/readme-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ seata:
```

> **注意:**
> Nacos 2.4.2 开启鉴权,需要配置 `username` 和 `password` 属性,否则登陆失败。更多 Nacos 2.4.2 版本相关配置,参考 `nacos-example`。
> Nacos 2.4.3 开启鉴权,需要配置 `username` 和 `password` 属性,否则登陆失败。更多 Nacos 2.4.3 版本相关配置,参考 `nacos-example`。
> **Seata-server 启动时的 Nacos 服务注册分组需要和示例应用中的分组保持一致,否则出现无法找到 seata-server 的错误!**
> 更多 Seata-server 以 Nacos 作为配置中心的配置请参考:https://seata.io/zh-cn/docs/ops/deploy-by-docker-compose/#nacos-db

Expand Down
4 changes: 2 additions & 2 deletions spring-cloud-alibaba-examples/seata-example/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ CREATE TABLE `account_tbl` (

### 2. Configure Nacos

> Spring Cloud Alibaba is adapted with Nacos 2.4.2. In this example, Nacos 2.4.2 is used as the configuration center component of Seata.
> Spring Cloud Alibaba is adapted with Nacos 2.4.3. In this example, Nacos 2.4.3 is used as the configuration center component of Seata.

Create Nacos configuration for Seata: data-id: `seata.properties`, Group: `SEATA_GROUP` (default grouping for seata 2.1.0), import

Expand Down Expand Up @@ -220,7 +220,7 @@ seata:
```

> **Notice**
> Nacos 2.4.2 enables authentication. Configuration `username` and `password` properties are required, otherwise login fails. For more Nacos 2.4.2 related configurations, refer to `nacos-example`.
> Nacos 2.4.3 enables authentication. Configuration `username` and `password` properties are required, otherwise login fails. For more Nacos 2.4.3 related configurations, refer to `nacos-example`.
> **The Nacos service registration group when seata-server is started must be consistent with the group in the sample application, otherwise an error that seata-server cannot be found will occur!**
> For more information about the configuration of Seata-server with Nacos as the configuration center, please refer to https://seata.io/zh-cn/docs/ops/deploy-by-docker-compose/#nacos-db.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.24.0</version>
</dependency>

</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,12 @@
</dependency>

<dependency>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
<version>1.0</version>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
</dependency>


</dependencies>

<repositories>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<dependency>
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-core</artifactId>
<version>4.4.6</version>
<version>4.7.2</version>
</dependency>
<!-- schedulerx dependency end-->

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>2.0.22</version>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>2.0.52</version>
</dependency>
<!-- Testing -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
nacos:
image: nacos/nacos-server:v2.4.2
image: nacos/nacos-server:v2.4.3
container_name: nacos-standalone
environment:
- PREFER_HOST_MODE=hostname
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
services:
nacos:
image: nacos/nacos-server:v2.4.2
image: nacos/nacos-server:v2.4.3
container_name: nacos-standalone
environment:
- PREFER_HOST_MODE=hostname
Expand Down
Loading
Loading