diff --git a/README.md b/README.md index 90901a784d9faca5e1a5afd590134b1b01a7ff54..08583b7f76e16f789122bc49c60fc8a11a95a09c 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ pig-ui -- https://gitee.com/log4j/pig-ui pig ├── pig-auth -- 授权服务提供[3000] └── pig-common -- 系统公共模块 + ├── pig-common-bom -- 全局依赖管理控制 ├── pig-common-core -- 公共工具类核心包 ├── pig-common-datasource -- 动态数据源包 ├── pig-common-job -- xxl-job 封装 diff --git a/pig-auth/pom.xml b/pig-auth/pom.xml index 4ed62ebd7b775bd0d410718b8b29abb63e175c26..60d590dde21c8ba0c872f99cb4691c5fddeddb45 100755 --- a/pig-auth/pom.xml +++ b/pig-auth/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.2 + 3.3.3 pig-auth @@ -44,19 +44,19 @@ com.pig4cloud pig-common-feign - 3.3.2 + 3.3.3 com.pig4cloud pig-upms-api - 3.3.2 + 3.3.3 com.pig4cloud pig-common-security - 3.3.2 + 3.3.3 diff --git a/pig-common/pig-common-bom/pom.xml b/pig-common/pig-common-bom/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..3746e2c66272d1bceb8ec3391714cefc5613ff1b --- /dev/null +++ b/pig-common/pig-common-bom/pom.xml @@ -0,0 +1,144 @@ + + + + 4.0.0 + + com.pig4cloud + pig-common-bom + 3.3.3 + pom + + pig-common-bom + pig cloud parent + pig cloud parent + + + ${project.version} + 2.5.4 + UTF-8 + 2.3.6.RELEASE + 1.8 + 1.8 + 1.2.75 + 1.5.24 + 3.4.3.2 + 5.18.3 + 2.0.3 + 1.0.0 + + + + + + + com.pig4cloud + pig-common-core + ${pig.common.version} + + + com.pig4cloud + pig-common-datasource + ${pig.common.version} + + + com.pig4cloud + pig-common-job + ${pig.common.version} + + + com.pig4cloud + pig-common-log + ${pig.common.version} + + + com.pig4cloud + pig-common-mybatis + ${pig.common.version} + + + com.pig4cloud + pig-common-security + ${pig.common.version} + + + com.pig4cloud + pig-common-feign + ${pig.common.version} + + + com.pig4cloud + pig-common-swagger + ${pig.common.version} + + + com.pig4cloud + pig-common-test + ${pig.common.version} + + + com.pig4cloud + pig-upms-api + ${pig.common.version} + + + + org.springframework.security.oauth + spring-security-oauth2 + ${security.oauth.version} + + + + io.swagger + swagger-models + ${swagger.core.version} + + + io.swagger + swagger-annotations + ${swagger.core.version} + + + + com.alibaba + fastjson + ${fastjson.version} + + + + org.rocksdb + rocksdbjni + ${rocksdbjni.version} + + + com.alibaba.nacos + nacos-client + ${nacos.version} + + + + com.pig4cloud.excel + excel-spring-boot-starter + ${excel.version} + + + com.baomidou + mybatis-plus-boot-starter + ${mybatis-plus.version} + + + + org.springframework.boot + spring-boot-starter-web + ${spring-boot.version} + + + + spring-boot-starter-tomcat + org.springframework.boot + + + + + + diff --git a/pig-common/pig-common-core/pom.xml b/pig-common/pig-common-core/pom.xml index 25dcfa86e2f9ccf359bdd1c64c98e00f823e6b40..0d8210130df687219c6cbd378ca5f593f8bbf4b9 100755 --- a/pig-common/pig-common-core/pom.xml +++ b/pig-common/pig-common-core/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 pig-common-core diff --git a/pig-common/pig-common-datasource/pom.xml b/pig-common/pig-common-datasource/pom.xml index 04990bcac756c0506f28142d33f1941f2e7315c9..7e533d7cdce2012b7534cf825ae545eb8d12b229 100644 --- a/pig-common/pig-common-datasource/pom.xml +++ b/pig-common/pig-common-datasource/pom.xml @@ -21,7 +21,7 @@ pig-common com.pig4cloud - 3.3.2 + 3.3.3 4.0.0 diff --git a/pig-common/pig-common-feign/pom.xml b/pig-common/pig-common-feign/pom.xml index 15e3d908bac47cddf1128aea3a2d3a5d49817394..821e1c0636f81ee99dbe6775225d1930085b5cf9 100755 --- a/pig-common/pig-common-feign/pom.xml +++ b/pig-common/pig-common-feign/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 4.0.0 @@ -33,7 +33,7 @@ com.pig4cloud pig-common-core - 3.3.2 + 3.3.3 com.alibaba.cloud diff --git a/pig-common/pig-common-job/pom.xml b/pig-common/pig-common-job/pom.xml index 54a862d67137b684c17f82fb39d70967f0082917..fa7db5dc0843ce680389abff6830c477f6680879 100755 --- a/pig-common/pig-common-job/pom.xml +++ b/pig-common/pig-common-job/pom.xml @@ -23,7 +23,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 pig-common-job diff --git a/pig-common/pig-common-log/pom.xml b/pig-common/pig-common-log/pom.xml index 1b70d66efe7326a81f57e7097ed4493427b757d8..c31d3b751c4913ed9d84a78a6c53424df085f488 100755 --- a/pig-common/pig-common-log/pom.xml +++ b/pig-common/pig-common-log/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 pig-common-log @@ -35,13 +35,13 @@ com.pig4cloud pig-common-core - 3.3.2 + 3.3.3 com.pig4cloud pig-upms-api - 3.3.2 + 3.3.3 diff --git a/pig-common/pig-common-mybatis/pom.xml b/pig-common/pig-common-mybatis/pom.xml index a83c624494b387294445ba5e0a8c46953c085b59..dc75ddd5b90d1742fc7321117fcab9182fec0eb6 100755 --- a/pig-common/pig-common-mybatis/pom.xml +++ b/pig-common/pig-common-mybatis/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 pig-common-mybatis @@ -41,7 +41,6 @@ com.baomidou mybatis-plus-boot-starter - ${mybatis-plus.version} diff --git a/pig-common/pig-common-security/pom.xml b/pig-common/pig-common-security/pom.xml index 8c0df87ac50d8dd693b006ec0afd929b5021ac31..96bd06ef944da365b409eff56b97a3741ed7d247 100755 --- a/pig-common/pig-common-security/pom.xml +++ b/pig-common/pig-common-security/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 pig-common-security @@ -35,7 +35,7 @@ com.pig4cloud pig-common-core - 3.3.2 + 3.3.3 @@ -46,7 +46,7 @@ com.pig4cloud pig-upms-api - 3.3.2 + 3.3.3 diff --git a/pig-common/pig-common-swagger/pom.xml b/pig-common/pig-common-swagger/pom.xml index 25be645b196440ba4ae4e8d3896cade6a1d03826..fd92fd983d8c562903f5d156c2c1093131771468 100644 --- a/pig-common/pig-common-swagger/pom.xml +++ b/pig-common/pig-common-swagger/pom.xml @@ -24,7 +24,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 pig-common-swagger diff --git a/pig-common/pig-common-test/pom.xml b/pig-common/pig-common-test/pom.xml index bb1baee6674f981070c89ba71d4b7c0dd47afba9..27c64bbaf963c106b91fbbade5822f23eb95d031 100755 --- a/pig-common/pig-common-test/pom.xml +++ b/pig-common/pig-common-test/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-common - 3.3.2 + 3.3.3 pig-common-test @@ -18,7 +18,7 @@ com.pig4cloud pig-common-security - 3.3.2 + 3.3.3 org.springframework.security diff --git a/pig-common/pom.xml b/pig-common/pom.xml index 360ebb3b55fceea1fedbd1f07fef4a00191fa42f..c16a61e21a4e91dd9f167ccac39a6b9cb1244504 100755 --- a/pig-common/pom.xml +++ b/pig-common/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.2 + 3.3.3 pig-common @@ -30,6 +30,7 @@ pig 公共聚合模块 + pig-common-bom pig-common-core pig-common-datasource pig-common-job diff --git a/pig-gateway/pom.xml b/pig-gateway/pom.xml index fd4c7086c64fac513a7bdee2b8ae6980b7751c03..18e9d35bb72ad3a43ad7d3e109becd74686c32b6 100755 --- a/pig-gateway/pom.xml +++ b/pig-gateway/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.2 + 3.3.3 pig-gateway diff --git a/pig-register/pom.xml b/pig-register/pom.xml index 951cc61e35577395d8bce147a56269a0dbf3e1e3..06266cef3ebccd67bd045185fb0c292fc6cd22ad 100755 --- a/pig-register/pom.xml +++ b/pig-register/pom.xml @@ -18,7 +18,7 @@ com.pig4cloud pig - 3.3.2 + 3.3.3 pig-register diff --git a/pig-upms/pig-upms-api/pom.xml b/pig-upms/pig-upms-api/pom.xml index f84320746185870326b5e89a50a9ba19ad92b113..ca24096b30e36a58ebfd425c577d9a96be42c6ac 100755 --- a/pig-upms/pig-upms-api/pom.xml +++ b/pig-upms/pig-upms-api/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.3.2 + 3.3.3 pig-upms-api diff --git a/pig-upms/pig-upms-biz/pom.xml b/pig-upms/pig-upms-biz/pom.xml index 06993962a9e53f5a6cbd00fad3425ca9e4ea9876..74f22d87540ab39fc5d36dc12873fefcb272d0a6 100644 --- a/pig-upms/pig-upms-biz/pom.xml +++ b/pig-upms/pig-upms-biz/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-upms - 3.3.2 + 3.3.3 pig-upms-biz diff --git a/pig-upms/pom.xml b/pig-upms/pom.xml index 7c955d0fdbeea5e642360c3fd8065b7a83da573b..bf60a9fd54d490ecce4bfe7823380bfc69d222c6 100755 --- a/pig-upms/pom.xml +++ b/pig-upms/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.2 + 3.3.3 pig-upms diff --git a/pig-visual/pig-codegen/pom.xml b/pig-visual/pig-codegen/pom.xml index 7b1d51c3521e9ed128023c072bffad1e477ff03f..2cffd5b5b1b12bb7b72fefb7bd8135ddbe0105e0 100755 --- a/pig-visual/pig-codegen/pom.xml +++ b/pig-visual/pig-codegen/pom.xml @@ -22,7 +22,7 @@ com.pig4cloud pig-visual - 3.3.2 + 3.3.3 pig-codegen diff --git a/pig-visual/pig-monitor/pom.xml b/pig-visual/pig-monitor/pom.xml index c5a508a025d0414c4071ee1c40285e92160c56b2..90638c4a9fc9195c363e113a52eb04c421c6454c 100755 --- a/pig-visual/pig-monitor/pom.xml +++ b/pig-visual/pig-monitor/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig-visual - 3.3.2 + 3.3.3 pig-monitor diff --git a/pig-visual/pig-sentinel-dashboard/pom.xml b/pig-visual/pig-sentinel-dashboard/pom.xml index fa487205ded9ec0206b9f9fa9c7da1f87709ec2e..18b4f7bf1ad71108cc3ee8407b1a1fccaa29c80d 100755 --- a/pig-visual/pig-sentinel-dashboard/pom.xml +++ b/pig-visual/pig-sentinel-dashboard/pom.xml @@ -6,7 +6,7 @@ com.pig4cloud pig-visual - 3.3.2 + 3.3.3 pig-sentinel-dashboard diff --git a/pig-visual/pig-xxl-job-admin/pom.xml b/pig-visual/pig-xxl-job-admin/pom.xml index 34bd5385d57752133a53b37d9fa25e7227aa2777..b894d181529964c2a3238cba135ff3597a356c91 100644 --- a/pig-visual/pig-xxl-job-admin/pom.xml +++ b/pig-visual/pig-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ com.pig4cloud pig-visual - 3.3.2 + 3.3.3 pig-xxl-job-admin diff --git a/pig-visual/pom.xml b/pig-visual/pom.xml index 742fbdc5273e482c0247b240f6a1a76b9b077e89..cf09152fade3e8a85504062dfba0f68e6aeaabbb 100755 --- a/pig-visual/pom.xml +++ b/pig-visual/pom.xml @@ -21,7 +21,7 @@ com.pig4cloud pig - 3.3.2 + 3.3.3 pig-visual diff --git a/pom.xml b/pom.xml index d247e26686ff7eababbc255bf898446f946d0788..59dbe438317d9356af2730cf2909cf0abc033547 100755 --- a/pom.xml +++ b/pom.xml @@ -19,17 +19,10 @@ 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 - pig-cloud-dependencies-parent - 3.3.2 - - com.pig4cloud pig ${project.artifactId} - 3.3.2 + 3.3.3 pom https://www.pig4cloud.com @@ -42,7 +35,6 @@ 1.8 2.5.1 5.7.9 - 3.4.3.2 3.4.1 2.2.0 1.7 @@ -57,8 +49,11 @@ pig4cloud username password + 2.2.5 + 0.0.28 + @@ -113,6 +108,14 @@ + + + com.pig4cloud + pig-common-bom + ${project.version} + pom + import + org.springframework.boot @@ -197,6 +200,20 @@ + + + + pl.project13.maven + git-commit-id-plugin + ${git.commit.plugin} + + + + io.spring.javaformat + spring-javaformat-maven-plugin + ${spring.checkstyle.plugin} + +