From 86f010b87e7703f2f409100437712a29b1f43bf1 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Mon, 12 Jul 2021 16:33:32 +0800
Subject: [PATCH] =?UTF-8?q?maven=20=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 buyer-api/pom.xml   |  8 +++---
 common-api/pom.xml  |  5 ++--
 consumer/pom.xml    |  7 ++---
 framework/pom.xml   | 45 ++------------------------------
 manager-api/pom.xml |  5 ++--
 pom.xml             | 62 ++++++++++++++++++++++++++++++++++-----------
 seller-api/pom.xml  |  5 ++--
 7 files changed, 65 insertions(+), 72 deletions(-)

diff --git a/buyer-api/pom.xml b/buyer-api/pom.xml
index 22afda90..42426cbe 100644
--- a/buyer-api/pom.xml
+++ b/buyer-api/pom.xml
@@ -3,21 +3,19 @@
          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>
-        <properties>
-            <enjoy.version>4.3</enjoy.version>
-        </properties>
     <artifactId>buyer-api</artifactId>
     <parent>
         <groupId>cn.lili</groupId>
         <artifactId>lili-shop-parent</artifactId>
-        <version>4.2.0</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.lili</groupId>
             <artifactId>framework</artifactId>
-            <version>4.2.0</version>
+            <version>${revision}</version>
         </dependency>
 
         <dependency>
diff --git a/common-api/pom.xml b/common-api/pom.xml
index fe5a4ae7..0faa13d3 100644
--- a/common-api/pom.xml
+++ b/common-api/pom.xml
@@ -7,7 +7,8 @@
     <parent>
         <groupId>cn.lili</groupId>
         <artifactId>lili-shop-parent</artifactId>
-        <version>4.2.0</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>cn.lili</groupId>
@@ -17,7 +18,7 @@
         <dependency>
             <groupId>cn.lili</groupId>
             <artifactId>framework</artifactId>
-            <version>4.2.0</version>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 
diff --git a/consumer/pom.xml b/consumer/pom.xml
index b9b34c24..f743fae9 100644
--- a/consumer/pom.xml
+++ b/consumer/pom.xml
@@ -8,20 +8,21 @@
     <parent>
         <groupId>cn.lili</groupId>
         <artifactId>lili-shop-parent</artifactId>
-        <version>4.2.0</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.lili</groupId>
             <artifactId>framework</artifactId>
-            <version>4.2.0</version>
+            <version>${revision}</version>
         </dependency>
 
         <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
-            <version>2.2.0</version>
+            <version>${xxl-job}</version>
         </dependency>
     </dependencies>
 
diff --git a/framework/pom.xml b/framework/pom.xml
index de8a3431..ded46f47 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -7,54 +7,13 @@
     <parent>
         <groupId>cn.lili</groupId>
         <artifactId>lili-shop-parent</artifactId>
-        <version>4.2.0</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>framework</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <java.version>1.8</java.version>
-
-        <swagger-bootstrap-ui-version>1.9.6</swagger-bootstrap-ui-version>
-        <alipay-sdk-version>4.13.40.ALL</alipay-sdk-version>
-        <mysql-connector-version>5.1.48</mysql-connector-version>
-        <mybatis-plus-version>3.3.1.tmp</mybatis-plus-version>
-        <Hutool-version>5.5.8</Hutool-version>
-        <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
-        <jasypt-version>3.0.0</jasypt-version>
-        <neetl-version>2.9.10</neetl-version>
-        <lombok-version>1.18.10</lombok-version>
-        <minio-version>6.0.11</minio-version>
-        <aliyun-version>4.5.18</aliyun-version>
-        <aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
-        <aliyun-sdk-dysms-version>2.0.1</aliyun-sdk-dysms-version>
-        <rocketmq-version>2.1.1</rocketmq-version>
-        <jwt-version>0.10.7</jwt-version>
-        <antlr4-runtime-version>4.7.2</antlr4-runtime-version>
-        <sharding-jdbc-version>4.0.0</sharding-jdbc-version>
-        <druid-version>1.1.20</druid-version>
-        <simple-http-version>1.0.3</simple-http-version>
-        <antlr4-version>4.7.2</antlr4-version>
-        <okhttp-version>4.4.1</okhttp-version>
-        <httpclient-version>4.5.12</httpclient-version>
-        <beetl-version>2.9.10</beetl-version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <skipTests>true</skipTests>
-        <knife4j.version>2.0.8</knife4j.version>
-        <de.codecentric>2.3.1</de.codecentric>
-        <userAgentUtils>1.21</userAgentUtils>
-        <interceptor-api>1.2</interceptor-api>
-        <poi-version>4.1.2</poi-version>
-        <poi-ooxml-version>4.1.2</poi-ooxml-version>
-        <logstash-logback-encoder>6.6</logstash-logback-encoder>
-        <zxing>3.4.1</zxing>
-        <slf4j-api>1.7.28</slf4j-api>
-        <xk-time>2.2.0</xk-time>
-        <commons-text>1.4</commons-text>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/manager-api/pom.xml b/manager-api/pom.xml
index f896a62f..f2b40c40 100644
--- a/manager-api/pom.xml
+++ b/manager-api/pom.xml
@@ -8,14 +8,15 @@
     <parent>
         <groupId>cn.lili</groupId>
         <artifactId>lili-shop-parent</artifactId>
