diff --git a/shoulder-auth-center/pom.xml b/shoulder-auth-center/pom.xml index 7785a44..aaac0d3 100644 --- a/shoulder-auth-center/pom.xml +++ b/shoulder-auth-center/pom.xml @@ -12,7 +12,6 @@ ../shoulder-platform-common/shoulder-platform-parent/pom.xml - cn.itlym.platform shoulder-auth-center pom diff --git a/shoulder-backstage/pom.xml b/shoulder-backstage/pom.xml index 2134b56..4ee7bcb 100644 --- a/shoulder-backstage/pom.xml +++ b/shoulder-backstage/pom.xml @@ -16,8 +16,8 @@ org.apache.maven.plugins maven-compiler-plugin - 11 - 11 + ${java.version} + ${java.version} diff --git a/shoulder-gateway/pom.xml b/shoulder-gateway/pom.xml index ccb595d..88911fb 100644 --- a/shoulder-gateway/pom.xml +++ b/shoulder-gateway/pom.xml @@ -12,7 +12,6 @@ shoulder-gateway - 1.0-SNAPSHOT shoulder-api-gateway @@ -21,10 +20,10 @@ - 0.7-SNAPSHOT - 2.3.6.RELEASE - Hoxton.SR9 - 2.2.3.RELEASE + 0.8-SNAPSHOT + 3.0.2 + 2022.0.0 + 2022.0.0.0 diff --git a/shoulder-gateway/shoulder-api-gateway/pom.xml b/shoulder-gateway/shoulder-api-gateway/pom.xml index fd77253..272b73b 100644 --- a/shoulder-gateway/shoulder-api-gateway/pom.xml +++ b/shoulder-gateway/shoulder-api-gateway/pom.xml @@ -15,10 +15,10 @@ ${project.artifactId} - 0.7-SNAPSHOT - 2.3.6.RELEASE - Hoxton.SR9 - 2.2.3.RELEASE + 0.8-SNAPSHOT + 3.0.2 + 2022.0.0 + 2022.0.0.0 diff --git a/shoulder-generator/pom.xml b/shoulder-generator/pom.xml index 62ab6a7..74100db 100644 --- a/shoulder-generator/pom.xml +++ b/shoulder-generator/pom.xml @@ -3,9 +3,9 @@ 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"> - cn.itlym - shoulder-parent - 0.7-SNAPSHOT + cn.itlym.platform + shoulder-platform + 1.0-SNAPSHOT 4.0.0 @@ -13,6 +13,17 @@ 代码生成器 代码生成器 + + + + cn.itlym + shoulder-parent + 0.8-SNAPSHOT + pom + import + + + @@ -46,8 +57,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j @@ -71,5 +82,6 @@ **/*.* - + + \ No newline at end of file diff --git a/shoulder-notify-center/shoulder-sms/sms-center/pom.xml b/shoulder-notify-center/shoulder-sms/sms-center/pom.xml index a6086b2..894f0fd 100644 --- a/shoulder-notify-center/shoulder-sms/sms-center/pom.xml +++ b/shoulder-notify-center/shoulder-sms/sms-center/pom.xml @@ -15,7 +15,7 @@ Shoulder平台-短信推送服务 - 1.6.2 + 2.0.3 @@ -50,9 +50,9 @@ - com.sun.mail - javax.mail - ${javax.mail.version} + org.eclipse.angus + jakarta.mail + ${jakarta.mail.version} diff --git a/shoulder-platform-common/pom.xml b/shoulder-platform-common/pom.xml index f564f7b..b9e813c 100644 --- a/shoulder-platform-common/pom.xml +++ b/shoulder-platform-common/pom.xml @@ -3,8 +3,8 @@ 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"> - shoulder-platform cn.itlym.platform + shoulder-platform 1.0-SNAPSHOT 4.0.0 @@ -30,7 +30,7 @@ - 0.7-SNAPSHOT + 0.8-SNAPSHOT 1.0-SNAPSHOT @@ -39,7 +39,7 @@ cn.itlym shoulder-dependencies - ${shoulder.version} + 0.8-SNAPSHOT pom import diff --git a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml b/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml index 65db85f..ca08c15 100644 --- a/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml +++ b/shoulder-platform-common/shoulder-platform-archetype/src/main/resources/archetype-resources/__rootArtifactId__-api/pom.xml @@ -17,12 +17,12 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/shoulder-platform-common/shoulder-platform-parent/pom.xml b/shoulder-platform-common/shoulder-platform-parent/pom.xml index 3f810e4..e5666b2 100644 --- a/shoulder-platform-common/shoulder-platform-parent/pom.xml +++ b/shoulder-platform-common/shoulder-platform-parent/pom.xml @@ -3,22 +3,28 @@ 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"> - cn.itlym - shoulder-parent - 0.7-SNAPSHOT + cn.itlym.platform + shoulder-platform-common + 1.0-SNAPSHOT + ../pom.xml 4.0.0 - cn.itlym.platform shoulder-platform-parent - 1.0-SNAPSHOT pom https://github.com/ChinaLym/shoulder-platform + 17 + ${java.version} + ${java.version} + UTF-8 + ${project.build.sourceEncoding} + yyyy-MM-dd HH:mm:ss + - 0.7-SNAPSHOT + 0.8-SNAPSHOT 1.0-SNAPSHOT 1.0-SNAPSHOT @@ -28,7 +34,7 @@ - 2.2.3.RELEASE + 2022.0.0.0 1.3.2 @@ -46,7 +52,27 @@ 3.2.0 1.4.19 shoulder - 2.3.6.RELEASE + 3.0.2 + + 3.11.0 + 3.3.0 + 3.6.0 + 3.3.0 + 3.1.0 + + 3.1.2 + 3.0.5 + 2.7 + 2.7 + 2.2.0 + 6.0.0 + 3.10.0.2594 + + 1.1 + 0x0000 + + 0.3 + ${project.artifactId} @@ -76,6 +102,13 @@ pom import + + cn.itlym + shoulder-parent + ${shoulder.version} + pom + import + diff --git a/shoulder-platform-common/shoulder-platform-starter-db/pom.xml b/shoulder-platform-common/shoulder-platform-starter-db/pom.xml index 7a6d9de..d1f8628 100644 --- a/shoulder-platform-common/shoulder-platform-starter-db/pom.xml +++ b/shoulder-platform-common/shoulder-platform-starter-db/pom.xml @@ -27,7 +27,7 @@ com.baomidou - mybatis-plus-boot-starter + mybatis-plus-spring-boot3-starter @@ -37,8 +37,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j diff --git a/shoulder-platform-common/shoulder-platform-starter-trace/pom.xml b/shoulder-platform-common/shoulder-platform-starter-trace/pom.xml index f0a4390..73a90f2 100644 --- a/shoulder-platform-common/shoulder-platform-starter-trace/pom.xml +++ b/shoulder-platform-common/shoulder-platform-starter-trace/pom.xml @@ -18,7 +18,9 @@ org.springframework.cloud - spring-cloud-starter-zipkin + spring-cloud-sleuth-zipkin + 3.1.9 + diff --git a/shoulder-platform-common/shoulder-sms-aliyun-spring-boot-starter/pom.xml b/shoulder-platform-common/shoulder-sms-aliyun-spring-boot-starter/pom.xml index a459b68..462786d 100644 --- a/shoulder-platform-common/shoulder-sms-aliyun-spring-boot-starter/pom.xml +++ b/shoulder-platform-common/shoulder-sms-aliyun-spring-boot-starter/pom.xml @@ -3,9 +3,10 @@ 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"> - cn.itlym - shoulder-parent - 0.7-SNAPSHOT + cn.itlym.platform + shoulder-platform-parent + 1.0-SNAPSHOT + ../shoulder-platform-parent/pom.xml 4.0.0 diff --git a/shoulder-system-center/system-api/pom.xml b/shoulder-system-center/system-api/pom.xml index 346b0ae..9b937ad 100644 --- a/shoulder-system-center/system-api/pom.xml +++ b/shoulder-system-center/system-api/pom.xml @@ -18,12 +18,12 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/shoulder-system-center/system-common/pom.xml b/shoulder-system-center/system-common/pom.xml index 79b77e9..0934d19 100644 --- a/shoulder-system-center/system-common/pom.xml +++ b/shoulder-system-center/system-common/pom.xml @@ -29,8 +29,6 @@ com.baomidou mybatis-plus-annotation - 3.4.0 - compile com.github.pagehelper diff --git a/shoulder-universal/pom.xml b/shoulder-universal/pom.xml index 0b6f97c..06abc6b 100644 --- a/shoulder-universal/pom.xml +++ b/shoulder-universal/pom.xml @@ -5,6 +5,7 @@ cn.itlym.platform shoulder-platform 1.0-SNAPSHOT + ../pom.xml 4.0.0 diff --git a/shoulder-user-center/pom.xml b/shoulder-user-center/pom.xml index 2f7ab44..947427c 100644 --- a/shoulder-user-center/pom.xml +++ b/shoulder-user-center/pom.xml @@ -4,6 +4,7 @@ cn.itlym.platform shoulder-platform-parent 1.0-SNAPSHOT + ../shoulder-platform-common/shoulder-platform-parent/pom.xml 4.0.0 @@ -12,7 +13,6 @@ shoulder-user-center 用户认证授权中心 - cn.itlym.platform pom 1.0-SNAPSHOT diff --git a/shoulder-user-center/uaa-api/pom.xml b/shoulder-user-center/uaa-api/pom.xml index 225a8cb..2ccae9e 100644 --- a/shoulder-user-center/uaa-api/pom.xml +++ b/shoulder-user-center/uaa-api/pom.xml @@ -16,12 +16,12 @@ provided - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api - javax.validation - validation-api + jakarta.validation + jakarta.validation-api diff --git a/shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml b/shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml index 1ca646c..b4ddcbc 100644 --- a/shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml +++ b/shoulder-user-center/uaa-infrastructure/uaa-storage/pom.xml @@ -22,8 +22,7 @@ com.baomidou mybatis-plus-annotation - 3.4.0 - provided + ${mybatis-plus.version}