From 6c3da7536e843ac361fafec2a1a855cc61e38f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zhourui=20=E5=91=A8=E9=94=90?= <zhourui@axzo.cn>
Date: Sat, 27 Aug 2022 13:32:22 +0800
Subject: [PATCH] =?UTF-8?q?Maven=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |   3 +-
 oss-client/pom.xml                            |  88 +-----
 oss-common/pom.xml                            |  19 +-
 oss-dal/pom.xml                               |  22 +-
 oss-http-api/pom.xml                          |  26 +-
 oss-integration/pom.xml                       |  17 +-
 oss-manager-api/pom.xml                       |  22 +-
 oss-manager/pom.xml                           |  30 +-
 oss-service-api/pom.xml                       |  22 +-
 oss-service/pom.xml                           |  22 +-
 .../cn/axzo/oss/test/FileServiceTest.java     |   0
 .../cn/axzo/oss/test/base/SpringTestBase.java |   0
 .../java/cn/axzo/oss/test/package-info.java   |   0
 oss-test/pom.xml                              |  36 ---
 pom.xml                                       | 298 ++++++------------
 15 files changed, 158 insertions(+), 447 deletions(-)
 rename {oss-test => oss-service}/src/test/java/cn/axzo/oss/test/FileServiceTest.java (100%)
 rename {oss-test => oss-service}/src/test/java/cn/axzo/oss/test/base/SpringTestBase.java (100%)
 rename {oss-test => oss-service}/src/test/java/cn/axzo/oss/test/package-info.java (100%)
 delete mode 100644 oss-test/pom.xml

diff --git a/.gitignore b/.gitignore
index 33dedbb..3f5e55b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ logs/
 .DS_Store
 Thumbs.db
 
-*.class
\ No newline at end of file
+*.class
+.factorypath
diff --git a/oss-client/pom.xml b/oss-client/pom.xml
index cfee4f0..f3cd92e 100644
--- a/oss-client/pom.xml
+++ b/oss-client/pom.xml
@@ -1,24 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<groupId>cn.axzo.oss</groupId>
 		<artifactId>oss</artifactId>
 		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>oss-client</artifactId>
 
+	<properties>
+		<maven.deploy.skip>true</maven.deploy.skip>
+		<maven.install.skip>true</maven.install.skip>
+	</properties>
+
 	<dependencies>
+		<dependency>
+			<groupId>cn.axzo.framework</groupId>
+			<artifactId>axzo-core</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-service</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-http-api</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -27,12 +38,6 @@
 		<dependency>
 			<groupId>com.alibaba.cloud</groupId>
 			<artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>guava</artifactId>
-					<groupId>com.google.guava</groupId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -44,54 +49,6 @@
 		</dependency>
 	</dependencies>
 
-	<profiles>
-		<!--本地环境 -->
-		<profile>
-			<id>local</id>
-			<properties>
-				<activatedProperties>local</activatedProperties>
-			</properties>
-		</profile>
-		<!--开发环境 -->
-		<profile>
-			<id>dev</id>
-			<properties>
-				<activatedProperties>dev</activatedProperties>
-			</properties>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
-		</profile>
-		<!--测试环境 -->
-		<profile>
-			<id>test</id>
-			<properties>
-				<activatedProperties>test</activatedProperties>
-			</properties>
-		</profile>
-		<!--test1 环境 -->
-		<profile>
-			<id>test1</id>
-			<properties>
-				<activatedProperties>test1</activatedProperties>
-			</properties>
-		</profile>
-		<!--预发布环境 -->
-		<profile>
-			<id>pre</id>
-			<properties>
-				<activatedProperties>pre</activatedProperties>
-			</properties>
-		</profile>
-		<!--生产环境 -->
-		<profile>
-			<id>master</id>
-			<properties>
-				<activatedProperties>master</activatedProperties>
-			</properties>
-		</profile>
-	</profiles>
-
 	<build>
 		<finalName>oss-client</finalName>
 		<plugins>
@@ -99,21 +56,6 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.8</source>
-					<target>1.8</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>
 
