diff --git a/common-actuator/pom.xml b/common-actuator/pom.xml index 5b0a891..c2e0059 100644 --- a/common-actuator/pom.xml +++ b/common-actuator/pom.xml @@ -16,6 +16,18 @@ common-actuator-client + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + org.springframework.boot diff --git a/common-api-bom/pom.xml b/common-api-bom/pom.xml new file mode 100644 index 0000000..8761349 --- /dev/null +++ b/common-api-bom/pom.xml @@ -0,0 +1,368 @@ + + + + common-api + io.github.alice52 + 0.0.1 + + 4.0.0 + + common-api-bom + + + + + + 2.9.2 + 1.9.3 + 3.0.3 + 3.0.0 + 1.7.36 + 1.2.9 + 1.2.3 + 0.1.18 + 3.1.9 + + + 0.5.10 + 1.18.24 + 5.8.9 + 3.0.4 + 1.5.3.Final + 31.1-jre + 2.0.1.Final + 0.0.9 + + + 2.7.5 + 2.7.7 + 2021.0.4 + 2021.1 + 2.5.2.RELEASE + 11.10 + 2.2.6.RELEASE + + + 2.13.4 + + + 5.1.49 + 1.2.14 + 3.5.2 + 2.2.2 + 7.17.7 + 3.17.7 + + + 5.16.0 + + + 4.13.2 + 3.3.1 + 1.4.0 + 1.50.2 + 5.4.0 + 5.6.125.2 + + + + + + + + org.springframework.cloud + spring-cloud-dependencies + ${spring.cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${cloud.alibaba.version} + pom + import + + + io.github.openfeign + feign-core + ${feign.core.version} + + + + slf4j-api + org.slf4j + ${slf4j.api.version} + + + ch.qos.logback + logback-core + ${logback.core.version} + + + ch.qos.logback + logback-classic + ${logback.classic.version} + + + org.codehaus.janino + janino + ${janino.version} + + + com.aliyun.openservices + aliyun-log-logback-appender + ${aliyun.logback.version} + + + + + org.projectlombok + lombok + ${lombok.version} + true + + + cn.hutool + hutool-all + ${hutool.all.version} + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + ${jasypt.encrtpy.version} + + + org.mapstruct + mapstruct + ${mapstruct.version} + + + javax.validation + validation-api + ${validation.api.version} + + + com.google.guava + guava + ${guava.version} + + + com.xkcoding.justauth + justauth-spring-boot-starter + ${justauth.starter} + + + net.jodah + expiringmap + ${jodah.expiringmap.version} + + + + com.github.axet + kaptcha + ${kaptcha.version} + + + + + com.fasterxml.jackson.module + jackson-modules-java8 + ${jackson.modules} + pom + import + + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + org.springframework.boot + spring-boot-starter-validation + ${spring.boot.version} + + + org.springframework.security.oauth + spring-security-oauth2 + ${security.oauth.version} + + + de.codecentric + spring-boot-admin-starter-server + ${actuator.admin.version} + + + de.codecentric + spring-boot-admin-starter-client + ${actuator.admin.version} + + + junit + junit + ${junit.version} + + + + + mysql + mysql-connector-java + ${mysql.version} + + + com.alibaba + druid + ${druid.version} + + + com.alibaba + druid-spring-boot-starter + ${druid.version} + + + org.mybatis.spring.boot + mybatis-spring-boot-starter + ${mybatis.spring.boot.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis.plus.version} + + + com.baomidou + mybatis-plus-extension + ${mybatis.plus.version} + + + com.baomidou + mybatis-plus-annotation + ${mybatis.plus.version} + + + org.elasticsearch.client + elasticsearch-rest-high-level-client + ${elasticsearch.version} + + + org.elasticsearch.client + elasticsearch-rest-client + + + org.elasticsearch + elasticsearch + + + + + + + org.redisson + redisson-spring-boot-starter + ${redisson.version} + + + org.redisson + redisson-spring-data-23 + + + + + org.redisson + redisson-spring-data-21 + ${redisson.version} + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + io.springfox + springfox-swagger2 + ${swagger.fox.version} + + + com.github.xiaoymin + knife4j-spring-boot-starter + ${swagger2.knife4j} + + + + io.springfox + springfox-boot-starter + ${swagger.starter} + + + + + io.grpc + grpc-bom + ${grpc_version} + pom + import + + + + + + org.apache.curator + curator-recipes + ${curator.zk.version} + + + + + com.rabbitmq + amqp-client + ${rabbitmq.client.version} + + + + com.qcloud + cos_api + ${qcloud.version} + + + + + + + + + org.sonarsource.scanner.maven + sonar-maven-plugin + ${sonar-maven-plugin.version} + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin} + + + org.apache.maven.plugins + maven-gpg-plugin + 3.0.1 + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.4.1 + + + + + + diff --git a/common-api-inject/pom.xml b/common-api-inject/pom.xml index db69a9a..3a2d658 100644 --- a/common-api-inject/pom.xml +++ b/common-api-inject/pom.xml @@ -19,6 +19,11 @@ ${project.version} --> + + io.github.alice52 + common-apis + ${project.version} + io.github.alice52 @@ -77,52 +82,5 @@ common-crypt ${project.version} - - - - org.projectlombok - lombok - - - org.mapstruct - mapstruct - - - - - org.springframework.boot - spring-boot-starter-web - - - spring-boot-starter-tomcat - org.springframework.boot - - - - - org.springframework.boot - spring-boot-starter-undertow - - - org.springframework.boot - spring-boot-starter-actuator - - - - - org.springframework.boot - spring-boot-test - test - - - org.springframework - spring-test - test - - - junit - junit - test - diff --git a/common-apis/pom.xml b/common-apis/pom.xml new file mode 100644 index 0000000..c3038c7 --- /dev/null +++ b/common-apis/pom.xml @@ -0,0 +1,161 @@ + + + + common-api + io.github.alice52 + 0.0.1 + + 4.0.0 + + common-apis + + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + + + com.fasterxml.jackson.module + jackson-module-parameter-names + + + com.fasterxml.jackson.datatype + jackson-datatype-jdk8 + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + + + + + cn.hutool + hutool-all + + + com.google.guava + guava + + + org.mapstruct + mapstruct + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + + + + + org.projectlombok + lombok + + + + + slf4j-api + org.slf4j + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + + + org.springframework.boot + spring-boot-starter + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.springframework + spring-webmvc + + + org.springframework.boot + spring-boot-starter-validation + + + + + jakarta.validation + jakarta.validation-api + + + + + org.aspectj + aspectjrt + + + org.aspectj + aspectjweaver + + + + + org.projectlombok + lombok + + + org.mapstruct + mapstruct + + + + + org.springframework.boot + spring-boot-starter-web + + + spring-boot-starter-tomcat + org.springframework.boot + + + + + org.springframework.boot + spring-boot-starter-undertow + + + org.springframework.boot + spring-boot-starter-actuator + + + + + org.springframework.boot + spring-boot-starter-test + + + org.springframework.boot + spring-boot-test + + + org.springframework + spring-test + + + junit + junit + + + diff --git a/common-core/pom.xml b/common-core/pom.xml index 0c21563..af935df 100644 --- a/common-core/pom.xml +++ b/common-core/pom.xml @@ -11,7 +11,25 @@ common-core + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + jakarta.servlet jakarta.servlet-api diff --git a/common-crypt/pom.xml b/common-crypt/pom.xml index 68b6bd0..eafe304 100644 --- a/common-crypt/pom.xml +++ b/common-crypt/pom.xml @@ -11,7 +11,25 @@ common-crypt + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + io.github.alice52 common-core diff --git a/common-database/pom.xml b/common-database/pom.xml index 6548d69..187a55c 100644 --- a/common-database/pom.xml +++ b/common-database/pom.xml @@ -18,7 +18,25 @@ database-common + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + mysql diff --git a/common-http/pom.xml b/common-http/pom.xml index e46b6e7..a70736d 100644 --- a/common-http/pom.xml +++ b/common-http/pom.xml @@ -11,7 +11,25 @@ common-http + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + com.squareup.okhttp3 okhttp diff --git a/common-log/pom.xml b/common-log/pom.xml index 7cba168..d27461e 100644 --- a/common-log/pom.xml +++ b/common-log/pom.xml @@ -11,7 +11,25 @@ common-log + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + org.codehaus.janino janino diff --git a/common-mq/pom.xml b/common-mq/pom.xml index 4275a53..d13206e 100644 --- a/common-mq/pom.xml +++ b/common-mq/pom.xml @@ -18,7 +18,25 @@ common-mq-receiver + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + io.github.alice52 common-core diff --git a/common-openapi/pom.xml b/common-openapi/pom.xml index 977cd5c..a1b603f 100644 --- a/common-openapi/pom.xml +++ b/common-openapi/pom.xml @@ -11,7 +11,25 @@ common-openapi + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + io.github.alice52 common-core diff --git a/common-oss/pom.xml b/common-oss/pom.xml index af1b83f..508fca8 100644 --- a/common-oss/pom.xml +++ b/common-oss/pom.xml @@ -10,7 +10,25 @@ common-oss + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + io.github.alice52 common-core diff --git a/common-oss/src/main/java/common/oss/service/impl/AliyunOssHandler.java b/common-oss/src/main/java/common/oss/service/impl/AliyunOssHandler.java index ac4ce0c..e0178ed 100644 --- a/common-oss/src/main/java/common/oss/service/impl/AliyunOssHandler.java +++ b/common-oss/src/main/java/common/oss/service/impl/AliyunOssHandler.java @@ -13,6 +13,7 @@ import common.oss.properties.AliyunOssProperties; import common.oss.service.OSSHander; import lombok.extern.slf4j.Slf4j; +import lombok.SneakyThrows; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; @@ -89,6 +90,7 @@ public Map upload(String fileName, File file, Map config = new TreeMap(); config.put("SecretId", ossProperties.getAccessKey()); diff --git a/common-redis/pom.xml b/common-redis/pom.xml index bfbbddc..b462ada 100644 --- a/common-redis/pom.xml +++ b/common-redis/pom.xml @@ -11,7 +11,24 @@ common-redis + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + io.github.alice52 diff --git a/common-swagger/pom.xml b/common-swagger/pom.xml index 165e1bf..769ec3e 100644 --- a/common-swagger/pom.xml +++ b/common-swagger/pom.xml @@ -17,7 +17,25 @@ swagger-3 + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + org.springframework.boot diff --git a/common-uid/pom.xml b/common-uid/pom.xml index e465d82..21c892b 100644 --- a/common-uid/pom.xml +++ b/common-uid/pom.xml @@ -11,7 +11,25 @@ common-uid + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + + io.github.alice52 + common-apis + ${project.version} + + io.github.alice52 database-mybatis-plus diff --git a/custom-test/pom.xml b/custom-test/pom.xml index 6caee27..094483b 100644 --- a/custom-test/pom.xml +++ b/custom-test/pom.xml @@ -26,7 +26,20 @@ custom-kotlin + + + + io.github.alice52 + common-api-bom + ${project.version} + pom + import + + + + + io.github.alice52 common-api-inject diff --git a/pom.xml b/pom.xml index 096bd54..1998680 100644 --- a/pom.xml +++ b/pom.xml @@ -1,7 +1,6 @@ + xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 @@ -33,17 +32,13 @@ common-mq custom-test common-crypt + common-api-bom + common-apis - true - - https://sonarcloud.io - alice52 - 3.9.1.2184 - 1.8 UTF-8 UTF-8 @@ -51,429 +46,14 @@ 1.8 3.8.1 - - 2.9.2 - 1.9.3 - 3.0.3 - 3.0.0 - 1.7.36 - 1.2.9 - 1.2.3 - 0.1.18 - 3.1.9 - - - 0.5.10 1.18.24 - 5.8.9 - 3.0.4 1.5.3.Final - 31.1-jre - 2.0.1.Final - 0.0.9 - - - 2.7.5 - 2.7.7 - 2021.0.4 - 2021.1 - 2.5.2.RELEASE - 11.10 - 2.2.6.RELEASE - - - 2.13.4 - - - 5.1.49 - 1.2.14 - 3.5.2 - 2.2.2 - 7.17.7 - 3.17.7 - - - 5.16.0 - - 4.13.2 - 3.3.1 - 1.4.0 - 1.50.2 - 5.4.0 - 5.6.125.2 - + https://sonarcloud.io + alice52 + 3.9.1.2184 - - - - - - org.springframework.cloud - spring-cloud-dependencies - ${spring.cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${cloud.alibaba.version} - pom - import - - - io.github.openfeign - feign-core - ${feign.core.version} - - - - slf4j-api - org.slf4j - ${slf4j.api.version} - - - ch.qos.logback - logback-core - ${logback.core.version} - - - ch.qos.logback - logback-classic - ${logback.classic.version} - - - org.codehaus.janino - janino - ${janino.version} - - - com.aliyun.openservices - aliyun-log-logback-appender - ${aliyun.logback.version} - - - - - org.projectlombok - lombok - ${lombok.version} - true - - - cn.hutool - hutool-all - ${hutool.all.version} - - - com.github.ulisesbocchio - jasypt-spring-boot-starter - ${jasypt.encrtpy.version} - - - org.mapstruct - mapstruct - ${mapstruct.version} - - - javax.validation - validation-api - ${validation.api.version} - - - com.google.guava - guava - ${guava.version} - - - com.xkcoding.justauth - justauth-spring-boot-starter - ${justauth.starter} - - - net.jodah - expiringmap - ${jodah.expiringmap.version} - - - - com.github.axet - kaptcha - ${kaptcha.version} - - - - - com.fasterxml.jackson.module - jackson-modules-java8 - ${jackson.modules} - pom - import - - - - - org.springframework.boot - spring-boot-dependencies - ${spring.boot.version} - pom - import - - - org.springframework.boot - spring-boot-starter-validation - ${spring.boot.version} - - - org.springframework.security.oauth - spring-security-oauth2 - ${security.oauth.version} - - - de.codecentric - spring-boot-admin-starter-server - ${actuator.admin.version} - - - de.codecentric - spring-boot-admin-starter-client - ${actuator.admin.version} - - - junit - junit - ${junit.version} - - - - - mysql - mysql-connector-java - ${mysql.version} - - - com.alibaba - druid - ${druid.version} - - - com.alibaba - druid-spring-boot-starter - ${druid.version} - - - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${mybatis.spring.boot.version} - - - com.baomidou - mybatis-plus-boot-starter - ${mybatis.plus.version} - - - com.baomidou - mybatis-plus-extension - ${mybatis.plus.version} - - - com.baomidou - mybatis-plus-annotation - ${mybatis.plus.version} - - - org.elasticsearch.client - elasticsearch-rest-high-level-client - ${elasticsearch.version} - - - org.elasticsearch.client - elasticsearch-rest-client - - - org.elasticsearch - elasticsearch - - - - - - - org.redisson - redisson-spring-boot-starter - ${redisson.version} - - - org.redisson - redisson-spring-data-23 - - - - - org.redisson - redisson-spring-data-21 - ${redisson.version} - - - - - io.springfox - springfox-swagger-ui - ${swagger.fox.version} - - - io.springfox - springfox-swagger2 - ${swagger.fox.version} - - - com.github.xiaoymin - knife4j-spring-boot-starter - ${swagger2.knife4j} - - - - io.springfox - springfox-boot-starter - ${swagger.starter} - - - - - io.grpc - grpc-bom - ${grpc_version} - pom - import - - - - - - org.apache.curator - curator-recipes - ${curator.zk.version} - - - - - com.rabbitmq - amqp-client - ${rabbitmq.client.version} - - - - com.qcloud - cos_api - ${qcloud.version} - - - - - - - - - com.fasterxml.jackson.module - jackson-module-parameter-names - - - com.fasterxml.jackson.datatype - jackson-datatype-jdk8 - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - - - - - cn.hutool - hutool-all - - - com.google.guava - guava - - - org.mapstruct - mapstruct - - - com.github.ulisesbocchio - jasypt-spring-boot-starter - - - - - org.projectlombok - lombok - - - - - slf4j-api - org.slf4j - - - ch.qos.logback - logback-core - - - ch.qos.logback - logback-classic - - - - - junit - junit - test - - - org.springframework.boot - spring-boot-starter-test - test - - - - - org.springframework.boot - spring-boot-starter - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.springframework - spring-webmvc - - - org.springframework.boot - spring-boot-starter-validation - - - - - jakarta.validation - jakarta.validation-api - - - - - org.aspectj - aspectjrt - - - org.aspectj - aspectjweaver - - - @@ -489,7 +69,7 @@ org.springframework.boot spring-boot-maven-plugin - ${spring.boot.version} + 2.7.5 @@ -525,28 +105,6 @@ - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - common-api - git@github.com:Alice52/common-api.git - git@github.com:Alice52/common-api.git - git@github.com:Alice52/common-api.git - - - - alice52 - zzhang_xz@163.com - https://github.com/Alice52 - - - disable-javadoc-doclint @@ -611,6 +169,27 @@ + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + common-api + git@github.com:Alice52/common-api.git + git@github.com:Alice52/common-api.git + git@github.com:Alice52/common-api.git + + + + alice52 + zzhang_xz@163.com + https://github.com/Alice52 + + + oss