diff --git a/pom.xml b/pom.xml index e911ac6c3..b28d0956d 100644 --- a/pom.xml +++ b/pom.xml @@ -20,6 +20,14 @@ 1.0.0 + + + 3.8.0 + + 2.4.4 + + 1.16.14 + 1.4.1.Final @@ -34,4 +42,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-admin-server/pom.xml b/yudao-admin-server/pom.xml index 745cdb5f9..c79695d19 100644 --- a/yudao-admin-server/pom.xml +++ b/yudao-admin-server/pom.xml @@ -16,46 +16,25 @@ 1.0.0 - - - 3.8.0 - - 2.4.4 - - 1.16.14 - 1.4.1.Final + + mysql + mysql-connector-java + 5.1.46 + + cn.iocoder.boot yudao-framework ${revision} - - - - - org.projectlombok - lombok - - - - org.mapstruct - mapstruct - - - org.mapstruct - mapstruct-jdk8 - - - org.mapstruct - mapstruct-processor - true - - - - cn.hutool - hutool-all + + + mysql + mysql-connector-java + + @@ -82,48 +61,36 @@ podam test + + + + org.projectlombok + lombok + + + + org.mapstruct + mapstruct + + + org.mapstruct + mapstruct-jdk8 + + + org.mapstruct + mapstruct-processor + + + + ${project.artifactId} + - 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-dependencies/pom.xml b/yudao-dependencies/pom.xml index 1fa837011..bacb5a1f0 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -25,6 +25,21 @@ 3.8.0 2.4.4 + + 5.1.46 + 1.2.4 + 3.4.2 + 3.3.2 + 3.15.1 + + 1.7.0 + + + 2.2.0 + 1.7.0 + + 8.5.0 + 2.3.1 7.2.6.RELEASE 0.1.16 @@ -50,16 +65,111 @@ ${spring.boot.version} pom import + + + mysql + mysql-connector-java + + + + + org.springframework.boot + spring-boot-configuration-processor + ${spring.boot.version} + + + + + mysql + mysql-connector-java + ${mysql-connector-java.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + com.baomidou + dynamic-datasource-spring-boot-starter + ${dynamic-datasource.version} + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + + + com.ctrip.framework.apollo + apollo-client + ${apollo.version} + + + + + + + com.baomidou + lock4j-redisson-spring-boot-starter + ${lock4j.version} + + + redisson-spring-boot-starter + org.redisson + + + + + + io.github.resilience4j + resilience4j-spring-boot2 + ${resilience4j.version} + + + + + org.apache.skywalking + apm-toolkit-trace + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-logback-1.x + ${skywalking.version} + + + org.apache.skywalking + apm-toolkit-opentracing + ${skywalking.version} + + + + de.codecentric + spring-boot-admin-starter-server + ${spring-boot-admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + org.springframework.boot spring-boot-starter-test ${spring.boot.version} - test asm @@ -72,14 +182,12 @@ com.github.fppt jedis-mock ${jedis-mock.version} - test uk.co.jemos.podam podam ${podam.version} - test @@ -87,7 +195,6 @@ org.projectlombok lombok ${lombok.version} - true @@ -104,7 +211,6 @@ org.mapstruct mapstruct-processor ${mapstruct.version} - true @@ -154,50 +260,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 23d3aa348..d9029813f 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -24,21 +24,7 @@ 3.0.2 1.5.22 - - 5.1.46 - 1.2.4 - 3.4.2 - 3.3.2 - 3.15.1 - - 1.7.0 - - 2.2.0 - 1.7.0 - - 8.5.0 - 6.1 - 2.3.1 + @@ -100,35 +86,30 @@ mysql mysql-connector-java - ${mysql-connector-java.version} + 5.1.46 com.alibaba druid-spring-boot-starter - ${druid.version} com.baomidou mybatis-plus-boot-starter - ${mybatis-plus.version} com.baomidou dynamic-datasource-spring-boot-starter - ${dynamic-datasource.version} org.redisson redisson-spring-boot-starter - ${redisson.version} com.ctrip.framework.apollo apollo-client - ${apollo.version} @@ -141,47 +122,34 @@ com.baomidou lock4j-redisson-spring-boot-starter - ${lock4j.version} - - - redisson-spring-boot-starter - org.redisson - - io.github.resilience4j resilience4j-spring-boot2 - ${resilience4j.version} org.apache.skywalking apm-toolkit-trace - ${skywalking.version} org.apache.skywalking apm-toolkit-logback-1.x - ${skywalking.version} org.apache.skywalking apm-toolkit-opentracing - ${skywalking.version} de.codecentric spring-boot-admin-starter-server - ${spring-boot-admin.version} de.codecentric spring-boot-admin-starter-client - ${spring-boot-admin.version} @@ -239,19 +207,16 @@ com.alibaba easyexcel - true org.apache.velocity velocity-engine-core - true cn.smallbun.screw screw-core - true @@ -260,18 +225,15 @@ com.yunpian.sdk yunpian-java-sdk - true com.aliyun aliyun-java-sdk-core - true com.aliyun aliyun-java-sdk-dysmsapi - true