diff --git a/docs/zh/others/apt.md b/docs/zh/others/apt.md index a7c233ae..2e5d9852 100644 --- a/docs/zh/others/apt.md +++ b/docs/zh/others/apt.md @@ -22,10 +22,11 @@ MyBatis-Flex 使用了 APT(Annotation Processing Tool)技术,在项目编 | processor.allInTables | 是否所有的类都生成在 Tables 类里 | true/false | false | | processor.tablesPackage | Tables 类名 | 合法的包名 | ${entityPackage}.table | | processor.tablesClassName | Tables 类名 | 合法的类名 | Tables | -| processor.baseMapperClass | 自定义 Mapper 的父类 | 全路径类名 | com.mybatisflex.core.BaseMapper | -| processor.mappersPackage | 自定义 Mapper 生成的包名 | 合法的包名 | ${entityPackage}.mapper | -| processor.tablesNameStyle | 生成辅助类的字段风格 | upperCase, lowerCase
upperCamelCase, lowerCamelCase | upperCase | -| processor.tablesDefSuffix | 生成的表对应的变量后缀 | string | 空字符串 | +| processor.baseMapperClass | 自定义 Mapper 的父类 | 全路径类名 | com.mybatisflex.core.BaseMapper | +| processor.mappersPackage | 自定义 Mapper 生成的包名 | 合法的包名 | ${entityPackage}.mapper | +| processor.tableDef.propertiesNameStyle | 生成辅助类的字段风格 | upperCase, lowerCase
upperCamelCase, lowerCamelCase | upperCase | +| processor.tableDef.instanceSuffix | 生成的表对应的变量后缀 | string | 空字符串 | +| processor.tableDef.classSuffix | 生成的表对应的变量后缀 | string | 空字符串 | | processor.entity.ignoreSuffixes | 过滤 Entity 后缀 | string | - | diff --git a/mybatis-flex-annotation/pom.xml b/mybatis-flex-annotation/pom.xml index 06c25031..062d95c3 100644 --- a/mybatis-flex-annotation/pom.xml +++ b/mybatis-flex-annotation/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -13,6 +13,11 @@ jar ${project.artifactId} + + 8 + 8 + + org.mybatis diff --git a/mybatis-flex-codegen/pom.xml b/mybatis-flex-codegen/pom.xml index 87577c02..3c40c6ab 100644 --- a/mybatis-flex-codegen/pom.xml +++ b/mybatis-flex-codegen/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -29,7 +29,7 @@ com.mybatis-flex mybatis-flex-spring - ${revision} + ${mybatis-flex.version} diff --git a/mybatis-flex-core/pom.xml b/mybatis-flex-core/pom.xml index c4ec05b8..6b30a7d5 100644 --- a/mybatis-flex-core/pom.xml +++ b/mybatis-flex-core/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -23,13 +23,13 @@ com.mybatis-flex mybatis-flex-annotation - ${revision} + ${mybatis-flex.version} com.mybatis-flex mybatis-flex-processor - ${revision} + ${mybatis-flex.version} diff --git a/mybatis-flex-processor/pom.xml b/mybatis-flex-processor/pom.xml index 24729bae..5905b248 100644 --- a/mybatis-flex-processor/pom.xml +++ b/mybatis-flex-processor/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -13,20 +13,20 @@ jar ${project.artifactId} - - - com.mybatis-flex - mybatis-flex-annotation - ${revision} - - - - 8 8 + + + com.mybatis-flex + mybatis-flex-annotation + ${mybatis-flex.version} + + + + diff --git a/mybatis-flex-solon-plugin/pom.xml b/mybatis-flex-solon-plugin/pom.xml index 20195de7..7ea6e9ff 100644 --- a/mybatis-flex-solon-plugin/pom.xml +++ b/mybatis-flex-solon-plugin/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -13,6 +13,11 @@ jar ${project.artifactId} + + 8 + 8 + + org.noear @@ -23,7 +28,7 @@ com.mybatis-flex mybatis-flex-core - ${revision} + ${mybatis-flex.version} diff --git a/mybatis-flex-spring-boot-starter/pom.xml b/mybatis-flex-spring-boot-starter/pom.xml index 7b15f8c7..742c08f1 100644 --- a/mybatis-flex-spring-boot-starter/pom.xml +++ b/mybatis-flex-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -23,7 +23,7 @@ com.mybatis-flex mybatis-flex-spring - ${revision} + ${mybatis-flex.version} diff --git a/mybatis-flex-spring/pom.xml b/mybatis-flex-spring/pom.xml index f68d6d48..e6959697 100644 --- a/mybatis-flex-spring/pom.xml +++ b/mybatis-flex-spring/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-core - ${revision} + ${mybatis-flex.version} diff --git a/mybatis-flex-test/mybatis-flex-native-test/pom.xml b/mybatis-flex-test/mybatis-flex-native-test/pom.xml index 5ec0c631..a80c4bd8 100644 --- a/mybatis-flex-test/mybatis-flex-native-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-native-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-core - ${revision} + ${mybatis-flex.version} 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 4bea3292..f048ab4d 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,7 @@ mybatis-flex-test com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -22,7 +22,7 @@ com.mybatis-flex mybatis-flex-spring-boot-starter - ${revision} + ${mybatis-flex.version} @@ -83,13 +83,6 @@ test - - - - - - - \ No newline at end of file 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 57c8e135..053059b4 100644 --- a/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-cloud-test/pom.xml @@ -1,94 +1,93 @@ - - mybatis-flex-test - com.mybatis-flex - ${revision} - - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + + mybatis-flex-test + com.mybatis-flex + 1.4.4 + + 4.0.0 - mybatis-flex-spring-cloud-test - jar - ${project.artifactId} + mybatis-flex-spring-cloud-test + jar + ${project.artifactId} - - 1.8 - 8 - 8 - 2.6.13 - 2021.0.5 - 2021.0.5.0 - + + 8 + 8 + 2.6.13 + 2021.0.5 + 2021.0.5.0 + - - - - 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-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-dependencies + ${spring-boot.version} + pom + import + + + - - - org.springframework.boot - spring-boot-starter-web - + + + org.springframework.boot + spring-boot-starter-web + - - com.mybatis-flex - mybatis-flex-spring-boot-starter - ${revision} - + + com.mybatis-flex + mybatis-flex-spring-boot-starter + ${mybatis-flex.version} + - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + - - com.zaxxer - HikariCP - compile - + + com.zaxxer + HikariCP + compile + - - mysql - mysql-connector-java - runtime - - - org.springframework.boot - spring-boot-starter-test - test - - + + mysql + mysql-connector-java + runtime + + + org.springframework.boot + spring-boot-starter-test + test + + - - - - org.springframework.boot - spring-boot-maven-plugin - - - + + + + org.springframework.boot + spring-boot-maven-plugin + + + diff --git a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml index 60e7663b..210f1a1d 100644 --- a/mybatis-flex-test/mybatis-flex-spring-test/pom.xml +++ b/mybatis-flex-test/mybatis-flex-spring-test/pom.xml @@ -5,7 +5,7 @@ mybatis-flex-test com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -22,13 +22,13 @@ com.mybatis-flex mybatis-flex-core - ${revision} + ${mybatis-flex.version} com.mybatis-flex mybatis-flex-spring - ${revision} + ${mybatis-flex.version} diff --git a/mybatis-flex-test/pom.xml b/mybatis-flex-test/pom.xml index 212c509f..16f36549 100644 --- a/mybatis-flex-test/pom.xml +++ b/mybatis-flex-test/pom.xml @@ -5,7 +5,7 @@ parent com.mybatis-flex - ${revision} + 1.4.4 4.0.0 @@ -43,29 +43,15 @@ 1.8 1.8 - - - - - - - - - - - - - - - com.mybatis-flex mybatis-flex-processor - ${revision} + ${mybatis-flex.version} + \ No newline at end of file diff --git a/pom.xml b/pom.xml index fb09a0a2..9deb27e2 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.mybatis-flex parent pom - ${revision} + 1.4.4 mybatis-flex https://mybatis-flex.com @@ -51,10 +51,11 @@ - 1.4.4 8 8 + 1.4.4 + 3.5.13 2.1.0 1.2.4 @@ -288,32 +289,6 @@ - - org.codehaus.mojo - flatten-maven-plugin - ${maven-flatten.version} - - true - oss - - - - flatten - process-resources - - flatten - - - - flatten.clean - clean - - clean - - - - -