Merge branch '3.5.x'

CodeCasterX · CodeCasterX · commit e682e9f8ad30 · 2025-04-28T19:09:02.000+08:00
diff --git a/examples/fel-example/pom.xml b/examples/fel-example/pom.xml
@@ -21,11 +21,11 @@
 
         <!-- Maven plugin versions -->
         <maven.antrun.version>3.1.0</maven.antrun.version>
-        <maven.compiler.version>3.11.0</maven.compiler.version>
-        <maven.dependency.version>3.6.0</maven.dependency.version>
-        <maven.jar.version>3.3.0</maven.jar.version>
-        <maven.surefire.version>3.1.2</maven.surefire.version>
-        <maven.source.version>3.3.0</maven.source.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
+        <maven.dependency.version>3.8.1</maven.dependency.version>
+        <maven.jar.version>3.4.2</maven.jar.version>
+        <maven.surefire.version>3.5.3</maven.surefire.version>
+        <maven.source.version>3.3.1</maven.source.version>
     </properties>
 
     <modules>
diff --git a/examples/fit-example/01-simple-web-app/pom.xml b/examples/fit-example/01-simple-web-app/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/02-static-plugin/app-assistant/pom.xml b/examples/fit-example/02-static-plugin/app-assistant/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/02-static-plugin/plugin-default-weather/pom.xml b/examples/fit-example/02-static-plugin/plugin-default-weather/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/02-static-plugin/plugin-other-weather/pom.xml b/examples/fit-example/02-static-plugin/plugin-other-weather/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/02-static-plugin/service/pom.xml b/examples/fit-example/02-static-plugin/service/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/03-dynamic-plugin/plugin-assistant/pom.xml b/examples/fit-example/03-dynamic-plugin/plugin-assistant/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/03-dynamic-plugin/plugin-default-weather/pom.xml b/examples/fit-example/03-dynamic-plugin/plugin-default-weather/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/03-dynamic-plugin/plugin-other-weather/pom.xml b/examples/fit-example/03-dynamic-plugin/plugin-other-weather/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/03-dynamic-plugin/service/pom.xml b/examples/fit-example/03-dynamic-plugin/service/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/04-complicated-apps/app-assistant/pom.xml b/examples/fit-example/04-complicated-apps/app-assistant/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/04-complicated-apps/app-default-weather/pom.xml b/examples/fit-example/04-complicated-apps/app-default-weather/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/04-complicated-apps/app-registry-center/pom.xml b/examples/fit-example/04-complicated-apps/app-registry-center/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/04-complicated-apps/service/pom.xml b/examples/fit-example/04-complicated-apps/service/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/05-aop-log-plugin/plugins/plugin-log/pom.xml b/examples/fit-example/05-aop-log-plugin/plugins/plugin-log/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <fit.version>3.6.0-SNAPSHOT</fit.version>
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/examples/fit-example/05-aop-log-plugin/plugins/plugin-simple-mvc/pom.xml b/examples/fit-example/05-aop-log-plugin/plugins/plugin-simple-mvc/pom.xml
@@ -13,7 +13,7 @@
 
     <properties>
         <fit.version>3.6.0-SNAPSHOT</fit.version>
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
diff --git a/examples/fit-example/06-spring-boot-starter/plugin-dynamic/pom.xml b/examples/fit-example/06-spring-boot-starter/plugin-dynamic/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/examples/fit-example/06-spring-boot-starter/service/pom.xml b/examples/fit-example/06-spring-boot-starter/service/pom.xml
@@ -15,7 +15,7 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
 
         <!-- Maven plugin versions -->
-        <maven.compiler.version>3.11.0</maven.compiler.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
     </properties>
 
     <dependencies>
diff --git a/framework/fel/java/pom.xml b/framework/fel/java/pom.xml
@@ -65,18 +65,17 @@
         <junit5.version>5.12.2</junit5.version>
         <mockito.version>5.17.0</mockito.version>
 
