diff --git a/mall-ebtp-cloud-apollo-starter/pom.xml b/mall-ebtp-cloud-apollo-starter/pom.xml index d004727..3ba6757 100644 --- a/mall-ebtp-cloud-apollo-starter/pom.xml +++ b/mall-ebtp-cloud-apollo-starter/pom.xml @@ -8,25 +8,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-apollo-starter 0.0.1 mall-ebtp-cloud-apollo-stater - - Chinaunicom, Inc. - - - - - Ajaxfan - 909938737@qq.com - Chinaunicom, Inc. - - - com.ctrip.framework.apollo diff --git a/mall-ebtp-cloud-eureka-starter/pom.xml b/mall-ebtp-cloud-eureka-starter/pom.xml index cb72e56..f357e8f 100644 --- a/mall-ebtp-cloud-eureka-starter/pom.xml +++ b/mall-ebtp-cloud-eureka-starter/pom.xml @@ -8,25 +8,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-eureka-starter 0.0.1 mall-ebtp-cloud-eureka-starter - - Chinaunicom, Inc. - - - - - Ajaxfan - 909938737@qq.com - Chinaunicom, Inc. - - - org.springframework.cloud diff --git a/mall-ebtp-cloud-feign-starter/pom.xml b/mall-ebtp-cloud-feign-starter/pom.xml index f43e135..7623cfd 100644 --- a/mall-ebtp-cloud-feign-starter/pom.xml +++ b/mall-ebtp-cloud-feign-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-feign-starter diff --git a/mall-ebtp-cloud-fileupload-starter/pom.xml b/mall-ebtp-cloud-fileupload-starter/pom.xml index c4ab016..c8fe544 100644 --- a/mall-ebtp-cloud-fileupload-starter/pom.xml +++ b/mall-ebtp-cloud-fileupload-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-fileupload-starter @@ -16,6 +16,10 @@ mall-ebtp-cloud-fileupload-starter + + org.springframework.boot + spring-boot-starter + cn.chinaunicom.sdsi unifast-storage diff --git a/mall-ebtp-cloud-fileupload-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/fileupload/starter/FileuploadStarterConfiguration.java b/mall-ebtp-cloud-fileupload-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/fileupload/starter/FileuploadStarterConfiguration.java index a6b6630..274f8e9 100644 --- a/mall-ebtp-cloud-fileupload-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/fileupload/starter/FileuploadStarterConfiguration.java +++ b/mall-ebtp-cloud-fileupload-starter/src/main/java/com/chinaunicom/mall/ebtp/cloud/fileupload/starter/FileuploadStarterConfiguration.java @@ -6,5 +6,4 @@ import org.springframework.context.annotation.PropertySource; @Configuration @PropertySource("classpath:fileupload-configuration.properties") public class FileuploadStarterConfiguration { - } diff --git a/mall-ebtp-cloud-jpa-starter/pom.xml b/mall-ebtp-cloud-jpa-starter/pom.xml index 5e3d2e9..174d97c 100644 --- a/mall-ebtp-cloud-jpa-starter/pom.xml +++ b/mall-ebtp-cloud-jpa-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-jpa-starter @@ -25,4 +25,5 @@ druid-spring-boot-starter + diff --git a/mall-ebtp-cloud-kafka-starter/pom.xml b/mall-ebtp-cloud-kafka-starter/pom.xml index 6856232..fa77eb8 100644 --- a/mall-ebtp-cloud-kafka-starter/pom.xml +++ b/mall-ebtp-cloud-kafka-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-kafka-starter diff --git a/mall-ebtp-cloud-log-starter/pom.xml b/mall-ebtp-cloud-log-starter/pom.xml index 42d550b..289d880 100644 --- a/mall-ebtp-cloud-log-starter/pom.xml +++ b/mall-ebtp-cloud-log-starter/pom.xml @@ -8,17 +8,18 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-log-starter 0.0.1 mall-ebtp-cloud-log-starter - http://maven.apache.org - - UTF-8 - + + + org.springframework.boot + spring-boot-starter + org.apache.skywalking diff --git a/mall-ebtp-cloud-mvc-starter/pom.xml b/mall-ebtp-cloud-mvc-starter/pom.xml index 238d87b..236f7c9 100644 --- a/mall-ebtp-cloud-mvc-starter/pom.xml +++ b/mall-ebtp-cloud-mvc-starter/pom.xml @@ -8,25 +8,13 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-mvc-starter 0.0.1 mall-ebtp-cloud-mvc-starter - - Chinaunicom, Inc. - - - - - Ajaxfan - 909938737@qq.com - Chinaunicom, Inc. - - - org.springframework.boot diff --git a/mall-ebtp-cloud-office-starter/pom.xml b/mall-ebtp-cloud-office-starter/pom.xml index 2840a8c..0aafe8a 100644 --- a/mall-ebtp-cloud-office-starter/pom.xml +++ b/mall-ebtp-cloud-office-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-office-starter @@ -16,6 +16,10 @@ mall-ebtp-cloud-office-starter + + org.springframework.boot + spring-boot-starter + cn.chinaunicom.sdsi chinaunicom-excelutils diff --git a/mall-ebtp-cloud-parent/pom.xml b/mall-ebtp-cloud-parent/pom.xml index dbf49e7..d7b830f 100644 --- a/mall-ebtp-cloud-parent/pom.xml +++ b/mall-ebtp-cloud-parent/pom.xml @@ -7,6 +7,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud 0.0.1 + .. com.chinaunicom.ebtp mall-ebtp-cloud-parent @@ -15,171 +16,72 @@ mall-ebtp-cloud-parent http://maven.apache.org - - 2.6.0-SNAPSHOT - 3.2.0 - 1.5.21 - 1.3.3 - 26.0-jre - 1.1.14 - 2.0.3 - 5.4.1 - - - cn.chinaunicom.sdsi - chinaunicom-excelutils - 1.0.0 + com.chinaunicom.ebtp + mall-ebtp-cloud-mvc-starter + 0.0.1 - cn.chinaunicom.sdsi - unifast-security - ${unifast.version} + com.chinaunicom.ebtp + mall-ebtp-cloud-eureka-starter + 0.0.1 - cn.chinaunicom.sdsi - unifast-core - ${unifast.version} + com.chinaunicom.ebtp + mall-ebtp-cloud-apollo-starter + 0.0.1 - cn.chinaunicom.sdsi - unifast-storage - 1.0.0 + com.chinaunicom.ebtp + mall-ebtp-cloud-security-starter + 0.0.1 - p6spy - p6spy - 3.8.5 + com.chinaunicom.ebtp + mall-ebtp-cloud-jpa-starter + 0.0.1 - commons-fileupload - commons-fileupload - 1.3.2 + com.chinaunicom.ebtp + mall-ebtp-cloud-office-starter + 0.0.1 - com.baomidou - mybatis-plus-boot-starter - ${mybatis-plus.version} + com.chinaunicom.ebtp + mall-ebtp-cloud-swagger-starter + 0.0.1 - com.baomidou - mybatis-plus-generator - ${mybatis-plus.version} + com.chinaunicom.ebtp + mall-ebtp-cloud-fileupload-starter + 0.0.1 - com.github.pagehelper - pagehelper-spring-boot-starter - 1.2.13 + com.chinaunicom.ebtp + mall-ebtp-cloud-redis-starter + 0.0.1 - com.github.jsqlparser - jsqlparser - 2.0 + com.chinaunicom.ebtp + mall-ebtp-cloud-kafka-starter + 0.0.1 - com.alibaba - druid - ${druid.version} + com.chinaunicom.ebtp + mall-ebtp-cloud-feign-starter + 0.0.1 - io.springfox - springfox-swagger2 - 2.9.2 - - - io.swagger - swagger-annotations - ${swagger.version} - - - io.swagger - swagger-models - ${swagger.version} - - - io.springfox - springfox-swagger-ui - 2.9.2 - - - io.github.swagger2markup - swagger2markup - ${swagger2markup.version} - - - com.google.guava - guava - ${guava.version} - - - org.apache.shardingsphere - sharding-jdbc-spring-boot-starter - 4.1.1 - - - org.apache.poi - poi - 3.9 - - - org.apache.poi - poi-ooxml - 3.9 - - - org.apache.poi - poi-ooxml-schemas - 3.9 - - - org.springframework.security.oauth - spring-security-oauth2 - 2.2.1.RELEASE - - - com.sun.jersey - jersey-client - 1.18.3 - - - net.sf.json-lib - json-lib - 2.4 - jdk15 - - - cn.hutool - hutool-all - ${hutool.version} - - - org.hibernate.validator - hibernate-validator - 6.1.5.Final - - - - org.apache.skywalking - apm-toolkit-logback-1.x - 8.1.0 - - - - org.apache.skywalking - apm-toolkit-trace - 8.1.0 + com.chinaunicom.ebtp + mall-ebtp-cloud-seata-starter + 0.0.1 - - org.springframework.boot - spring-boot-starter - provided - org.springframework.boot spring-boot-starter-test diff --git a/mall-ebtp-cloud-redis-starter/pom.xml b/mall-ebtp-cloud-redis-starter/pom.xml index 4376894..66ad764 100644 --- a/mall-ebtp-cloud-redis-starter/pom.xml +++ b/mall-ebtp-cloud-redis-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-redis-starter diff --git a/mall-ebtp-cloud-seata-starter/pom.xml b/mall-ebtp-cloud-seata-starter/pom.xml index ba75842..4add5a8 100644 --- a/mall-ebtp-cloud-seata-starter/pom.xml +++ b/mall-ebtp-cloud-seata-starter/pom.xml @@ -8,15 +8,17 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-seata-starter 0.0.1 mall-ebtp-cloud-seata-starter + 1.3.0 + com.chinaunicom.ebtp diff --git a/mall-ebtp-cloud-security-starter/pom.xml b/mall-ebtp-cloud-security-starter/pom.xml index f88b319..2de5178 100644 --- a/mall-ebtp-cloud-security-starter/pom.xml +++ b/mall-ebtp-cloud-security-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-security-starter diff --git a/mall-ebtp-cloud-swagger-starter/pom.xml b/mall-ebtp-cloud-swagger-starter/pom.xml index 0ddd8c3..817c38e 100644 --- a/mall-ebtp-cloud-swagger-starter/pom.xml +++ b/mall-ebtp-cloud-swagger-starter/pom.xml @@ -8,7 +8,7 @@ com.chinaunicom.ebtp mall-ebtp-cloud-parent 0.0.1 - + ../mall-ebtp-cloud-parent com.chinaunicom.ebtp mall-ebtp-cloud-swagger-starter diff --git a/pom.xml b/pom.xml index 26a105b..2a13b9d 100644 --- a/pom.xml +++ b/pom.xml @@ -15,8 +15,7 @@ pom mall-ebtp-cloud - Parent pom providing dependency and plugin management for - applications built with Maven + Parent pom providing dependency and plugin management for applications built with Maven 1.8 @@ -28,6 +27,13 @@ Hoxton.SR7 2.2.3.RELEASE 3.2.0 + 2.6.0-SNAPSHOT + 1.5.21 + 1.3.3 + 26.0-jre + 1.1.14 + 2.0.3 + 5.4.1 @@ -57,64 +63,147 @@ 1.4.0 - com.chinaunicom.ebtp - mall-ebtp-cloud-mvc-starter - 0.0.1 + cn.chinaunicom.sdsi + chinaunicom-excelutils + 1.0.0 - com.chinaunicom.ebtp - mall-ebtp-cloud-eureka-starter - 0.0.1 + cn.chinaunicom.sdsi + unifast-security + ${unifast.version} - com.chinaunicom.ebtp - mall-ebtp-cloud-apollo-starter - 0.0.1 + cn.chinaunicom.sdsi + unifast-core + ${unifast.version} - com.chinaunicom.ebtp - mall-ebtp-cloud-security-starter - 0.0.1 + cn.chinaunicom.sdsi + unifast-storage + 1.0.0 - com.chinaunicom.ebtp - mall-ebtp-cloud-jpa-starter - 0.0.1 + p6spy + p6spy + 3.8.5 - com.chinaunicom.ebtp - mall-ebtp-cloud-office-starter - 0.0.1 + commons-fileupload + commons-fileupload + 1.3.2 - com.chinaunicom.ebtp - mall-ebtp-cloud-swagger-starter - 0.0.1 + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} - com.chinaunicom.ebtp - mall-ebtp-cloud-fileupload-starter - 0.0.1 + com.baomidou + mybatis-plus-generator + ${mybatis-plus.version} - com.chinaunicom.ebtp - mall-ebtp-cloud-redis-starter - 0.0.1 + com.github.pagehelper + pagehelper-spring-boot-starter + 1.2.13 - com.chinaunicom.ebtp - mall-ebtp-cloud-kafka-starter - 0.0.1 + com.github.jsqlparser + jsqlparser + 2.0 - com.chinaunicom.ebtp - mall-ebtp-cloud-feign-starter - 0.0.1 + com.alibaba + druid + ${druid.version} - com.chinaunicom.ebtp - mall-ebtp-cloud-seata-starter - 0.0.1 + io.springfox + springfox-swagger2 + 2.9.2 + + + io.swagger + swagger-annotations + ${swagger.version} + + + io.swagger + swagger-models + ${swagger.version} + + + io.springfox + springfox-swagger-ui + 2.9.2 + + + io.github.swagger2markup + swagger2markup + ${swagger2markup.version} + + + com.google.guava + guava + ${guava.version} + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + 4.1.1 + + + org.apache.poi + poi + 3.9 + + + org.apache.poi + poi-ooxml + 3.9 + + + org.apache.poi + poi-ooxml-schemas + 3.9 + + + org.springframework.security.oauth + spring-security-oauth2 + 2.2.1.RELEASE + + + com.sun.jersey + jersey-client + 1.18.3 + + + net.sf.json-lib + json-lib + 2.4 + jdk15 + + + cn.hutool + hutool-all + ${hutool.version} + + + org.hibernate.validator + hibernate-validator + 6.1.5.Final + + + + org.apache.skywalking + apm-toolkit-logback-1.x + 8.1.0 + + + + org.apache.skywalking + apm-toolkit-trace + 8.1.0 @@ -304,6 +393,18 @@ mall-ebtp-cloud-log-starter mall-ebtp-cloud-seata-starter + + + China Unicom + http://www.chinaunicom.com + + + + ajaxfan + ajaxfan@gmail.com + ChinaUnicom + +