diff --git a/oss-common/pom.xml b/oss-common/pom.xml
index 9d994ed..9107374 100644
--- a/oss-common/pom.xml
+++ b/oss-common/pom.xml
@@ -6,13 +6,15 @@
 		<groupId>cn.axzo.oss</groupId>
 		<artifactId>oss</artifactId>
 		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
+	
 	<artifactId>oss-common</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>cn.axzo.framework</groupId>
-			<artifactId>common-common</artifactId>
+			<artifactId>axzo-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.skywalking</groupId>
@@ -35,7 +37,7 @@
 			<artifactId>validation-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 		<dependency>
@@ -76,17 +78,4 @@
 		</dependency>
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/oss-dal/pom.xml b/oss-dal/pom.xml
index bca3bbd..7cce78c 100644
--- a/oss-dal/pom.xml
+++ b/oss-dal/pom.xml
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<groupId>cn.axzo.oss</groupId>
 		<artifactId>oss</artifactId>
 		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
-	<artifactId>oss-dal</artifactId>
 
+	<artifactId>oss-dal</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-common</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>mysql</groupId>
@@ -42,17 +45,4 @@
 		</dependency>
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/oss-http-api/pom.xml b/oss-http-api/pom.xml
index e27ae98..478fbf9 100644
--- a/oss-http-api/pom.xml
+++ b/oss-http-api/pom.xml
@@ -9,6 +9,7 @@
         <groupId>cn.axzo.oss</groupId>
         <artifactId>oss</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>oss-http-api</artifactId>
@@ -16,45 +17,24 @@
     <dependencies>
         <dependency>
             <groupId>cn.axzo.framework</groupId>
-            <artifactId>common-common</artifactId>
+            <artifactId>axzo-common</artifactId>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-openfeign-core</artifactId>
-            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/oss-integration/pom.xml b/oss-integration/pom.xml
index 7e38567..7f7d8e9 100644
--- a/oss-integration/pom.xml
+++ b/oss-integration/pom.xml
@@ -2,18 +2,20 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <groupId>cn.axzo.oss</groupId>
         <artifactId>oss</artifactId>
         <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+    
     <artifactId>oss-integration</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>cn.axzo.oss</groupId>
             <artifactId>oss-common</artifactId>
-            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -25,17 +27,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>
diff --git a/oss-manager-api/pom.xml b/oss-manager-api/pom.xml
index 1afe9ef..c76ed1c 100644
--- a/oss-manager-api/pom.xml
+++ b/oss-manager-api/pom.xml
@@ -1,37 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<groupId>cn.axzo.oss</groupId>
 		<artifactId>oss</artifactId>
 		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>oss-manager-api</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-common</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-dal</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/oss-manager/pom.xml b/oss-manager/pom.xml
index 2828746..b2aa003 100644
--- a/oss-manager/pom.xml
+++ b/oss-manager/pom.xml
@@ -1,42 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.axzo.oss</groupId>
-		<artifactId>oss</artifactId>
-		<version>${revision}</version>
-	</parent>
+
+
+    <parent>
+        <groupId>cn.axzo.oss</groupId>
+        <artifactId>oss</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
 	<artifactId>oss-manager</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-dal</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-manager-api</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-integration</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/oss-service-api/pom.xml b/oss-service-api/pom.xml
index 5e84885..a69251c 100644
--- a/oss-service-api/pom.xml
+++ b/oss-service-api/pom.xml
@@ -1,37 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<groupId>cn.axzo.oss</groupId>
 		<artifactId>oss</artifactId>
 		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>oss-service-api</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-common</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-manager-api</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/oss-service/pom.xml b/oss-service/pom.xml
index 730bcc3..9a60c8f 100644
--- a/oss-service/pom.xml
+++ b/oss-service/pom.xml
@@ -1,37 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+
 	<parent>
 		<groupId>cn.axzo.oss</groupId>
 		<artifactId>oss</artifactId>
 		<version>${revision}</version>
+		<relativePath>../pom.xml</relativePath>
 	</parent>
