Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud

# Conflicts: # pom.xml
2025-06-15 10:41:54 +08:00 · 2025-06-15 10:41:54 +08:00 · e2457aeec3
parent 916c16f468 6117567219
commit e2457aeec3
21 changed files with 0 additions and 24 deletions
--- a/pom.xml
+++ b/pom.xml
@ -43,8 +43,6 @@
        <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
        <flatten-maven-plugin.version>1.6.0</flatten-maven-plugin.version>
        <!-- 看看咋放到 bom 里 -->
-        <lombok.version>1.18.36</lombok.version>
-        <spring.boot.version>2.7.18</spring.boot.version>
        <mapstruct.version>1.6.3</mapstruct.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
    </properties>
@ -82,12 +80,10 @@
                            <path>
                                <groupId>org.springframework.boot</groupId>
                                <artifactId>spring-boot-configuration-processor</artifactId>
-                                <version>${spring.boot.version}</version>
                            </path>
                            <path>
                                <groupId>org.projectlombok</groupId>
                                <artifactId>lombok</artifactId>
-                                <version>${lombok.version}</version>
                            </path>
                            <path>
                                <groupId>org.mapstruct</groupId>
--- a/yudao-gateway/pom.xml
+++ b/yudao-gateway/pom.xml
@ -85,7 +85,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version> <!-- 如果 spring.boot.version 版本修改，则这里也要跟着修改 -->
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-ai/yudao-module-ai-server/pom.xml
+++ b/yudao-module-ai/yudao-module-ai-server/pom.xml
@ -253,7 +253,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-bpm/yudao-module-bpm-server/pom.xml
+++ b/yudao-module-bpm/yudao-module-bpm-server/pom.xml
@ -122,7 +122,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-crm/yudao-module-crm-server/pom.xml
+++ b/yudao-module-crm/yudao-module-crm-server/pom.xml
@ -118,7 +118,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-erp/yudao-module-erp-server/pom.xml
+++ b/yudao-module-erp/yudao-module-erp-server/pom.xml
@ -104,7 +104,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-infra/yudao-module-infra-server/pom.xml
+++ b/yudao-module-infra/yudao-module-infra-server/pom.xml
@ -151,7 +151,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-iot/yudao-module-iot-biz/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-biz/pom.xml
@ -198,7 +198,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/pom.xml
@ -127,7 +127,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-http/pom.xml
@ -127,7 +127,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-mqtt/pom.xml
+++ b/yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-mqtt/pom.xml
@ -143,7 +143,6 @@
        <dependency>
            <groupId>org.projectlombok</groupId>
            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
            <scope>provided</scope>
        </dependency>
        <!-- Vert.x MQTT -->
--- a/yudao-module-mall/yudao-module-product-server/pom.xml
+++ b/yudao-module-mall/yudao-module-product-server/pom.xml
@ -103,7 +103,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-mall/yudao-module-promotion-server/pom.xml
+++ b/yudao-module-mall/yudao-module-promotion-server/pom.xml
@ -142,7 +142,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-mall/yudao-module-statistics-server/pom.xml
+++ b/yudao-module-mall/yudao-module-statistics-server/pom.xml
@ -133,7 +133,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-mall/yudao-module-trade-server/pom.xml
+++ b/yudao-module-mall/yudao-module-trade-server/pom.xml
@ -139,7 +139,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-member/yudao-module-member-server/pom.xml
+++ b/yudao-module-member/yudao-module-member-server/pom.xml
@ -126,7 +126,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-mp/yudao-module-mp-server/pom.xml
+++ b/yudao-module-mp/yudao-module-mp-server/pom.xml
@ -121,7 +121,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-pay/yudao-module-pay-server/pom.xml
+++ b/yudao-module-pay/yudao-module-pay-server/pom.xml
@ -129,7 +129,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-report/yudao-module-report-server/pom.xml
+++ b/yudao-module-report/yudao-module-report-server/pom.xml
@ -119,7 +119,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-module-system/yudao-module-system-server/pom.xml
+++ b/yudao-module-system/yudao-module-system-server/pom.xml
@ -168,7 +168,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>
--- a/yudao-server/pom.xml
+++ b/yudao-server/pom.xml
@ -163,7 +163,6 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring.boot.version}</version>
                <executions>
                    <execution>
                        <goals>