diff --git a/yudao-admin-server/pom.xml b/yudao-admin-server/pom.xml index 7b3bb7925..745cdb5f9 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,22 +16,15 @@ 1.0.0 - 2.4.4 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - + + 3.8.0 + + 2.4.4 + + 1.16.14 + 1.4.1.Final + @@ -40,49 +33,96 @@ ${revision} + + + org.projectlombok + lombok + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.mapstruct + mapstruct-processor + true + + + + cn.hutool + hutool-all + + + org.springframework.boot spring-boot-starter-test - 2.4.4 test - - - asm - org.ow2.asm - - com.h2database h2 - test + test com.github.fppt jedis-mock - 0.1.16 test uk.co.jemos.podam podam - 7.2.6.RELEASE test - + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + org.apache.maven.plugins maven-compiler-plugin + ${maven-compiler-plugin.version} - 8 - 8 + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index cc077bc0a..1fa837011 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -15,6 +15,19 @@ 1.0.0 + + UTF-8 + UTF-8 + @ + 1.8 + ${java.version} + ${java.version} + 3.8.0 + + 2.4.4 + + 7.2.6.RELEASE + 0.1.16 1.16.14 1.4.1.Final @@ -22,7 +35,6 @@ 2.2.7 2.2 1.0.5 - 4.5.18 2.1.0 @@ -31,11 +43,51 @@ + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + + + + org.springframework.boot + spring-boot-starter-test + ${spring.boot.version} + test + + + asm + org.ow2.asm + + + + + + com.github.fppt + jedis-mock + ${jedis-mock.version} + test + + + + uk.co.jemos.podam + podam + ${podam.version} + test + + org.projectlombok lombok ${lombok.version} + true @@ -45,14 +97,14 @@ org.mapstruct - mapstruct-processor + mapstruct-jdk8 ${mapstruct.version} - true org.mapstruct - mapstruct-jdk8 + mapstruct-processor ${mapstruct.version} + true @@ -102,4 +154,50 @@ + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + true + + + + + repackage + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.mapstruct + mapstruct-processor + ${mapstruct.version} + + + org.projectlombok + lombok + ${lombok.version} + + + + + + + + diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 5f5713fd0..23d3aa348 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -39,25 +39,8 @@ 8.5.0 6.1 2.3.1 - - 7.2.6.RELEASE - 0.1.16 - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - - @@ -205,34 +188,27 @@ org.springframework.boot spring-boot-starter-test - + provided true - - - asm - org.ow2.asm - - com.h2database h2 - test + true com.github.fppt jedis-mock - ${jedis-mock.version} - test + provided + true uk.co.jemos.podam podam - ${podam.version} - + provided true @@ -248,12 +224,11 @@ org.mapstruct - mapstruct-processor - true + mapstruct-jdk8 org.mapstruct - mapstruct-jdk8 + mapstruct-processor @@ -264,16 +239,19 @@ com.alibaba easyexcel + true org.apache.velocity velocity-engine-core + true cn.smallbun.screw screw-core + true @@ -282,15 +260,18 @@ com.yunpian.sdk yunpian-java-sdk + true com.aliyun aliyun-java-sdk-core + true com.aliyun aliyun-java-sdk-dysmsapi + true @@ -304,40 +285,12 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} - - true - - - - - repackage - - - org.apache.maven.plugins maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - - - org.projectlombok - lombok - ${lombok.version} - - -