From ecbd87a1ae94bbf44cc141312ca14b8620eac8fd Mon Sep 17 00:00:00 2001 From: ruansheng Date: Wed, 23 Jul 2025 18:50:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20-m=20bom=20=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=BB=9F=E4=B8=80=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mybatis-flex-annotation/pom.xml | 3 +- mybatis-flex-codegen/pom.xml | 9 +- mybatis-flex-core/pom.xml | 9 +- mybatis-flex-dependencies/pom.xml | 136 ++++++++++++++++-- .../main/xslt/post-process-flattened-pom.xsl | 30 ++++ mybatis-flex-loveqq-starter/pom.xml | 5 +- mybatis-flex-processor/pom.xml | 7 +- mybatis-flex-solon-plugin/pom.xml | 5 +- mybatis-flex-spring-boot-starter/pom.xml | 7 +- mybatis-flex-spring-boot3-starter/pom.xml | 5 +- mybatis-flex-spring/pom.xml | 15 +- .../mybatis-flex-loveqq-test/pom.xml | 5 +- .../mybatis-flex-native-test/pom.xml | 5 +- .../mybatis-flex-seata-test/pom.xml | 5 +- .../mybatis-flex-solon-test/pom.xml | 7 +- .../mybatis-flex-spring-boot-test/pom.xml | 17 +-- .../mybatis-flex-spring-cloud-test/pom.xml | 11 +- .../mybatis-flex-spring-test/pom.xml | 7 +- mybatis-flex-test/pom.xml | 5 +- pom.xml | 17 +-- 20 files changed, 215 insertions(+), 95 deletions(-) create mode 100644 mybatis-flex-dependencies/src/main/xslt/post-process-flattened-pom.xsl diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml index abad4b91..95f82ca1 100644 --- a/mybatis-flex-annotation/pom.xml +++ b/mybatis-flex-annotation/pom.xml @@ -5,7 +5,8 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml index aab34dde..d08a5a86 100644 --- a/mybatis-flex-codegen/pom.xml +++ b/mybatis-flex-codegen/pom.xml @@ -5,7 +5,8 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -24,7 +25,7 @@ com.mybatis-flex mybatis-flex-core - 1.11.1 + ${revision} com.mybatis-flex @@ -121,7 +122,7 @@ com.mybatis-flex mybatis-flex-spring - ${mybatis-flex.version} + ${revision} com.mybatis-flex @@ -135,7 +136,7 @@ com.mybatis-flex mybatis-flex-solon-plugin - ${mybatis-flex.version} + ${revision} com.mybatis-flex diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml index 94081a9a..0f27f41b 100644 --- a/mybatis-flex-core/pom.xml +++ b/mybatis-flex-core/pom.xml @@ -5,7 +5,8 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -24,13 +25,13 @@ com.mybatis-flex mybatis-flex-annotation - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-processor - ${mybatis-flex.version} + ${revision} @@ -102,7 +103,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.11.1 + ${revision} compile diff --git a/mybatis-flex-dependencies/pom.xml b/mybatis-flex-dependencies/pom.xml index 3778688c..868735ed 100644 --- a/mybatis-flex-dependencies/pom.xml +++ b/mybatis-flex-dependencies/pom.xml @@ -4,9 +4,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.mybatis-flex + + com.mybatis-flex + parent + ${revision} + ../pom.xml + + mybatis-flex-dependencies - 1.11.1 + ${revision} pom @@ -48,7 +54,6 @@ - 1.11.1 @@ -56,42 +61,42 @@ com.mybatis-flex mybatis-flex-annotation - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-codegen - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-core - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-processor - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-solon-plugin - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-spring - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-spring-boot-starter - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-spring-boot3-starter - ${mybatis-flex.version} + ${revision} @@ -185,6 +190,115 @@ + + org.codehaus.mojo + flatten-maven-plugin + ${flatten-maven-plugin.version} + false + + + + flatten-effective-pom + process-resources + + flatten + + + false + ${project.build.directory}/effective-pom + resolveCiFriendliesOnly + + expand + expand + remove + remove + + + + + + flatten + process-resources + + flatten + + + true + bom + + keep + keep + remove + + + + + flatten-clean + clean + + clean + + + + + + + org.codehaus.mojo + xml-maven-plugin + ${xml-maven-plugin.version} + false + + + + post-process-effective-pom + process-resources + + transform + + + + + ${project.build.directory}/effective-pom + ${project.build.directory}/effective-pom + src/main/xslt/post-process-flattened-pom.xsl + + + indent + yes + + + + + + + + + post-process-flattened-pom + process-resources + + transform + + + + + ${project.basedir} + ${project.basedir} + .flattened-pom.xml + src/main/xslt/post-process-flattened-pom.xsl + + + indent + yes + + + + + + + + + diff --git a/mybatis-flex-dependencies/src/main/xslt/post-process-flattened-pom.xsl b/mybatis-flex-dependencies/src/main/xslt/post-process-flattened-pom.xsl new file mode 100644 index 00000000..9ee94eff --- /dev/null +++ b/mybatis-flex-dependencies/src/main/xslt/post-process-flattened-pom.xsl @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mybatis-flex-loveqq-starter/pom.xml b/mybatis-flex-loveqq-starter/pom.xml index febfa860..7e085a97 100644 --- a/mybatis-flex-loveqq-starter/pom.xml +++ b/mybatis-flex-loveqq-starter/pom.xml @@ -6,7 +6,8 @@ com.mybatis-flex parent - 1.11.1 + ${revision} + ../pom.xml mybatis-flex-loveqq-starter @@ -34,7 +35,7 @@ com.mybatis-flex mybatis-flex-core - ${mybatis-flex.version} + ${revision} diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml index b4065fb5..991ddc7d 100644 --- a/mybatis-flex-processor/pom.xml +++ b/mybatis-flex-processor/pom.xml @@ -5,14 +5,15 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 mybatis-flex-processor mybatis-flex-processor jar - 1.11.1 + ${revision} @@ -24,7 +25,7 @@ com.mybatis-flex mybatis-flex-annotation - 1.11.1 + ${revision} diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml index 29259fe7..4cb22020 100644 --- a/mybatis-flex-solon-plugin/pom.xml +++ b/mybatis-flex-solon-plugin/pom.xml @@ -5,7 +5,8 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -29,7 +30,7 @@ com.mybatis-flex mybatis-flex-core - ${mybatis-flex.version} + ${revision} diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index b7be56af..cabe91f9 100644 --- a/mybatis-flex-spring-boot-starter/pom.xml +++ b/mybatis-flex-spring-boot-starter/pom.xml @@ -5,7 +5,8 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -24,7 +25,7 @@ com.mybatis-flex mybatis-flex-spring - 1.11.1 + ${revision} @@ -105,7 +106,7 @@ com.mybatis-flex mybatis-flex-core - 1.11.1 + ${revision} diff --git a/mybatis-flex-spring-boot3-starter/pom.xml b/mybatis-flex-spring-boot3-starter/pom.xml index 95afce9e..ec9dde32 100644 --- a/mybatis-flex-spring-boot3-starter/pom.xml +++ b/mybatis-flex-spring-boot3-starter/pom.xml @@ -6,7 +6,8 @@ com.mybatis-flex parent - 1.11.1 + ${revision} + ../pom.xml mybatis-flex-spring-boot3-starter @@ -21,7 +22,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - 1.11.1 + ${revision} org.mybatis diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index 921e5bd5..6f11974e 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -5,7 +5,8 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -23,7 +24,7 @@ com.mybatis-flex mybatis-flex-core - 1.11.1 + ${revision} @@ -41,16 +42,6 @@ spring-jdbc - - org.springframework.batch - spring-batch-core - - - - org.springframework.batch - spring-batch-infrastructure - - com.github.gavlyukovskiy datasource-decorator-spring-boot-autoconfigure diff --git a/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml b/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml index b87a40c8..7210a83a 100644 --- a/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-loveqq-test/pom.xml @@ -6,7 +6,8 @@ mybatis-flex-test com.mybatis-flex - 1.11.0 + ${revision} + ../pom.xml mybatis-flex-loveqq-test @@ -28,7 +29,7 @@ com.mybatis-flex mybatis-flex-loveqq-starter - ${mybatis-flex.version} + ${revision} diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml index 5f9c1127..55385a7a 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-native-test/pom.xml @@ -5,7 +5,8 @@ mybatis-flex-test com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -23,7 +24,7 @@ com.mybatis-flex mybatis-flex-core - ${mybatis-flex.version} + ${revision} diff --git a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml index 753b110e..0f5f2e5a 100644 --- a/mybatis-flex-test/mybatis-flex-seata-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-seata-test/pom.xml @@ -4,7 +4,8 @@ mybatis-flex-test com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -21,7 +22,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - ${mybatis-flex.version} + ${revision} diff --git a/mybatis-flex-test/mybatis-flex-solon-test/pom.xml b/mybatis-flex-test/mybatis-flex-solon-test/pom.xml index 987c42fc..8b623c2c 100644 --- a/mybatis-flex-test/mybatis-flex-solon-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-solon-test/pom.xml @@ -5,7 +5,8 @@ mybatis-flex-test com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -25,7 +26,7 @@ com.mybatis-flex mybatis-flex-solon-plugin - ${mybatis-flex.version} + ${revision} @@ -96,7 +97,7 @@ com.mybatis-flex mybatis-flex-processor - ${mybatis-flex.version} + ${revision} diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml index 67c3cbaf..3ccc3ee0 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml @@ -5,7 +5,8 @@ mybatis-flex-test com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -23,7 +24,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - ${mybatis-flex.version} + ${revision} @@ -43,12 +44,6 @@ 1.2.18 - - org.springframework.boot - spring-boot-starter-batch - ${spring-boot.version} - - @@ -70,12 +65,6 @@ mysql-connector-j - - org.springdoc - springdoc-openapi-ui - 1.8.0 - - diff --git a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml index 9519541d..4386dc56 100644 --- a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml @@ -5,7 +5,8 @@ mybatis-flex-test com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -57,7 +58,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - ${mybatis-flex.version} + ${revision} @@ -81,12 +82,6 @@ spring-boot-starter-test test - - com.mybatis-flex - mybatis-flex-spring-test - 1.10.9 - compile - diff --git a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml index 6e9517bf..d86eb7ac 100644 --- a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml @@ -5,7 +5,8 @@ mybatis-flex-test com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -23,13 +24,13 @@ com.mybatis-flex mybatis-flex-core - ${mybatis-flex.version} + ${revision} com.mybatis-flex mybatis-flex-spring - ${mybatis-flex.version} + ${revision} diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index 9462b1f8..bae5c207 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -5,7 +5,8 @@ parent com.mybatis-flex - 1.11.1 + ${revision} + ../pom.xml 4.0.0 @@ -76,7 +77,7 @@ com.mybatis-flex mybatis-flex-processor - ${mybatis-flex.version} + ${revision} diff --git a/pom.xml b/pom.xml index e81a4fc7..2ddd24e1 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.mybatis-flex parent pom - 1.11.1 + ${revision} mybatis-flex https://mybatis-flex.com @@ -65,7 +65,7 @@ 8 8 - 1.11.1 + 1.11.0 3.5.19 2.1.2 @@ -77,7 +77,6 @@ 4.0.3 5.3.27 - 4.3.10 2.7.11 3.0.1 1.1.0-java8 @@ -181,18 +180,6 @@ ${spring-boot.version} - - org.springframework.batch - spring-batch-core - ${spring-batch.version} - - - - org.springframework.batch - spring-batch-infrastructure - ${spring-batch.version} - - junit From 7289b154785b49b575a389f25cc7c97a2cd4a332 Mon Sep 17 00:00:00 2001 From: ruansheng Date: Sun, 27 Jul 2025 15:39:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20-m=20bom=20revision=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2ddd24e1..07ccafc5 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,11 @@ 8 8 - 1.11.0 + + 1.11.1 + + 1.6.0 + 1.1.0 3.5.19 2.1.2 From 66c1cd08507e7a9354d7f084e1f452bd02f5009d Mon Sep 17 00:00:00 2001 From: ruansheng Date: Sun, 27 Jul 2025 15:43:56 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20-m=20bom=20=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mybatis-flex-spring/pom.xml | 10 ++++++++++ .../mybatis-flex-spring-boot-test/pom.xml | 12 ++++++++++++ .../mybatis-flex-spring-cloud-test/pom.xml | 6 ++++++ pom.xml | 13 +++++++++++++ 4 files changed, 41 insertions(+) diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index 6f11974e..9204a165 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -42,6 +42,16 @@ spring-jdbc + + org.springframework.batch + spring-batch-core + + + + org.springframework.batch + spring-batch-infrastructure + + com.github.gavlyukovskiy datasource-decorator-spring-boot-autoconfigure diff --git a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml index 3ccc3ee0..2ba2cc11 100644 --- a/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-boot-test/pom.xml @@ -44,6 +44,12 @@ 1.2.18 + + org.springframework.boot + spring-boot-starter-batch + ${spring-boot.version} + + @@ -65,6 +71,12 @@ mysql-connector-j + + org.springdoc + springdoc-openapi-ui + 1.8.0 + + diff --git a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml index 4386dc56..e428c967 100644 --- a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml @@ -82,6 +82,12 @@ spring-boot-starter-test test + + com.mybatis-flex + mybatis-flex-spring-test + ${revision} + compile + diff --git a/pom.xml b/pom.xml index 07ccafc5..78ac0ced 100644 --- a/pom.xml +++ b/pom.xml @@ -81,6 +81,7 @@ 4.0.3 5.3.27 + 4.3.10 2.7.11 3.0.1 1.1.0-java8 @@ -184,6 +185,18 @@ ${spring-boot.version} + + org.springframework.batch + spring-batch-core + ${spring-batch.version} + + + + org.springframework.batch + spring-batch-infrastructure + ${spring-batch.version} + + junit