依赖更新：修改maven配置，提取jdk版本号

stanic-xyz · Oct 15, 2024 · a37e323 · a37e323
1 parent 667f128
commit a37e323
Show file tree

Hide file tree

Showing 30 changed files with 217 additions and 256 deletions.
diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml
@@ -13,8 +13,8 @@
   -->
 
 <!DOCTYPE module PUBLIC
-        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
-        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+    "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+    "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <!--
     Checkstyle configuration that checks the Google coding conventions from Google Java Style

diff --git a/docs/category/代码生成器/index.md b/docs/category/代码生成器/index.md
@@ -74,8 +74,8 @@ public class TestDomain extends BaseEntity {
         </execution>
       </executions>
       <configuration>
-        <source>17</source>
-        <target>17</target>
+        <source>${maven.compiler.source}</source>
+        <target>${maven.compiler.source}</target>
         <encoding>UTF-8</encoding>
         <compilerArgs>
           <!-- 指定源文件生成目录 ${project.basedir} 表示当前项目（子模块）的项目绝对地址，-A表示使用自定义编译选项-->

diff --git a/docs/category/代码生成器/快速开始.md b/docs/category/代码生成器/快速开始.md
@@ -74,8 +74,8 @@ public class TestDomain extends BaseEntity {
         </execution>
       </executions>
       <configuration>
-        <source>17</source>
-        <target>17</target>
+        <source>${maven.compiler.source}</source>
+        <target>${maven.compiler.source}</target>
         <encoding>UTF-8</encoding>
         <compilerArgs>
           <!-- 指定源文件生成目录 ${project.basedir} 表示当前项目（子模块）的项目绝对地址，-A表示使用自定义编译选项-->

diff --git a/pom.xml b/pom.xml
@@ -457,6 +457,16 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <encoding>${maven.compiler.encoding}</encoding>
+                </configuration>
+            </plugin>
+            <!-- Javadoc -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>

diff --git a/qing-application/pom.xml b/qing-application/pom.xml
@@ -14,15 +14,6 @@
     <name>qing-application</name>
     <description>qing-application</description>
     <packaging>pom</packaging>
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
 
     <modules>
         <module>qing-application-manager</module>

diff --git a/qing-application/qing-application-demo/pom.xml b/qing-application/qing-application-demo/pom.xml
@@ -11,12 +11,6 @@
 
     <artifactId>qing-application-demo</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/qing-application/qing-application-manager/pom.xml b/qing-application/qing-application-manager/pom.xml
@@ -16,7 +16,6 @@
     <description>qing-application-manager</description>
 
     <properties>
-        <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <kotlin.version>1.9.23</kotlin.version>
@@ -183,9 +182,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <encoding>UTF-8</encoding>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <encoding>${maven.compiler.encoding}</encoding>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.projectlombok</groupId>

diff --git a/qing-archetypes/pom.xml b/qing-archetypes/pom.xml
@@ -29,10 +29,4 @@
     <modules>
         <module>qing-service-archetype</module>
     </modules>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
 </project>
diff --git a/qing-archetypes/qing-service-archetype/src/main/resources/archetype-resources/pom.xml b/qing-archetypes/qing-service-archetype/src/main/resources/archetype-resources/pom.xml
@@ -178,8 +178,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version> <!-- or newer version -->
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>cn.chenyunlong</groupId>

diff --git a/qing-codegen-plugin/qing-codegen-api/pom.xml b/qing-codegen-plugin/qing-codegen-api/pom.xml
@@ -26,12 +26,6 @@
     <artifactId>qing-codegen-api</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>io.swagger.core.v3</groupId>

diff --git a/qing-codegen-plugin/qing-codegen-apt/pom.xml b/qing-codegen-plugin/qing-codegen-apt/pom.xml
@@ -95,9 +95,9 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.8.1</version>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <encoding>UTF-8</encoding>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <encoding>${maven.compiler.encoding}</encoding>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>com.google.auto.service</groupId>

diff --git a/qing-codegen-plugin/readme.md b/qing-codegen-plugin/readme.md
@@ -74,8 +74,8 @@ public class TestDomain extends BaseEntity {
                 </execution>
             </executions>
             <configuration>
-                <source>17</source>
-                <target>17</target>
+                <source>${maven.compiler.source}</source>
+                <target>${maven.compiler.source}</target>
                 <encoding>UTF-8</encoding>
                 <compilerArgs>
                     <!-- 指定源文件生成目录 ${project.basedir} 表示当前项目（子模块）的项目绝对地址，-A表示使用自定义编译选项-->

diff --git a/qing-commons/pom.xml b/qing-commons/pom.xml
@@ -102,8 +102,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/qing-domain-gen/pom.xml b/qing-domain-gen/pom.xml
@@ -14,13 +14,6 @@
 
     <packaging>jar</packaging>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.plugin.validation>NONE</maven.plugin.validation>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>cn.chenyunlong</groupId>
@@ -52,8 +45,8 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                     <encoding>UTF-8</encoding>
                     <compilerArgs>
                         <compilerArg>-AbaseDir=${project.basedir}</compilerArg>

diff --git a/qing-domain/pom.xml b/qing-domain/pom.xml
@@ -220,9 +220,9 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                    <encoding>UTF-8</encoding>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <encoding>${maven.compiler.encoding}</encoding>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/qing-infrastructure-anime/pom.xml b/qing-infrastructure-anime/pom.xml
@@ -12,11 +12,6 @@
     <artifactId>qing-infrastructure-anime</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/qing-infrastructure/pom.xml b/qing-infrastructure/pom.xml
@@ -15,15 +15,6 @@
     <description>基础设施</description>
 
     <packaging>jar</packaging>
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
 
     <dependencies>
         <dependency>

diff --git a/qing-services/pom.xml b/qing-services/pom.xml
@@ -11,10 +11,4 @@
 
     <artifactId>qing-services</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
 </project>
diff --git a/qing-starters/pom.xml b/qing-starters/pom.xml
@@ -28,15 +28,6 @@
     <version>0.0.2-SNAPSHOT</version>
 
     <packaging>pom</packaging>
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
 
     <modules>
         <module>qing-jpa-spring-boot-starter</module>

diff --git a/qing-starters/qing-dingtalk-spring-boot-starter/pom.xml b/qing-starters/qing-dingtalk-spring-boot-starter/pom.xml
@@ -27,10 +27,6 @@
     <artifactId>qing-dingtalk-spring-boot-starter</artifactId>
     <name>qing-dingtalk-spring-boot-starter</name>
 
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/qing-starters/qing-flowable-spring-boot-starter/pom.xml b/qing-starters/qing-flowable-spring-boot-starter/pom.xml
@@ -26,17 +26,6 @@
 
     <artifactId>qing-flowable-spring-boot-starter</artifactId>
     <name>qing-flowable-spring-boot-starter</name>
-
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -48,7 +37,6 @@
             <artifactId>camunda-bpm-spring-boot-starter</artifactId>
             <version>7.15.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>

diff --git a/qing-starters/qing-jimmer-spring-boot-starter/pom.xml b/qing-starters/qing-jimmer-spring-boot-starter/pom.xml
@@ -24,15 +24,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>qing-jimmer-spring-boot-starter</artifactId>
 
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/qing-starters/qing-jpa-spring-boot-starter/pom.xml b/qing-starters/qing-jpa-spring-boot-starter/pom.xml
@@ -24,15 +24,6 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>qing-jpa-spring-boot-starter</artifactId>
 
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/qing-starters/qing-mybatis-spring-boot-starter/pom.xml b/qing-starters/qing-mybatis-spring-boot-starter/pom.xml
@@ -28,16 +28,6 @@
 
     <name>qing-mybatis-spring-boot-starter</name>
 
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/qing-starters/qing-oss-spring-boot-starter/pom.xml b/qing-starters/qing-oss-spring-boot-starter/pom.xml
@@ -27,16 +27,6 @@
     <artifactId>qing-oss-spring-boot-starter</artifactId>
     <name>qing-oss-spring-boot-starter</name>
 
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.projectlombok</groupId>

diff --git a/qing-starters/qing-registry-spring-boot-starter/pom.xml b/qing-starters/qing-registry-spring-boot-starter/pom.xml
@@ -13,12 +13,6 @@
 
     <artifactId>qing-registry-spring-boot-starter</artifactId>
 
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>

diff --git a/qing-starters/qing-security-spring-boot-starter/pom.xml b/qing-starters/qing-security-spring-boot-starter/pom.xml
@@ -27,15 +27,6 @@
     <name>qing-security-spring-boot-starter</name>
     <version>0.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
-    <properties>
-        <java.version>17</java.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <maven.compiler.compilerVersion>17</maven.compiler.compilerVersion>
-        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    </properties>
 
     <dependencies>
         <dependency>