-        <!-- Jacoco version -->
-        <jacoco.version>0.8.10</jacoco.version>
-
         <!-- Maven plugin versions -->
         <maven.antrun.version>3.1.0</maven.antrun.version>
-        <maven.compiler.version>3.12.1</maven.compiler.version>
-        <maven.dependency.version>3.6.1</maven.dependency.version>
-        <maven.jar.version>3.3.0</maven.jar.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
+        <maven.dependency.version>3.8.1</maven.dependency.version>
+        <maven.jar.version>3.4.2</maven.jar.version>
         <maven.plugin.version>3.8.2</maven.plugin.version>
-        <maven.surefire.version>3.2.5</maven.surefire.version>
-        <maven.source.version>3.3.0</maven.source.version>
+        <maven.surefire.version>3.5.3</maven.surefire.version>
+        <maven.source.version>3.3.1</maven.source.version>
         <maven.version>3.8.8</maven.version>
+        <central-publishing.maven-plugin.version>0.7.0</central-publishing.maven-plugin.version>
+        <jacoco.maven-plugin.version>0.8.13</jacoco.maven-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -251,7 +250,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
+                <version>${jacoco.maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>jacoco-initialize</id>
@@ -267,7 +266,7 @@
             <plugin>
                 <groupId>org.sonatype.central</groupId>
                 <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.7.0</version>
+                <version>${central-publishing.maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <publishingServerId>central</publishingServerId>
diff --git a/framework/fit/java/fit-dependency/pom.xml b/framework/fit/java/fit-dependency/pom.xml
@@ -51,9 +51,9 @@
         <h2.version>2.3.232</h2.version>
 
         <!-- Maven plugin versions -->
-        <maven.gpg.version>3.0.1</maven.gpg.version>
+        <maven.gpg.version>3.2.7</maven.gpg.version>
         <maven.javadoc.version>3.11.2</maven.javadoc.version>
-        <maven.source.version>3.3.0</maven.source.version>
+        <maven.source.version>3.3.1</maven.source.version>
         <central-publishing.maven-plugin.version>0.7.0</central-publishing.maven-plugin.version>
     </properties>
 
diff --git a/framework/fit/java/fit-starters/fit-spring-boot-starter/pom.xml b/framework/fit/java/fit-starters/fit-spring-boot-starter/pom.xml
@@ -26,9 +26,9 @@
         <byte-buddy.version>1.17.5</byte-buddy.version>
 
         <!-- Maven plugin versions -->
-        <maven.gpg.version>3.0.1</maven.gpg.version>
+        <maven.gpg.version>3.2.7</maven.gpg.version>
         <maven.javadoc.version>3.11.2</maven.javadoc.version>
-        <maven.source.version>3.3.0</maven.source.version>
+        <maven.source.version>3.3.1</maven.source.version>
         <central-publishing.maven-plugin.version>0.7.0</central-publishing.maven-plugin.version>
     </properties>
 
diff --git a/framework/fit/java/pom.xml b/framework/fit/java/pom.xml
@@ -70,14 +70,14 @@
         <!-- Maven plugin versions -->
         <maven.antrun.version>3.1.0</maven.antrun.version>
         <maven.compiler.version>3.14.0</maven.compiler.version>
-        <maven.dependency.version>3.6.1</maven.dependency.version>
-        <maven.gpg.version>3.0.1</maven.gpg.version>
-        <maven.jar.version>3.3.0</maven.jar.version>
+        <maven.dependency.version>3.8.1</maven.dependency.version>
+        <maven.gpg.version>3.2.7</maven.gpg.version>
+        <maven.jar.version>3.4.2</maven.jar.version>
         <maven.javadoc.version>3.11.2</maven.javadoc.version>
-        <maven.surefire.version>3.2.5</maven.surefire.version>
-        <maven.source.version>3.3.0</maven.source.version>
+        <maven.surefire.version>3.5.3</maven.surefire.version>
+        <maven.source.version>3.3.1</maven.source.version>
         <central-publishing.maven-plugin.version>0.7.0</central-publishing.maven-plugin.version>
-        <jacoco.maven-plugin.version>0.8.10</jacoco.maven-plugin.version>
+        <jacoco.maven-plugin.version>0.8.13</jacoco.maven-plugin.version>
     </properties>
 
     <dependencyManagement>
diff --git a/framework/ohscript/pom.xml b/framework/ohscript/pom.xml
@@ -62,12 +62,12 @@
 
         <!-- Maven plugin versions -->
         <maven.compiler.version>3.14.0</maven.compiler.version>
-        <maven.gpg.version>3.0.1</maven.gpg.version>
+        <maven.gpg.version>3.2.7</maven.gpg.version>
         <maven.javadoc.version>3.11.2</maven.javadoc.version>
-        <maven.surefire.version>3.2.5</maven.surefire.version>
-        <maven.source.version>3.3.0</maven.source.version>
-        <jacoco.maven.version>0.8.10</jacoco.maven.version>
-        <sonatype.maven.version>0.7.0</sonatype.maven.version>
+        <maven.surefire.version>3.5.3</maven.surefire.version>
+        <maven.source.version>3.3.1</maven.source.version>
+        <central-publishing.maven-plugin.version>0.7.0</central-publishing.maven-plugin.version>
+        <jacoco.maven-plugin.version>0.8.13</jacoco.maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -247,7 +247,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.maven.version}</version>
+                <version>${jacoco.maven-plugin.version}</version>
                 <configuration>
                     <destFile>target/coverage-reports/jacoco-unit.exec</destFile>
                     <dataFile>target/coverage-reports/jacoco-unit.exec</dataFile>
@@ -271,7 +271,7 @@
             <plugin>
                 <groupId>org.sonatype.central</groupId>
                 <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>${sonatype.maven.version}</version>
+                <version>${central-publishing.maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <publishingServerId>central</publishingServerId>
diff --git a/framework/waterflow/java/pom.xml b/framework/waterflow/java/pom.xml
@@ -51,16 +51,15 @@
         <fit.version>3.6.0-SNAPSHOT</fit.version>
         <waterflow.version>1.0.0-SNAPSHOT</waterflow.version>
 
-        <!-- Jacoco version -->
-        <jacoco.version>0.8.10</jacoco.version>
-
         <!-- Maven plugin versions -->
         <maven.antrun.version>3.1.0</maven.antrun.version>
-        <maven.compiler.version>3.12.1</maven.compiler.version>
-        <maven.dependency.version>3.6.1</maven.dependency.version>
-        <maven.jar.version>3.3.0</maven.jar.version>
-        <maven.surefire.version>3.2.5</maven.surefire.version>
-        <maven.source.version>3.3.0</maven.source.version>
+        <maven.compiler.version>3.14.0</maven.compiler.version>
+        <maven.dependency.version>3.8.1</maven.dependency.version>
+        <maven.jar.version>3.4.2</maven.jar.version>
+        <maven.surefire.version>3.5.3</maven.surefire.version>
+        <maven.source.version>3.3.1</maven.source.version>
+        <central-publishing.maven-plugin.version>0.7.0</central-publishing.maven-plugin.version>
+        <jacoco.maven-plugin.version>0.8.13</jacoco.maven-plugin.version>
     </properties>
 
     <dependencyManagement>
@@ -113,7 +112,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>${jacoco.version}</version>
+                <version>${jacoco.maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>jacoco-initialize</id>
@@ -129,7 +128,7 @@
             <plugin>
                 <groupId>org.sonatype.central</groupId>
                 <artifactId>central-publishing-maven-plugin</artifactId>
-                <version>0.7.0</version>
+                <version>${central-publishing.maven-plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <publishingServerId>central</publishingServerId>
