From bb8f51e3e7816b485c7567258bf2f759edfa4181 Mon Sep 17 00:00:00 2001 From: wjie Date: Thu, 26 Aug 2021 14:14:22 +0800 Subject: [PATCH] =?UTF-8?q?:bookmark:=20:bookmark:=20:bookmark:=20v3.3.3?= =?UTF-8?q?=20=20=E5=A4=9A=E6=A8=A1=E5=9D=97=20bom=20=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + pig-auth/pom.xml | 8 +- pig-common/pig-common-bom/pom.xml | 144 ++++++++++++++++++++++ pig-common/pig-common-core/pom.xml | 2 +- pig-common/pig-common-datasource/pom.xml | 2 +- pig-common/pig-common-feign/pom.xml | 4 +- pig-common/pig-common-job/pom.xml | 2 +- pig-common/pig-common-log/pom.xml | 6 +- pig-common/pig-common-mybatis/pom.xml | 3 +- pig-common/pig-common-security/pom.xml | 6 +- pig-common/pig-common-swagger/pom.xml | 2 +- pig-common/pig-common-test/pom.xml | 4 +- pig-common/pom.xml | 3 +- pig-gateway/pom.xml | 2 +- pig-register/pom.xml | 2 +- pig-upms/pig-upms-api/pom.xml | 2 +- pig-upms/pig-upms-biz/pom.xml | 2 +- pig-upms/pom.xml | 2 +- pig-visual/pig-codegen/pom.xml | 2 +- pig-visual/pig-monitor/pom.xml | 2 +- pig-visual/pig-sentinel-dashboard/pom.xml | 2 +- pig-visual/pig-xxl-job-admin/pom.xml | 2 +- pig-visual/pom.xml | 2 +- pom.xml | 35 ++++-- 24 files changed, 202 insertions(+), 40 deletions(-) create mode 100644 pig-common/pig-common-bom/pom.xml diff --git a/README.md b/README.md index 90901a78..08583b7f 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 4ed62ebd..60d590dd 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 00000000..3746e2c6 --- /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 25dcfa86..0d821013 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 04990bca..7e533d7c 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 15e3d908..821e1c06 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 54a862d6..fa7db5dc 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 1b70d66e..c31d3b75 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 a83c6244..dc75ddd5 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 8c0df87a..96bd06ef 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 25be645b..fd92fd98 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 bb1baee6..27c64bba 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 360ebb3b..c16a61e2 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 fd4c7086..18e9d35b 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 951cc61e..06266cef 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 f8432074..ca24096b 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 06993962..74f22d87 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 7c955d0f..bf60a9fd 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 7b1d51c3..2cffd5b5 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 c5a508a0..90638c4a 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 fa487205..18b4f7bf 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 34bd5385..b894d181 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 742fbdc5..cf09152f 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 d247e266..59dbe438 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} + +