From 84f5f218b78f41b095b00c7e412c4fcf350f50cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com> Date: Sat, 9 Mar 2024 16:16:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?:sparkles:=20=E4=BD=BF=E7=94=A8=20flatten-m?= =?UTF-8?q?aven-plugin=20=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 + blade-core-bom/pom.xml | 38 ++++++++++ blade-core-boot/pom.xml | 10 +-- blade-core-cloud/pom.xml | 4 +- blade-core-crypto/pom.xml | 4 +- blade-core-datascope/pom.xml | 4 +- blade-core-develop/pom.xml | 4 +- blade-core-launch/pom.xml | 3 +- blade-core-loadbalancer/pom.xml | 3 +- blade-core-log/pom.xml | 6 +- blade-core-mybatis/pom.xml | 4 +- blade-core-oss/pom.xml | 4 +- blade-core-report/pom.xml | 4 +- blade-core-secure/pom.xml | 4 +- blade-core-social/pom.xml | 4 +- blade-core-swagger/pom.xml | 4 +- blade-core-test/pom.xml | 4 +- blade-core-tool/pom.xml | 5 +- blade-core-transaction/pom.xml | 5 +- pom.xml | 129 ++++++++++++++++++++++++++++++-- 20 files changed, 182 insertions(+), 65 deletions(-) create mode 100644 blade-core-bom/pom.xml diff --git a/.gitignore b/.gitignore index 987273c..efc7569 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,7 @@ Thumbs.db *.war *.ear /target + +# Flattened pom +.flattened-pom.xml +/**/.flattened-pom.xml diff --git a/blade-core-bom/pom.xml b/blade-core-bom/pom.xml new file mode 100644 index 0000000..c7c145e --- /dev/null +++ b/blade-core-bom/pom.xml @@ -0,0 +1,38 @@ + + + + blade-tool + org.springblade + ${revision} + + + 4.0.0 + + blade-core-bom + ${project.artifactId} + pom + + + + + org.codehaus.mojo + flatten-maven-plugin + ${maven-flatten.version} + + true + oss + + expand + remove + remove + remove + remove + + + + + + + diff --git a/blade-core-boot/pom.xml b/blade-core-boot/pom.xml index 8341580..3ad7129 100644 --- a/blade-core-boot/pom.xml +++ b/blade-core-boot/pom.xml @@ -5,14 +5,13 @@ org.springblade blade-tool - 3.7.1 + ${revision} 4.0.0 blade-core-boot ${project.artifactId} - ${blade.tool.version} jar @@ -35,38 +34,31 @@ org.springblade blade-core-launch - ${blade.tool.version} org.springblade blade-core-cloud - ${blade.tool.version} org.springblade blade-core-tool - ${blade.tool.version} org.springblade blade-core-secure - ${blade.tool.version} org.springblade blade-core-log - ${blade.tool.version} org.springblade blade-core-swagger - ${blade.tool.version} org.springblade blade-core-mybatis - ${blade.tool.version} com.baomidou diff --git a/blade-core-cloud/pom.xml b/blade-core-cloud/pom.xml index 06c6c34..acda291 100644 --- a/blade-core-cloud/pom.xml +++ b/blade-core-cloud/pom.xml @@ -5,13 +5,12 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-cloud ${project.artifactId} - ${blade.tool.version} jar @@ -20,7 +19,6 @@ org.springblade blade-core-secure - ${blade.tool.version} diff --git a/blade-core-crypto/pom.xml b/blade-core-crypto/pom.xml index 05e74a2..e477669 100644 --- a/blade-core-crypto/pom.xml +++ b/blade-core-crypto/pom.xml @@ -5,20 +5,18 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-crypto ${project.artifactId} - ${blade.tool.version} jar org.springblade blade-core-tool - ${blade.tool.version} org.springframework.cloud diff --git a/blade-core-datascope/pom.xml b/blade-core-datascope/pom.xml index 5fbbd4b..e3257d5 100644 --- a/blade-core-datascope/pom.xml +++ b/blade-core-datascope/pom.xml @@ -5,13 +5,12 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-datascope ${project.artifactId} - ${blade.tool.version} jar @@ -19,7 +18,6 @@ org.springblade blade-core-mybatis - ${blade.tool.version} diff --git a/blade-core-develop/pom.xml b/blade-core-develop/pom.xml index af56b47..30bc426 100644 --- a/blade-core-develop/pom.xml +++ b/blade-core-develop/pom.xml @@ -5,13 +5,12 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-develop ${project.artifactId} - ${blade.tool.version} jar @@ -19,7 +18,6 @@ org.springblade blade-core-tool - ${blade.tool.version} diff --git a/blade-core-launch/pom.xml b/blade-core-launch/pom.xml index e8c81bd..064023b 100644 --- a/blade-core-launch/pom.xml +++ b/blade-core-launch/pom.xml @@ -5,14 +5,13 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-launch ${project.artifactId} - ${blade.tool.version} jar diff --git a/blade-core-loadbalancer/pom.xml b/blade-core-loadbalancer/pom.xml index 2c98fd5..1b343ca 100644 --- a/blade-core-loadbalancer/pom.xml +++ b/blade-core-loadbalancer/pom.xml @@ -5,14 +5,13 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-loadbalancer ${project.artifactId} - ${blade.tool.version} jar diff --git a/blade-core-log/pom.xml b/blade-core-log/pom.xml index a75d5f7..dd5e2a9 100644 --- a/blade-core-log/pom.xml +++ b/blade-core-log/pom.xml @@ -5,14 +5,13 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-log ${project.artifactId} - ${blade.tool.version} jar @@ -20,17 +19,14 @@ org.springblade blade-core-tool - ${blade.tool.version} org.springblade blade-core-secure - ${blade.tool.version} org.springblade blade-core-cloud - ${blade.tool.version} diff --git a/blade-core-mybatis/pom.xml b/blade-core-mybatis/pom.xml index 98154db..d699180 100644 --- a/blade-core-mybatis/pom.xml +++ b/blade-core-mybatis/pom.xml @@ -5,14 +5,13 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-mybatis ${project.artifactId} - ${blade.tool.version} jar @@ -36,7 +35,6 @@ org.springblade blade-core-secure - ${blade.tool.version} diff --git a/blade-core-oss/pom.xml b/blade-core-oss/pom.xml index 2cfc55f..79eb6c1 100644 --- a/blade-core-oss/pom.xml +++ b/blade-core-oss/pom.xml @@ -5,13 +5,12 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-oss ${project.artifactId} - ${blade.tool.version} jar @@ -19,7 +18,6 @@ org.springblade blade-core-tool - ${blade.tool.version} diff --git a/blade-core-report/pom.xml b/blade-core-report/pom.xml index fe12c5d..00e77ba 100644 --- a/blade-core-report/pom.xml +++ b/blade-core-report/pom.xml @@ -5,20 +5,18 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-report ${project.artifactId} - ${blade.tool.version} jar org.springblade blade-core-mybatis - ${blade.tool.version} com.bstek.ureport diff --git a/blade-core-secure/pom.xml b/blade-core-secure/pom.xml index 85c8bc8..8b730b3 100644 --- a/blade-core-secure/pom.xml +++ b/blade-core-secure/pom.xml @@ -5,14 +5,13 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-secure ${project.artifactId} - ${blade.tool.version} jar @@ -31,7 +30,6 @@ org.springblade blade-core-tool - ${blade.tool.version} diff --git a/blade-core-social/pom.xml b/blade-core-social/pom.xml index 1ac40a8..21612c3 100644 --- a/blade-core-social/pom.xml +++ b/blade-core-social/pom.xml @@ -5,13 +5,12 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-social ${project.artifactId} - ${blade.tool.version} jar @@ -19,7 +18,6 @@ org.springblade blade-core-tool - ${blade.tool.version} diff --git a/blade-core-swagger/pom.xml b/blade-core-swagger/pom.xml index 91c1b24..88d8529 100644 --- a/blade-core-swagger/pom.xml +++ b/blade-core-swagger/pom.xml @@ -5,14 +5,13 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-swagger ${project.artifactId} - ${blade.tool.version} jar @@ -20,7 +19,6 @@ org.springblade blade-core-tool - ${blade.tool.version} diff --git a/blade-core-test/pom.xml b/blade-core-test/pom.xml index d420c32..069f6cf 100644 --- a/blade-core-test/pom.xml +++ b/blade-core-test/pom.xml @@ -5,13 +5,12 @@ org.springblade blade-tool - 3.7.1 + ${revision} 4.0.0 blade-core-test ${project.artifactId} - ${blade.tool.version} jar @@ -19,7 +18,6 @@ org.springblade blade-core-launch - ${blade.tool.version} diff --git a/blade-core-tool/pom.xml b/blade-core-tool/pom.xml index 5de5ca6..5181a52 100644 --- a/blade-core-tool/pom.xml +++ b/blade-core-tool/pom.xml @@ -2,18 +2,16 @@ - org.springblade blade-tool - 3.7.1 + ${revision} 4.0.0 blade-core-tool ${project.artifactId} - ${blade.tool.version} jar @@ -21,7 +19,6 @@ org.springblade blade-core-launch - ${blade.tool.version} com.fasterxml.jackson.datatype diff --git a/blade-core-transaction/pom.xml b/blade-core-transaction/pom.xml index acc02ce..b608fae 100644 --- a/blade-core-transaction/pom.xml +++ b/blade-core-transaction/pom.xml @@ -5,13 +5,12 @@ blade-tool org.springblade - 3.7.1 + ${revision} 4.0.0 blade-core-transaction ${project.artifactId} - ${blade.tool.version} jar @@ -19,12 +18,10 @@ org.springblade blade-core-mybatis - ${blade.tool.version} org.springblade blade-core-cloud - ${blade.tool.version} diff --git a/pom.xml b/pom.xml index fac3035..0dd39f4 100644 --- a/pom.xml +++ b/pom.xml @@ -2,10 +2,9 @@ 4.0.0 - org.springblade blade-tool - 3.7.1 + ${revision} pom blade-tool @@ -36,11 +35,12 @@ - 3.7.1 - + + 3.7.1 + 1.8 3.8.1 - + 1.3.0 4.3.0 3.5.13 2.1.1 @@ -64,6 +64,7 @@ + blade-core-bom blade-core-boot blade-core-cloud blade-core-develop @@ -120,6 +121,98 @@ pom import + + net.dreamlu + mica-auto + ${mica.auto.version} + provided + + + + org.springblade + blade-core-launch + ${revision} + + + org.springblade + blade-core-boot + ${revision} + + + org.springblade + blade-core-cloud + ${revision} + + + org.springblade + blade-core-tool + ${revision} + + + org.springblade + blade-core-develop + ${revision} + + + org.springblade + blade-core-secure + ${revision} + + + org.springblade + blade-core-social + ${revision} + + + org.springblade + blade-core-log + ${revision} + + + org.springblade + blade-core-test + ${revision} + + + org.springblade + blade-core-swagger + ${revision} + + + org.springblade + blade-core-mybatis + ${revision} + + + org.springblade + blade-core-oss + ${revision} + + + org.springblade + blade-core-transaction + ${revision} + + + org.springblade + blade-core-loadbalancer + ${revision} + + + org.springblade + blade-core-report + ${revision} + + + org.springblade + blade-core-datascope + ${revision} + + + org.springblade + blade-core-crypto + ${revision} + @@ -159,7 +252,6 @@ net.dreamlu mica-auto - ${mica.auto.version} provided @@ -191,6 +283,31 @@ + + org.codehaus.mojo + flatten-maven-plugin + ${maven-flatten.version} + + true + oss + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + org.apache.maven.plugins maven-javadoc-plugin From 5159d932961895411145c70047762387a80eade8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A6=82=E6=A2=A6=E6=8A=80=E6=9C=AF?= <596392912@qq.com> Date: Sat, 9 Mar 2024 16:20:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?:sparkles:=20=E4=BD=BF=E7=94=A8=20flatten-m?= =?UTF-8?q?aven-plugin=20=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/ISSUE_TEMPLATE | 13 +++++++++++++ .github/PULL_REQUEST_TEMPLATE | 16 ++++++++++++++++ .github/workflows/test-and-build.yml | 17 +++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE create mode 100644 .github/PULL_REQUEST_TEMPLATE create mode 100644 .github/workflows/test-and-build.yml diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE new file mode 100644 index 0000000..691ce34 --- /dev/null +++ b/.github/ISSUE_TEMPLATE @@ -0,0 +1,13 @@ +**注意:github 上的少,可能响应不够及时,建议 gitee 上发起** + +Please answer some questions before submitting your issue. Thanks! + +### Which version do you using(使用的哪个版本)? + +### Expected behavior(预期的效果) + +### Actual behavior(实际的效果) + +### Steps to reproduce the behavior(重现步骤) + +### Other information(其他信息) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE new file mode 100644 index 0000000..6b664de --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE @@ -0,0 +1,16 @@ +**注意:github 上的少,可能响应不够及时,建议 gitee 上发起** + +**What kind of change does this PR introduce?** (check at least one) + +- [ ] Bugfix(bug修复) +- [ ] Feature(新功能) +- [ ] Code style update(代码格式调整) +- [ ] Refactor(重构) +- [ ] Build-related changes(与构建相关的更改) +- [ ] Other, please describe(其他,请说明): + + +**The description of the PR(PR描述):** + + +**Other information(其他信息):** diff --git a/.github/workflows/test-and-build.yml b/.github/workflows/test-and-build.yml new file mode 100644 index 0000000..c2d1312 --- /dev/null +++ b/.github/workflows/test-and-build.yml @@ -0,0 +1,17 @@ +name: Java CI +on: [push, pull_request] + +jobs: + buildOnJava8: + name: build on java8 + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Set up JDK 8 + uses: actions/setup-java@v3 + with: + distribution: 'zulu' + cache: 'maven' + java-version: 8 + - name: Build with Maven + run: mvn package