+
 	<artifactId>oss-service</artifactId>
 
 	<dependencies>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-service-api</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>cn.axzo.oss</groupId>
 			<artifactId>oss-manager</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
 
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
 </project>
diff --git a/oss-test/src/test/java/cn/axzo/oss/test/FileServiceTest.java b/oss-service/src/test/java/cn/axzo/oss/test/FileServiceTest.java
similarity index 100%
rename from oss-test/src/test/java/cn/axzo/oss/test/FileServiceTest.java
rename to oss-service/src/test/java/cn/axzo/oss/test/FileServiceTest.java
diff --git a/oss-test/src/test/java/cn/axzo/oss/test/base/SpringTestBase.java b/oss-service/src/test/java/cn/axzo/oss/test/base/SpringTestBase.java
similarity index 100%
rename from oss-test/src/test/java/cn/axzo/oss/test/base/SpringTestBase.java
rename to oss-service/src/test/java/cn/axzo/oss/test/base/SpringTestBase.java
diff --git a/oss-test/src/test/java/cn/axzo/oss/test/package-info.java b/oss-service/src/test/java/cn/axzo/oss/test/package-info.java
similarity index 100%
rename from oss-test/src/test/java/cn/axzo/oss/test/package-info.java
rename to oss-service/src/test/java/cn/axzo/oss/test/package-info.java
diff --git a/oss-test/pom.xml b/oss-test/pom.xml
deleted file mode 100644
index d5225dd..0000000
--- a/oss-test/pom.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>cn.axzo.oss</groupId>
-		<artifactId>oss</artifactId>
-		<version>${revision}</version>
-	</parent>
-	<artifactId>oss-test</artifactId>
-
-	<dependencies>
-		<dependency>
-			<groupId>cn.axzo.oss</groupId>
-			<artifactId>oss-client</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.8.2</version>
-				<configuration>
-					<skip>true</skip>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
diff --git a/pom.xml b/pom.xml
index 5adde92..be2df58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,210 +1,108 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.4.RELEASE</version>
-        <relativePath/> <!-- lookup parent from repository -->
-    </parent>
+	<parent>
+		<groupId>cn.axzo.infra</groupId>
+		<artifactId>axzo-parent</artifactId>
+		<version>2.4.13</version>
+	</parent>
 
-    <groupId>cn.axzo.oss</groupId>
-    <artifactId>oss</artifactId>
-    <version>${revision}</version>
-    <packaging>pom</packaging>
+	<groupId>cn.axzo.oss</groupId>
+	<artifactId>oss</artifactId>
+	<version>${revision}</version>
+	<packaging>pom</packaging>
 
-    <properties>
-        <!-- axzo jar -->
-        <common-common.version>1.1.4</common-common.version>
-        <apm-toolkit.version>8.5.0</apm-toolkit.version>
-        <!--project version-->
-        <revision>1.0.0</revision>
-        <!-- tools -->
-        <commons-collections4.version>4.4</commons-collections4.version>
-        <commons-lang3.version>3.5</commons-lang3.version>
-        <hutool-all.version>5.5.7</hutool-all.version>
-        <logstash-logback-encoder.version>6.1</logstash-logback-encoder.version>
-        <xxl.job.version>2.2.0</xxl.job.version>
-        <redisson.version>3.13.2</redisson.version>
-        <fastjson.version>1.2.47</fastjson.version>
-        <joda-time.version>2.10.6</joda-time.version>
-        <javax.validation.version>2.0.0.Final</javax.validation.version>
-        <hibernate.validator.version>6.0.16.Final</hibernate.validator.version>
-        <http.client.version>4.5.6</http.client.version>
-        <mybatis-plus.version>3.3.2</mybatis-plus.version>
-        <velocity-engine-core.version>2.0</velocity-engine-core.version>
-        <spring-cloud-alibaba.version>2.2.1.RELEASE</spring-cloud-alibaba.version>
-        <spring-cloud.version>Hoxton.SR6</spring-cloud.version>
-        <commons-codec.version>1.10</commons-codec.version>
-        <aliyun-oss.version>3.10.2</aliyun-oss.version>
-    </properties>
+	<properties>
+		<revision>2.0.0-SNAPSHOT</revision>
+		<axzo-bom.version>2.0.0-SNAPSHOT</axzo-bom.version>
+		<aliyun-oss.version>3.10.2</aliyun-oss.version>
+	</properties>
 