-        <version>4.2.0</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.lili</groupId>
             <artifactId>framework</artifactId>
-            <version>4.2.0</version>
+            <version>${revision}</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index c40ec9a4..6aadc57b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,16 +8,61 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>2.3.4.RELEASE</version>
+        <relativePath/>
     </parent>
 
     <groupId>cn.lili</groupId>
     <artifactId>lili-shop-parent</artifactId>
-    <version>4.2.0</version>
+    <version>${revision}</version>
+    <packaging>pom</packaging>
 
     <properties>
+        <java.version>1.8</java.version>
+        <revision>4.2.0</revision>
         <docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry>
         <images-version>0.0.1</images-version>
+        <swagger-bootstrap-ui-version>1.9.6</swagger-bootstrap-ui-version>
+        <alipay-sdk-version>4.13.40.ALL</alipay-sdk-version>
+        <mysql-connector-version>5.1.48</mysql-connector-version>
+        <mybatis-plus-version>3.3.1.tmp</mybatis-plus-version>
+        <Hutool-version>5.5.8</Hutool-version>
+        <TinyPinyin-verions>2.0.3.RELEASE</TinyPinyin-verions>
+        <jasypt-version>3.0.0</jasypt-version>
+        <neetl-version>2.9.10</neetl-version>
+        <lombok-version>1.18.10</lombok-version>
+        <minio-version>6.0.11</minio-version>
+        <aliyun-version>4.5.18</aliyun-version>
+        <aliyun-sdk-oss-version>3.11.1</aliyun-sdk-oss-version>
+        <aliyun-sdk-dysms-version>2.0.1</aliyun-sdk-dysms-version>
+        <rocketmq-version>2.1.1</rocketmq-version>
+        <jwt-version>0.10.7</jwt-version>
+        <antlr4-runtime-version>4.7.2</antlr4-runtime-version>
+        <sharding-jdbc-version>4.0.0</sharding-jdbc-version>
+        <druid-version>1.1.20</druid-version>
+        <simple-http-version>1.0.3</simple-http-version>
+        <antlr4-version>4.7.2</antlr4-version>
+        <okhttp-version>4.4.1</okhttp-version>
+        <httpclient-version>4.5.12</httpclient-version>
+        <beetl-version>2.9.10</beetl-version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <skipTests>true</skipTests>
+        <knife4j.version>2.0.8</knife4j.version>
+        <de.codecentric>2.3.1</de.codecentric>
+        <userAgentUtils>1.21</userAgentUtils>
+        <interceptor-api>1.2</interceptor-api>
+        <poi-version>4.1.2</poi-version>
+        <poi-ooxml-version>4.1.2</poi-ooxml-version>
+        <logstash-logback-encoder>6.6</logstash-logback-encoder>
+        <zxing>3.4.1</zxing>
+        <slf4j-api>1.7.28</slf4j-api>
+        <xk-time>2.2.0</xk-time>
+        <commons-text>1.4</commons-text>
+        <enjoy.version>4.3</enjoy.version>
+        <xxl-job>2.3.0</xxl-job>
+        <spotify>1.2.2</spotify>
     </properties>
+
     <modules>
         <module>framework</module>
         <module>buyer-api</module>
@@ -28,25 +73,12 @@
         <module>admin</module>
     </modules>
 
-
-    <packaging>pom</packaging>
-
     <build>
         <plugins>
-            <!--版本号统一修改-->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>versions-maven-plugin</artifactId>
-                <version>2.7</version>
-                <configuration>
-                    <generateBackupPoms>false</generateBackupPoms>
-                </configuration>
-            </plugin>
-
             <plugin>
                 <groupId>com.spotify</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.2</version>
+                <version>${spotify}</version>
                 <configuration>
                     <imageName>${docker-registry}/${project.build.finalName}:${images-version}</imageName>
                     <baseImage>java</baseImage>
diff --git a/seller-api/pom.xml b/seller-api/pom.xml
index 9efa6d45..0e9b7798 100644
--- a/seller-api/pom.xml
+++ b/seller-api/pom.xml
@@ -8,14 +8,15 @@
     <parent>
         <groupId>cn.lili</groupId>
         <artifactId>lili-shop-parent</artifactId>
-        <version>4.2.0</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
             <groupId>cn.lili</groupId>
             <artifactId>framework</artifactId>
-            <version>4.2.0</version>
+            <version>${revision}</version>
         </dependency>
     </dependencies>