diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index 532137170..6888a0964 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -19,91 +19,98 @@ --> - 4.0.0 - - com.pig4cloud - pigx - 4.4.0 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + + com.pig4cloud + pigx + 4.4.0 + - pigx-auth - jar + pigx-auth + jar - pigx 认证授权中心，基于 spring security oAuth2 + pigx 认证授权中心，基于 spring security oAuth2 - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - com.pig4cloud - pigx-common-log - - - - com.pig4cloud - pigx-common-security - - - - com.pig4cloud - pigx-common-feign - - - - com.pig4cloud - pigx-common-data - - - - com.pig4cloud - pigx-common-sentinel - - - - com.pig4cloud - pigx-common-gray - - - - org.springframework.boot - spring-boot-starter-freemarker - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow - - + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.pig4cloud + pigx-common-log + + + + com.pig4cloud + pigx-common-security + + + + com.pig4cloud + pigx-common-feign + + + + com.pig4cloud + pigx-common-data + + + + com.pig4cloud + pigx-common-sentinel + + + + com.pig4cloud + pigx-common-gray + + + + org.springframework.boot + spring-boot-starter-freemarker + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-undertow + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - io.fabric8 - docker-maven-plugin - - false - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + io.fabric8 + docker-maven-plugin + + false + + + + diff --git a/pigx-common/pigx-common-bom/pom.xml b/pigx-common/pigx-common-bom/pom.xml index 0c264a002..3502e205e 100644 --- a/pigx-common/pigx-common-bom/pom.xml +++ b/pigx-common/pigx-common-bom/pom.xml @@ -36,14 +36,14 @@ 2.3.0 3.0.52.ALL 1.11.543 - 1.4.2 - 7.1 + 1.4.2 + 7.1 2.17.1 2.3.5 0.0.23 0.33.0 1.0.0 - 1.8.4 + 1.8.4 @@ -148,17 +148,17 @@ pigx-upms-api ${pigx.version} - - org.ow2.asm - asm - ${asm.version} - - - - io.seata - seata-serializer-kryo - ${seata.version} - + + org.ow2.asm + asm + ${asm.version} + + + + io.seata + seata-serializer-kryo + ${seata.version} + com.baomidou @@ -300,54 +300,53 @@ pom import - - com.alibaba.csp - sentinel-core - ${sentinel.version} - pom - import - - - com.alibaba.csp - sentinel-web-servlet - ${sentinel.version} - pom - import - - - com.alibaba.csp - sentinel-transport-simple-http - ${sentinel.version} - pom - import - - - com.alibaba.csp - sentinel-parameter-flow-control - ${sentinel.version} - pom - import - - - com.alibaba.csp - sentinel-api-gateway-adapter-common - ${sentinel.version} - pom - import - + + com.alibaba.csp + sentinel-core + ${sentinel.version} + pom + import + + + com.alibaba.csp + sentinel-web-servlet + ${sentinel.version} + pom + import + + + com.alibaba.csp + sentinel-transport-simple-http + ${sentinel.version} + pom + import + + + com.alibaba.csp + sentinel-parameter-flow-control + ${sentinel.version} + pom + import + + + com.alibaba.csp + sentinel-api-gateway-adapter-common + ${sentinel.version} + pom + import + - - - aliyun-plugin - https://maven.aliyun.com/repository/public - - true - - - false - - - + + + + rdc-releases + https://packages.aliyun.com/maven/repository/2161442-release-DcBZC1/ + + + rdc-snapshots + https://packages.aliyun.com/maven/repository/2161442-snapshot-FzKqZK/ + + diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index a8b5a685c..cff2fffb9 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -105,6 +105,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-register/pom.xml b/pigx-register/pom.xml index 92b841d37..a8576cef7 100755 --- a/pigx-register/pom.xml +++ b/pigx-register/pom.xml @@ -12,86 +12,93 @@ limitations under the License. --> - 4.0.0 - - com.pig4cloud - pigx - 4.4.0 - + 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"> + 4.0.0 + + com.pig4cloud + pigx + 4.4.0 + - pigx-register - jar - pigx-register - nacos 注册配置中心 + pigx-register + jar + pigx-register + nacos 注册配置中心 - - 2.0.3 - + + 2.0.3 + - - - io.springboot.nacos - nacos-config - ${nacos.version} - - - org.apache.tomcat.embed - tomcat-embed-jasper - + + + io.springboot.nacos + nacos-config + ${nacos.version} + + + org.apache.tomcat.embed + tomcat-embed-jasper + - - io.springboot.nacos - nacos-naming - ${nacos.version} - + + io.springboot.nacos + nacos-naming + ${nacos.version} + - - io.springboot.nacos - nacos-istio - ${nacos.version} - - - org.springframework.boot - spring-boot-starter-security - + + io.springboot.nacos + nacos-istio + ${nacos.version} + + + org.springframework.boot + spring-boot-starter-security + - - cn.hutool - hutool-system - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - io.fabric8 - docker-maven-plugin - - - - - src/main/resources - true - - **/*.woff - **/*.woff2 - **/*.ttf - - - - src/main/resources - false - - **/*.woff - **/*.woff2 - **/*.ttf - - - - + + cn.hutool + hutool-system + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + io.fabric8 + docker-maven-plugin + + + + + src/main/resources + true + + **/*.woff + **/*.woff2 + **/*.ttf + + + + src/main/resources + false + + **/*.woff + **/*.woff2 + **/*.ttf + + + + diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index ed88466f2..fd48a6543 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -162,6 +162,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index d57f72844..12f848d83 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -1,166 +1,180 @@ - 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 - - com.pig4cloud - pigx-visual - 4.4.0 - + + com.pig4cloud + pigx-visual + 4.4.0 + - pigx-codegen - jar + pigx-codegen + jar - 代码生成模块 + 代码生成模块 - - 0.0.2 - 11.5.0.0 - 1.10 - + + 2.0.1 + 0.0.2 + 11.5.0.0 + 1.10 + - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - com.pig4cloud - pigx-common-data - - - - com.pig4cloud - pigx-common-datasource - - - - com.baomidou - mybatis-plus-boot-starter - - - mysql - mysql-connector-java - - - - org.postgresql - postgresql - - - - com.oracle.database.jdbc - ojdbc8 - - - - com.microsoft.sqlserver - mssql-jdbc - - - - com.ibm.db2 - jcc - ${db2.version} - - - - com.dameng - DmJdbcDriver18 - - - - com.alibaba - druid-spring-boot-starter - - - - com.pig4cloud - pigx-common-core - - - commons-configuration - commons-configuration - ${configuration.version} - - - - com.pig4cloud - pigx-common-swagger - - - - com.pig4cloud - pigx-common-xss - - - com.pig4cloud - pigx-common-security - - - - com.pig4cloud - pigx-common-sentinel - - - com.pig4cloud - pigx-common-log - - - - com.pig4cloud - pigx-common-gray - - - - org.apache.velocity - velocity-engine-core - ${velocity.version} - - - org.apache.velocity.tools - velocity-tools-generic - ${velocity.tool.version} - - - - io.springboot.plugin - screw-spring-boot-starter - ${screw.version} - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-undertow - - + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + com.pig4cloud + pigx-common-data + + + + com.pig4cloud + pigx-common-datasource + + + + com.baomidou + mybatis-plus-boot-starter + + + mysql + mysql-connector-java + + + + org.postgresql + postgresql + + + + com.oracle.database.jdbc + ojdbc8 + + + + com.microsoft.sqlserver + mssql-jdbc + + + + com.ibm.db2 + jcc + ${db2.version} + + + + com.dameng + DmJdbcDriver18 + + + + com.alibaba + druid-spring-boot-starter + + + + com.pig4cloud + pigx-common-core + + + commons-configuration + commons-configuration + ${configuration.version} + + + + com.pig4cloud + pigx-common-swagger + + + + com.pig4cloud + pigx-common-xss + + + com.pig4cloud + pigx-common-security + + + + com.pig4cloud + pigx-common-sentinel + + + com.pig4cloud + pigx-common-log + + + + com.pig4cloud + pigx-common-gray + + + + org.apache.velocity + velocity-engine-core + ${velocity.version} + + + org.apache.velocity.tools + velocity-tools-generic + ${velocity.tool.version} + + + + io.springboot.plugin + screw-spring-boot-starter + ${screw.version} + + + + org.springframework.boot + spring-boot-starter-web + + + + org.ssssssss + magic-api-spring-boot-starter + ${magic.version} + + + + org.springframework.boot + spring-boot-starter-undertow + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - io.fabric8 - docker-maven-plugin - - false - - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + io.fabric8 + docker-maven-plugin + + false + + + + diff --git a/pigx-visual/pigx-daemon-elastic-job/pom.xml b/pigx-visual/pigx-daemon-elastic-job/pom.xml index ffbfcea8c..2eaf507db 100644 --- a/pigx-visual/pigx-daemon-elastic-job/pom.xml +++ b/pigx-visual/pigx-daemon-elastic-job/pom.xml @@ -103,6 +103,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-daemon-quartz/pom.xml b/pigx-visual/pigx-daemon-quartz/pom.xml index cde93a809..f53107ef3 100644 --- a/pigx-visual/pigx-daemon-quartz/pom.xml +++ b/pigx-visual/pigx-daemon-quartz/pom.xml @@ -107,6 +107,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-jimu-platform/pom.xml b/pigx-visual/pigx-jimu-platform/pom.xml index eaa8b7163..0b179bea5 100755 --- a/pigx-visual/pigx-jimu-platform/pom.xml +++ b/pigx-visual/pigx-jimu-platform/pom.xml @@ -82,6 +82,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index aee6c035f..e885e0196 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -94,6 +94,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-mp-platform/pom.xml b/pigx-visual/pigx-mp-platform/pom.xml index bb5abd58f..5b59862fe 100755 --- a/pigx-visual/pigx-mp-platform/pom.xml +++ b/pigx-visual/pigx-mp-platform/pom.xml @@ -120,6 +120,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-oa-platform/pom.xml b/pigx-visual/pigx-oa-platform/pom.xml index be3ac07d0..6231af046 100644 --- a/pigx-visual/pigx-oa-platform/pom.xml +++ b/pigx-visual/pigx-oa-platform/pom.xml @@ -178,6 +178,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-pay-platform/pom.xml b/pigx-visual/pigx-pay-platform/pom.xml index a482be3b8..02b112cd8 100755 --- a/pigx-visual/pigx-pay-platform/pom.xml +++ b/pigx-visual/pigx-pay-platform/pom.xml @@ -147,6 +147,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-report-platform/pom.xml b/pigx-visual/pigx-report-platform/pom.xml index 64b5eefe8..a8eac45f1 100644 --- a/pigx-visual/pigx-report-platform/pom.xml +++ b/pigx-visual/pigx-report-platform/pom.xml @@ -129,6 +129,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-seata-server/pom.xml b/pigx-visual/pigx-seata-server/pom.xml index 3de46eb4a..8650765fa 100644 --- a/pigx-visual/pigx-seata-server/pom.xml +++ b/pigx-visual/pigx-seata-server/pom.xml @@ -134,4 +134,16 @@ ${kafka-appender.version} + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + diff --git a/pigx-visual/pigx-sentinel-dashboard/pom.xml b/pigx-visual/pigx-sentinel-dashboard/pom.xml index 59521406c..b78e3b752 100755 --- a/pigx-visual/pigx-sentinel-dashboard/pom.xml +++ b/pigx-visual/pigx-sentinel-dashboard/pom.xml @@ -95,6 +95,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pigx-visual/pigx-sso-client-demo/pom.xml b/pigx-visual/pigx-sso-client-demo/pom.xml index 9421db233..e7fc262ce 100644 --- a/pigx-visual/pigx-sso-client-demo/pom.xml +++ b/pigx-visual/pigx-sso-client-demo/pom.xml @@ -56,6 +56,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + diff --git a/pigx-visual/pigx-xxl-job-admin/pom.xml b/pigx-visual/pigx-xxl-job-admin/pom.xml index f32194609..f874af969 100644 --- a/pigx-visual/pigx-xxl-job-admin/pom.xml +++ b/pigx-visual/pigx-xxl-job-admin/pom.xml @@ -85,6 +85,13 @@ org.springframework.boot spring-boot-maven-plugin + + org.apache.maven.plugins + maven-deploy-plugin + + true + + io.fabric8 docker-maven-plugin diff --git a/pom.xml b/pom.xml index e09179137..14702160a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,264 +19,276 @@ ~ --> - 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 - com.pig4cloud - pigx - 4.4.0 - ${project.artifactId} - pom - - pig4cloud - https://www.pig4cloud.com - + com.pig4cloud + pigx + 4.4.0 + ${project.artifactId} + pom + + pig4cloud + https://www.pig4cloud.com + - - 2.6.8 - 2021.0.3 - 2021.0.1.0 - UTF-8 - 1.8 - 1.8 - 3.8.1 - 0.0.34 - 2.2.5 - 2.6.7 - 1.2.7 - 3.6.4 - 2.0.0 - 3.0.0 - 2.0.9 - 2.3 - 3.1 - 3.0.4 - 2.12.6 - 2.2.9 - 1.5.0-beta - 1.11.543 - 2.3.0 - 5.22.0 - 172.17.0.111 - http://172.17.0.111:2375 - library - admin - Harbor12345 - 0.33.0 - - false - + + 2.6.8 + 2021.0.3 + 2021.0.1.0 + UTF-8 + 1.8 + 1.8 + 3.8.1 + 0.0.34 + 2.2.5 + 2.6.7 + 1.2.7 + 3.6.4 + 2.0.0 + 3.0.0 + 2.0.9 + 2.3 + 3.1 + 3.0.4 + 2.12.6 + 2.2.9 + 1.5.0-beta + 1.11.543 + 2.3.0 + 5.22.0 + 172.17.0.111 + http://172.17.0.111:2375 + library + admin + Harbor12345 + 0.33.0 + + false + - - - - org.springframework.boot - spring-boot-configuration-processor - true - - - - com.github.ulisesbocchio - jasypt-spring-boot-starter - ${jasypt.version} - - - - org.springframework.boot - spring-boot-starter-actuator - - - - de.codecentric - spring-boot-admin-starter-client - ${spring-boot-admin.version} - - - - org.projectlombok - lombok - provided - - - - org.springframework.boot - spring-boot-starter-test - test - - + + + + org.springframework.boot + spring-boot-configuration-processor + true + + + + com.github.ulisesbocchio + jasypt-spring-boot-starter + ${jasypt.version} + + + + org.springframework.boot + spring-boot-starter-actuator + + + + de.codecentric + spring-boot-admin-starter-client + ${spring-boot-admin.version} + + + + org.projectlombok + lombok + provided + + + + org.springframework.boot + spring-boot-starter-test + test + + - - pigx-register - pigx-gateway - pigx-auth - pigx-upms - pigx-common - pigx-visual - + + pigx-register + pigx-gateway + pigx-auth + pigx-upms + pigx-common + pigx-visual + - - - - - com.pig4cloud - pigx-common-bom - ${project.version} - pom - import - - - - 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 - - - - org.springframework.boot - spring-boot-starter-web - ${spring-boot.version} - - - - spring-boot-starter-tomcat - org.springframework.boot - - - - - + + + + + com.pig4cloud + pigx-common-bom + ${project.version} + pom + import + + + + 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 + + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + + spring-boot-starter-tomcat + org.springframework.boot + + + + + - - ${project.name} - - - src/main/resources - true - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - - io.fabric8 - docker-maven-plugin - ${docker.plugin.version} - - ${docker.host} - ${docker.registry} - - - ${docker.username} - ${docker.password} - - - - - ${docker.registry}/${docker.namespace}/${project.name}:${project.version} - - ${project.basedir}/Dockerfile - - - - - - - - - - - io.spring.javaformat - spring-javaformat-maven-plugin - ${spring.checkstyle.version} - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.version} - - ${maven.compiler.target} - ${maven.compiler.source} - UTF-8 - true - - - - - pl.project13.maven - git-commit-id-plugin - ${git.commit.version} - - - + + ${project.name} + + + src/main/resources + true + + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} + + + + repackage + + + + + + + io.fabric8 + docker-maven-plugin + ${docker.plugin.version} + + ${docker.host} + ${docker.registry} + + + ${docker.username} + ${docker.password} + + + + + ${docker.registry}/${docker.namespace}/${project.name}:${project.version} + + ${project.basedir}/Dockerfile + + + + + + + + + + + io.spring.javaformat + spring-javaformat-maven-plugin + ${spring.checkstyle.version} + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${maven.compiler.target} + ${maven.compiler.source} + UTF-8 + true + + + + + pl.project13.maven + git-commit-id-plugin + ${git.commit.version} + + + - - - public - aliyun nexus - https://maven.aliyun.com/repository/public/ - - true - - - + + + + rdc-releases + https://packages.aliyun.com/maven/repository/2161442-release-DcBZC1/ + + + rdc-snapshots + https://packages.aliyun.com/maven/repository/2161442-snapshot-FzKqZK/ + + - - - aliyun-plugin - https://maven.aliyun.com/repository/public - - true - - - false - - - + + + public + aliyun nexus + https://maven.aliyun.com/repository/public/ + + true + + + - - - dev - - - dev - - - - true - - - + + + aliyun-plugin + https://maven.aliyun.com/repository/public + + true + + + false + + + + + + + dev + + + dev + + + + true + + +