Merge branch '3.5.x'

CodeCasterX · CodeCasterX · commit e8f2a31d38c7 · 2025-04-24T23:27:33.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -6,4 +6,5 @@
 .vscode/
 
 # Common
-target/
+target/
+build/
diff --git a/framework/fit/java/fit-aop/fit-aop-aspect/pom.xml b/framework/fit/java/fit-aop/fit-aop-aspect/pom.xml
@@ -58,7 +58,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-aop/fit-aop-bytebuddy/pom.xml b/framework/fit/java/fit-aop/fit-aop-bytebuddy/pom.xml
@@ -68,7 +68,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>../../target/third-party/</outputDirectory>
+                            <outputDirectory>../../../../../build/third-party/</outputDirectory>
                             <includeScope>runtime</includeScope>
                             <excludeGroupIds>org.fitframework</excludeGroupIds>
                         </configuration>
@@ -79,7 +79,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-aop/fit-aop/pom.xml b/framework/fit/java/fit-aop/fit-aop/pom.xml
@@ -54,7 +54,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-api/pom.xml b/framework/fit/java/fit-api/pom.xml
@@ -46,7 +46,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target/shared/</outputDirectory>
+                    <outputDirectory>../../../../build/shared/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-broker/pom.xml b/framework/fit/java/fit-broker/pom.xml
@@ -83,7 +83,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>../target/shared/</outputDirectory>
+                            <outputDirectory>../../../../build/shared/</outputDirectory>
                             <includeGroupIds>org.fitframework.service</includeGroupIds>
                             <includeScope>runtime</includeScope>
                         </configuration>
@@ -94,7 +94,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-actuator/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-actuator/pom.xml
@@ -64,7 +64,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-client-http/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-client-http/pom.xml
@@ -69,7 +69,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-dynamic-plugin-directory/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-dynamic-plugin-directory/pom.xml
@@ -51,7 +51,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-heartbeat-client/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-heartbeat-client/pom.xml
@@ -57,7 +57,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-http-client-okhttp/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-http-client-okhttp/pom.xml
@@ -64,7 +64,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-http-handler-registry/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-http-handler-registry/pom.xml
@@ -61,7 +61,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-http-openapi3-swagger/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-http-openapi3-swagger/pom.xml
@@ -51,7 +51,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-http-server-netty/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-http-server-netty/pom.xml
@@ -96,7 +96,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-logger/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-logger/pom.xml
@@ -72,7 +72,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-message-serializer-cbor/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-message-serializer-cbor/pom.xml
@@ -77,7 +77,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-message-serializer-json-jackson/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-message-serializer-json-jackson/pom.xml
@@ -89,7 +89,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-security-simple/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-security-simple/pom.xml
@@ -40,7 +40,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-server-http/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-server-http/pom.xml
@@ -69,7 +69,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-service-coordination-locator/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-service-coordination-locator/pom.xml
@@ -61,7 +61,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-service-coordination-simple/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-service-coordination-simple/pom.xml
@@ -65,7 +65,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-service-discovery/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-service-discovery/pom.xml
@@ -61,7 +61,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-service-registry/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-service-registry/pom.xml
@@ -73,7 +73,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/pom.xml b/framework/fit/java/fit-builtin/plugins/fit-value-fastjson/pom.xml
@@ -73,7 +73,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../../../target/plugins"/>
+                                      todir="../../../../../../build/plugins"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-conf/fit-conf-yaml/pom.xml b/framework/fit/java/fit-conf/fit-conf-yaml/pom.xml
@@ -68,7 +68,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>../../target/third-party/</outputDirectory>
+                            <outputDirectory>../../../../../build/third-party/</outputDirectory>
                             <includeScope>runtime</includeScope>
                             <excludeGroupIds>org.fitframework</excludeGroupIds>
                         </configuration>
@@ -79,7 +79,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-conf/fit-conf/pom.xml b/framework/fit/java/fit-conf/fit-conf/pom.xml
@@ -50,7 +50,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-extension/fit-validation-hibernate/pom.xml b/framework/fit/java/fit-extension/fit-validation-hibernate/pom.xml
@@ -70,7 +70,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>../../target/shared/</outputDirectory>
+                            <outputDirectory>../../../../../build/shared/</outputDirectory>
                             <includeGroupIds>jakarta.validation</includeGroupIds>
                         </configuration>
                     </execution>
diff --git a/framework/fit/java/fit-ioc/fit-ioc/pom.xml b/framework/fit/java/fit-ioc/fit-ioc/pom.xml
@@ -54,7 +54,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-launcher/pom.xml b/framework/fit/java/fit-launcher/pom.xml
@@ -22,7 +22,7 @@
         <resources>
             <resource>
                 <directory>src/main/resources/bin/</directory>
-                <targetPath>${project.basedir}/../target/bin/</targetPath>
+                <targetPath>${project.basedir}/../../../../build/bin/</targetPath>
             </resource>
         </resources>
         <plugins>
@@ -62,7 +62,7 @@
                         <configuration>
                             <target>
                                 <copy file="${project.build.directory}/${project.build.finalName}.jar"
-                                      todir="../target"/>
+                                      todir="../../../../build"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-log/fit-log-console/pom.xml b/framework/fit/java/fit-log/fit-log-console/pom.xml
@@ -50,7 +50,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-plugin/pom.xml b/framework/fit/java/fit-plugin/pom.xml
@@ -62,7 +62,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-reactor/pom.xml b/framework/fit/java/fit-reactor/pom.xml
@@ -52,7 +52,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target/shared/</outputDirectory>
+                    <outputDirectory>../../../../build/shared/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
diff --git a/framework/fit/java/fit-runtime/pom.xml b/framework/fit/java/fit-runtime/pom.xml
@@ -78,7 +78,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target/lib/</outputDirectory>
+                    <outputDirectory>../../../../build/lib/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
@@ -95,7 +95,7 @@
                         <configuration>
                             <target>
                                 <copy file="src/main/resources/fitframework.yml"
-                                      todir="../target/conf"/>
+                                      todir="../../../../build/conf"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/framework/fit/java/fit-util/pom.xml b/framework/fit/java/fit-util/pom.xml
@@ -57,7 +57,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <outputDirectory>../target/shared/</outputDirectory>
+                    <outputDirectory>../../../../build/shared/</outputDirectory>
                     <archive>
                         <manifestEntries>
                             <Created-By>FIT Lab</Created-By>