-    <modules>
-        <module>oss-client</module>
-        <module>oss-common</module>
-        <module>oss-dal</module>
-        <module>oss-integration</module>
-        <module>oss-manager</module>
-        <module>oss-manager-api</module>
-        <module>oss-service</module>
-        <module>oss-service-api</module>
-        <module>oss-test</module>
-        <module>oss-http-api</module>
-    </modules>
+	<modules>
+		<module>oss-client</module>
+		<module>oss-common</module>
+		<module>oss-dal</module>
+		<module>oss-integration</module>
+		<module>oss-manager</module>
+		<module>oss-manager-api</module>
+		<module>oss-service</module>
+		<module>oss-service-api</module>
+		<module>oss-http-api</module>
+	</modules>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>cn.axzo.framework</groupId>
-                <artifactId>common-common</artifactId>
-                <version>${common-common.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.skywalking</groupId>
-                <artifactId>apm-toolkit-trace</artifactId>
-                <version>${apm-toolkit.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.skywalking</groupId>
-                <artifactId>apm-toolkit-logback-1.x</artifactId>
-                <version>${apm-toolkit.version}</version>
-            </dependency>
-            <!-- spring cloud -->
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.alibaba.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-dependencies</artifactId>
-                <version>${spring-cloud-alibaba.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <!-- database -->
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-generator</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.baomidou</groupId>
-                <artifactId>mybatis-plus-boot-starter</artifactId>
-                <version>${mybatis-plus.version}</version>
-            </dependency>
-            <!-- tool -->
-            <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time</artifactId>
-                <version>${joda-time.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>net.logstash.logback</groupId>
-                <artifactId>logstash-logback-encoder</artifactId>
-                <version>${logstash-logback-encoder.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>javax.validation</groupId>
-                <artifactId>validation-api</artifactId>
-                <version>${javax.validation.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>${hibernate.validator.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
-                <artifactId>httpclient</artifactId>
-                <version>${http.client.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>cn.hutool</groupId>
-                <artifactId>hutool-all</artifactId>
-                <version>${hutool-all.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.velocity</groupId>
-                <artifactId>velocity-engine-core</artifactId>
-                <version>${velocity-engine-core.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>fastjson</artifactId>
-                <version>${fastjson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-lang3</artifactId>
-                <version>${commons-lang3.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.commons</groupId>
-                <artifactId>commons-collections4</artifactId>
-                <version>${commons-collections4.version}</version>
-            </dependency>
-            <!-- middleware -->
-            <dependency>
-                <groupId>org.redisson</groupId>
-                <artifactId>redisson</artifactId>
-                <version>${redisson.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.xuxueli</groupId>
-                <artifactId>xxl-job-core</artifactId>
-                <version>${xxl.job.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>${commons-codec.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.aliyun.oss</groupId>
-                <artifactId>aliyun-sdk-oss</artifactId>
-                <version>${aliyun-oss.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>cn.axzo.infra</groupId>
+				<artifactId>axzo-bom</artifactId>
+				<version>${axzo-bom.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 
-    <!-- Source attach plugin -->
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>flatten-maven-plugin</artifactId>
-                <version>1.0.0</version>
-                <configuration>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>flatten</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>flatten</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-service</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-service-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-manager</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-common</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-http-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-dal</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-manager-api</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>cn.axzo.oss</groupId>
+				<artifactId>oss-integration</artifactId>
+				<version>${project.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.aliyun.oss</groupId>
+				<artifactId>aliyun-sdk-oss</artifactId>
+				<version>${aliyun-oss.version}</version>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
 
-        </plugins>
-    </build>
+	<dependencies>
+		<!-- 子项目会直接继承的公共依赖 -->
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>cn.axzo.framework</groupId>
+			<artifactId>axzo-test-spring-boot-starter</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 
 </project>