diff --git a/pom.xml b/pom.xml index ca648159..b07be6b7 100644 --- a/pom.xml +++ b/pom.xml @@ -2,12 +2,18 @@ + + org.springframework.boot + spring-boot-starter-parent + 2.2.5.RELEASE + + + 4.0.0 com.gitee.sop sop-parent 1.0.0-SNAPSHOT pom - 一个开放平台解决方案项目,基于Spring Cloud实现,目标是能够让用户快速得搭建起自己的开放平台 @@ -21,4 +27,224 @@ sop-sdk sop-website + + + 1.8 + + UTF-8 + 1.8 + 1.8 + + + 2.2.5.RELEASE + + Hoxton.SR3 + + + 2.2.1.RELEASE + + + + 1.2.3 + 1.7.5 + + + 4.11 + + 1.2.70 + 2.5 + 1.3.3 + 3.2.2 + 3.8.1 + 1.11 + 1.2 + 2.0.1.Final + 6.0.13.Final + 1.8.6.1 + 2.3.0.RELEASE + 27.1-jre + 1.5.21 + 2.9.2 + 1.16.9 + + + + + + + org.springframework.boot + spring-boot-dependencies + ${spring-boot.version} + pom + import + + + org.springframework.cloud + spring-cloud-dependencies + ${spring-cloud.version} + pom + import + + + com.alibaba.cloud + spring-cloud-alibaba-dependencies + ${spring-cloud-alibaba.version} + pom + import + + + + com.google.guava + guava + ${guava.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + net.oschina.durcframework + fastmybatis-spring-boot-starter + ${fastmybatis.version} + + + + io.springfox + springfox-spring-web + ${springfox-spring-web.version} + + + io.swagger + swagger-annotations + ${swagger.version} + + + + net.oschina.durcframework + easyopen + ${easyopen.version} + + + + net.oschina.durcframework + easyopen-spring-boot-starter + ${easyopen.version} + + + + javax.validation + validation-api + ${validation-api.version} + + + org.hibernate + hibernate-validator + ${hibernate-validator.version} + + + + ch.qos.logback + logback-classic + ${logback.version} + + + + org.springframework.data + spring-data-redis + ${spring-data-redis.version} + + + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + commons-collections + commons-collections + ${commons-collection.version} + + + commons-io + commons-io + ${commons-io.version} + + + commons-codec + commons-codec + ${commons-codec.version} + + + commons-fileupload + commons-fileupload + ${commons-fileupload.version} + + + commons-logging + commons-logging + ${commons-logging.version} + + + + org.projectlombok + lombok + 1.18.4 + + + javax.servlet + javax.servlet-api + 3.1.0 + + + + + + + spring-milestones + Spring Milestones + https://repo.spring.io/milestone + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + true + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + ${java.version} + ${java.version} + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + + + + \ No newline at end of file diff --git a/sop-admin/pom.xml b/sop-admin/pom.xml index bf55daf0..43d110ba 100644 --- a/sop-admin/pom.xml +++ b/sop-admin/pom.xml @@ -2,8 +2,15 @@ + + + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../pom.xml + + 4.0.0 - com.gitee.sop sop-admin 1.0.0-SNAPSHOT pom diff --git a/sop-admin/sop-admin-server/pom.xml b/sop-admin/sop-admin-server/pom.xml index 32f4ac06..00ca5cd8 100644 --- a/sop-admin/sop-admin-server/pom.xml +++ b/sop-admin/sop-admin-server/pom.xml @@ -1,62 +1,25 @@ - 4.0.0 + - org.springframework.boot - spring-boot-starter-parent - 2.2.5.RELEASE - + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml - com.gitee.sop + + 4.0.0 sop-admin-server 1.0.0-SNAPSHOT jar - sop-admin-server - sop-admin-server - 1.8 UTF-8 UTF-8 - 3.11.0 - - 2.2.5.RELEASE - - Hoxton.SR3 - - - 2.2.1.RELEASE - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - com.alibaba.cloud @@ -67,19 +30,16 @@ net.oschina.durcframework easyopen-spring-boot-starter - 1.16.6.1 net.oschina.durcframework fastmybatis-spring-boot-starter - 1.8.6.1 com.squareup.okhttp3 okhttp - ${okhttp.version} @@ -92,6 +52,7 @@ org.springframework.boot spring-boot-starter-web + org.springframework.boot spring-boot-starter-thymeleaf diff --git a/sop-auth/pom.xml b/sop-auth/pom.xml index 77bcb6f2..313805ee 100644 --- a/sop-auth/pom.xml +++ b/sop-auth/pom.xml @@ -1,58 +1,24 @@ - 4.0.0 + - org.springframework.boot - spring-boot-starter-parent - 2.2.5.RELEASE - + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../pom.xml - com.gitee.sop + + 4.0.0 sop-auth - 1.0.0-SNAPSHOT sop-auth 授权程序 1.8 - - 2.2.5.RELEASE - - Hoxton.SR3 - - - 2.2.1.RELEASE - 0.31 - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - diff --git a/sop-common/pom.xml b/sop-common/pom.xml index 16fd62f7..00e5bfdd 100644 --- a/sop-common/pom.xml +++ b/sop-common/pom.xml @@ -2,45 +2,21 @@ + + + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../pom.xml + + 4.0.0 - com.gitee.sop sop-common 3.2.0-SNAPSHOT pom 1.8 - - - UTF-8 - 1.8 - 1.8 - - - 2.2.5.RELEASE - - Hoxton.SR3 - - - 2.2.1.RELEASE - - - - 1.0.13 - 1.7.5 - - - 4.11 - - 1.2.62 - 2.5 - 1.3.3 - 3.2.2 - 3.8.1 - 1.11 - 2.0.1.Final - 6.0.13.Final - 0.9.0.RELEASE @@ -50,136 +26,5 @@ sop-bridge-gateway - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - com.alibaba - fastjson - ${fastjson.version} - - - - javax.validation - validation-api - ${validation-api.version} - - - org.hibernate - hibernate-validator - ${hibernate-validator.version} - - - - org.springframework.data - spring-data-redis - 2.3.0.RELEASE - - - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - commons-collections - commons-collections - ${commons-collection.version} - - - commons-io - commons-io - ${commons-io.version} - - - commons-codec - commons-codec - ${commons-codec.version} - - - commons-fileupload - commons-fileupload - ${commons-fileupload.version} - - - - org.projectlombok - lombok - 1.18.4 - - - javax.servlet - javax.servlet-api - 3.1.0 - - - - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - UTF-8 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - \ No newline at end of file diff --git a/sop-common/sop-bridge-gateway/pom.xml b/sop-common/sop-bridge-gateway/pom.xml index 23201106..89b05e72 100644 --- a/sop-common/sop-bridge-gateway/pom.xml +++ b/sop-common/sop-bridge-gateway/pom.xml @@ -3,10 +3,10 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - sop-common com.gitee.sop - 3.2.0-SNAPSHOT - ../pom.xml + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml 4.0.0 3.2.0-SNAPSHOT diff --git a/sop-common/sop-bridge-zuul/pom.xml b/sop-common/sop-bridge-zuul/pom.xml index d819ab40..58ba3568 100644 --- a/sop-common/sop-bridge-zuul/pom.xml +++ b/sop-common/sop-bridge-zuul/pom.xml @@ -3,11 +3,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - sop-common com.gitee.sop - 3.2.0-SNAPSHOT - ../pom.xml + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml + 4.0.0 3.2.0-SNAPSHOT diff --git a/sop-common/sop-gateway-common/pom.xml b/sop-common/sop-gateway-common/pom.xml index 59826f50..d231e93b 100644 --- a/sop-common/sop-gateway-common/pom.xml +++ b/sop-common/sop-gateway-common/pom.xml @@ -1,20 +1,19 @@ - 4.0.0 + com.gitee.sop - sop-common - 3.2.0-SNAPSHOT - ../pom.xml + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml + + 4.0.0 sop-gateway-common 3.2.0-SNAPSHOT jar - sop-gateway-common - sop-gateway-common - 1.8 @@ -23,7 +22,6 @@ com.google.guava guava - 27.1-jre diff --git a/sop-common/sop-service-common/pom.xml b/sop-common/sop-service-common/pom.xml index f9008d18..20ca41a9 100644 --- a/sop-common/sop-service-common/pom.xml +++ b/sop-common/sop-service-common/pom.xml @@ -2,20 +2,19 @@ - 4.0.0 + com.gitee.sop - sop-common - 3.2.0-SNAPSHOT - ../pom.xml + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml + + 4.0.0 sop-service-common 3.2.0-SNAPSHOT jar - sop-service-common - sop-service-common - 1.8 @@ -25,7 +24,6 @@ com.google.guava guava - 27.1-jre @@ -48,19 +46,16 @@ net.oschina.durcframework easyopen - 1.16.1 true io.springfox springfox-spring-web - 2.9.2 true io.swagger swagger-annotations - 1.5.21 true diff --git a/sop-example/pom.xml b/sop-example/pom.xml index f7339103..985954fc 100644 --- a/sop-example/pom.xml +++ b/sop-example/pom.xml @@ -2,10 +2,15 @@ + + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../pom.xml + + 4.0.0 - com.gitee.sop sop-example - 1.0.0-SNAPSHOT pom diff --git a/sop-example/sop-springmvc/pom.xml b/sop-example/sop-springmvc/pom.xml index fcfff410..43efd3c4 100644 --- a/sop-example/sop-springmvc/pom.xml +++ b/sop-example/sop-springmvc/pom.xml @@ -1,12 +1,18 @@ + + + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml + + 4.0.0 - com.gitee.sop sop-springmvc sop-springmvc war - 1.0.0-SNAPSHOT 1.8 @@ -43,6 +49,11 @@ ${org.springframework-version} + + org.hibernate.validator + hibernate-validator + + com.fasterxml.jackson.core diff --git a/sop-example/sop-story/pom.xml b/sop-example/sop-story/pom.xml index 915113ab..5fdc63bd 100644 --- a/sop-example/sop-story/pom.xml +++ b/sop-example/sop-story/pom.xml @@ -1,56 +1,20 @@ - 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.2.5.RELEASE - + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml - com.gitee.sop + + 4.0.0 sop-story - 0.0.1-SNAPSHOT - sop-story - Demo project for Spring Boot 1.8 - - 2.2.5.RELEASE - - Hoxton.SR3 - - - 2.2.1.RELEASE - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - com.gitee.sop diff --git a/sop-gateway/pom.xml b/sop-gateway/pom.xml index afa163a9..cd7f9651 100644 --- a/sop-gateway/pom.xml +++ b/sop-gateway/pom.xml @@ -1,57 +1,20 @@ - 4.0.0 - org.springframework.boot - spring-boot-starter-parent - 2.2.5.RELEASE - + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../pom.xml - com.gitee.sop + + 4.0.0 sop-gateway - 1.0.0-SNAPSHOT - sop-gateway - Demo project for Spring Boot 1.8 - - 2.2.5.RELEASE - - Hoxton.SR3 - - - 2.2.1.RELEASE - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - + + 4.0.0 - com.gitee.sop sop-sdk 1.0.0-SNAPSHOT pom diff --git a/sop-sdk/sdk-java/pom.xml b/sop-sdk/sdk-java/pom.xml index d7f37743..28fe5475 100644 --- a/sop-sdk/sdk-java/pom.xml +++ b/sop-sdk/sdk-java/pom.xml @@ -1,7 +1,14 @@ + + + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../../pom.xml + + 4.0.0 - com.gitee.sop sdk-java 1.0.0-SNAPSHOT @@ -17,20 +24,17 @@ com.squareup.okhttp3 okhttp - 3.14.0 com.alibaba fastjson - 1.2.62 commons-logging commons-logging - 1.2 diff --git a/sop-test/pom.xml b/sop-test/pom.xml index c6e167f5..14da7a43 100644 --- a/sop-test/pom.xml +++ b/sop-test/pom.xml @@ -3,16 +3,15 @@ - sop-parent com.gitee.sop + sop-parent 1.0.0-SNAPSHOT + ../pom.xml - 4.0.0 + 4.0.0 sop-test - sop-test - UTF-8 1.8 @@ -22,24 +21,19 @@ com.squareup.okhttp3 okhttp - 3.14.0 - compile commons-io commons-io - 2.5 com.alibaba fastjson - 1.2.62 + commons-codec commons-codec - 1.11 - compile org.projectlombok @@ -56,40 +50,4 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12.4 - - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - UTF-8 - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - diff --git a/sop-website/pom.xml b/sop-website/pom.xml index bd1e6edb..c299458c 100644 --- a/sop-website/pom.xml +++ b/sop-website/pom.xml @@ -1,57 +1,21 @@ - 4.0.0 + - org.springframework.boot - spring-boot-starter-parent - 2.2.5.RELEASE - + com.gitee.sop + sop-parent + 1.0.0-SNAPSHOT + ../pom.xml - com.gitee.sop + + 4.0.0 sop-website - 1.0.0-SNAPSHOT - sop-website - sop-website 1.8 - - 2.2.5.RELEASE - - Hoxton.SR3 - - - 2.2.1.RELEASE - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud.version} - pom - import - - - com.alibaba.cloud - spring-cloud-alibaba-dependencies - ${spring-cloud-alibaba.version} - pom - import - - - - com.gitee.sop @@ -70,28 +34,21 @@ - commons-lang - commons-lang - 2.6 - compile + org.apache.commons + commons-lang3 com.squareup.okhttp3 okhttp - 3.14.0 - compile com.alibaba fastjson - 1.2.62 - compile org.apache.httpcomponents httpclient - 4.5.6