优化各模块之间的版本

didi · Aug 9, 2020 · bae3232 · bae3232
1 parent 9548035
commit bae3232
Show file tree

Hide file tree

Showing 28 changed files with 140 additions and 72 deletions.
diff --git a/README.md b/README.md
@@ -323,5 +323,5 @@ SDS的目标是打造一个简单、易用、可靠的限流、熔断和降级
 
 ## 12. 协议
 
-<img alt="Apache-2.0 license" src="https://lucene.apache.org/images/mantle-power.png" width="128">
+<img alt="Apache-2.0 license" src="https://lucene.apache.org/images/mantle-power.png" width="128"><br />
 SDS 基于 Apache-2.0 协议进行分发和使用，更多信息参见 [协议文件](LICENSE)。
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-base</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>${revision}</version>
 
     <name>SDS</name>
 
@@ -19,6 +19,8 @@
     </modules>
 
     <properties>
+        <revision>1.0.1-SNAPSHOT</revision>
+
         <spring-boot.version>2.1.1.RELEASE</spring-boot.version>
         <apache.dubbo.version>2.7.5</apache.dubbo.version>
         <!-- Plugin dependency -->
@@ -39,6 +41,16 @@
                 <artifactId>sds-easy</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.didiglobal.sds</groupId>
+                <artifactId>sds-dubbo</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.didiglobal.sds</groupId>
+                <artifactId>sds-okhttp</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.didiglobal.sds</groupId>
                 <artifactId>sds-aspectj</artifactId>

diff --git a/sds-admin/pom.xml b/sds-admin/pom.xml
@@ -6,9 +6,13 @@
     <parent>
         <groupId>com.didiglobal.sds</groupId>
         <artifactId>sds-base</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-admin</artifactId>
+
     <name>sds-admin</name>
 
     <url>https://github.com/didi/sds</url>

diff --git a/sds-bootstrap/pom.xml b/sds-bootstrap/pom.xml
@@ -5,10 +5,12 @@
     <parent>
         <groupId>com.didiglobal.sds</groupId>
         <artifactId>sds-base</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
+
 
     <url>https://github.com/didi/sds</url>
 

diff --git a/sds-client/pom.xml b/sds-client/pom.xml
@@ -4,11 +4,15 @@
     <parent>
         <groupId>com.didiglobal.sds</groupId>
         <artifactId>sds-base</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-client</artifactId>
+
     <name>sds-client</name>
 
     <url>https://github.com/didi/sds</url>

diff --git a/sds-easy/pom.xml b/sds-easy/pom.xml
@@ -6,13 +6,14 @@
     <parent>
         <groupId>com.didiglobal.sds</groupId>
         <artifactId>sds-base</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-easy</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
 
     <name>sds-easy</name>
 

diff --git a/sds-example/pom.xml b/sds-example/pom.xml
@@ -3,14 +3,19 @@
 <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">
     <parent>
-        <artifactId>sds-base</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-base</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
+
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-example</artifactId>
 
+    <packaging>pom</packaging>
+
     <name>sds-example</name>
 
     <url>https://github.com/didi/sds</url>
@@ -21,45 +26,4 @@
         <maven.compiler.target>1.7</maven.compiler.target>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>com.didiglobal.sds</groupId>
-            <artifactId>sds-easy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.didiglobal.sds</groupId>
-            <artifactId>sds-aspectj</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.didiglobal.sds</groupId>
-            <artifactId>sds-spring-boot-starter</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context-support</artifactId>
-        </dependency>
-
-    </dependencies>
-
 </project>
diff --git a/sds-example/sds-client-example/pom.xml b/sds-example/sds-client-example/pom.xml
@@ -0,0 +1,68 @@
+<?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">
+    <parent>
+        <groupId>com.didiglobal.sds</groupId>
+        <artifactId>sds-example</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.didiglobal.sds</groupId>
+    <artifactId>sds-example</artifactId>
+
+    <name>sds-example</name>
+
+    <url>https://github.com/didi/sds</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.7</maven.compiler.source>
+        <maven.compiler.target>1.7</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.didiglobal.sds</groupId>
+            <artifactId>sds-easy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.didiglobal.sds</groupId>
+            <artifactId>sds-aspectj</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.didiglobal.sds</groupId>
+            <artifactId>sds-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context-support</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/...al/sds/example/chapter1/UseOriginApi.java → ...al/sds/example/chapter1/UseOriginApi.java b/...al/sds/example/chapter1/UseOriginApi.java → ...al/sds/example/chapter1/UseOriginApi.java
diff --git a/...ple/chapter1/UseOriginApiAndSdsAdmin.java → ...ple/chapter1/UseOriginApiAndSdsAdmin.java b/...ple/chapter1/UseOriginApiAndSdsAdmin.java → ...ple/chapter1/UseOriginApiAndSdsAdmin.java
diff --git a/...mple/chapter2/UserSdsEasyAndSdsAdmin.java → ...mple/chapter2/UserSdsEasyAndSdsAdmin.java b/...mple/chapter2/UserSdsEasyAndSdsAdmin.java → ...mple/chapter2/UserSdsEasyAndSdsAdmin.java
diff --git a/.../example/chapter3/OrderManageService.java → .../example/chapter3/OrderManageService.java b/.../example/chapter3/OrderManageService.java → .../example/chapter3/OrderManageService.java
diff --git a/...mple/chapter3/UseAnnotationByAspectj.java → ...mple/chapter3/UseAnnotationByAspectj.java b/...mple/chapter3/UseAnnotationByAspectj.java → ...mple/chapter3/UseAnnotationByAspectj.java
diff --git a/.../example/chapter4/OrderManageService.java → .../example/chapter4/OrderManageService.java b/.../example/chapter4/OrderManageService.java → .../example/chapter4/OrderManageService.java
diff --git a/...ds/example/chapter4/SdsConfiguration.java → ...ds/example/chapter4/SdsConfiguration.java b/...ds/example/chapter4/SdsConfiguration.java → ...ds/example/chapter4/SdsConfiguration.java
diff --git a/.../example/chapter4/SpringBoootWithSds.java → .../example/chapter4/SpringBoootWithSds.java b/.../example/chapter4/SpringBoootWithSds.java → .../example/chapter4/SpringBoootWithSds.java
diff --git a/...mple/chapter4/SpringBoootWithSdsTest.java → ...mple/chapter4/SpringBoootWithSdsTest.java b/...mple/chapter4/SpringBoootWithSdsTest.java → ...mple/chapter4/SpringBoootWithSdsTest.java
diff --git a/...main/resources/application-dev.properties → ...main/resources/application-dev.properties b/...main/resources/application-dev.properties → ...main/resources/application-dev.properties
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...le/src/main/resources/chapter3-spring.xml → ...le/src/main/resources/chapter3-spring.xml b/...le/src/main/resources/chapter3-spring.xml → ...le/src/main/resources/chapter3-spring.xml
diff --git a/sds-extension/pom.xml b/sds-extension/pom.xml
@@ -3,14 +3,17 @@
          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">
     <parent>
-        <artifactId>sds-base</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-base</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-extension</artifactId>
+
     <packaging>pom</packaging>
 
     <modules>

diff --git a/sds-extension/sds-apache-dubbo/pom.xml b/sds-extension/sds-apache-dubbo/pom.xml
@@ -4,15 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>sds-extension</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-extension</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-apache-dubbo</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-
-    <packaging>jar</packaging>
 
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sds-extension/sds-aspectj/pom.xml b/sds-extension/sds-aspectj/pom.xml
@@ -1,14 +1,16 @@
 <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/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>sds-extension</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-extension</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-aspectj</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>sds-aspectj</name>

diff --git a/sds-extension/sds-dubbo/pom.xml b/sds-extension/sds-dubbo/pom.xml
@@ -4,13 +4,14 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <artifactId>sds-extension</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-extension</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-dubbo</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
 
     <packaging>jar</packaging>
 

diff --git a/sds-extension/sds-okhttp/pom.xml b/sds-extension/sds-okhttp/pom.xml
@@ -4,14 +4,17 @@
          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>
-        <artifactId>sds-extension</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-extension</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
+    <groupId>com.didiglobal.sds</groupId>
+    <artifactId>sds-okhttp</artifactId>
+
     <url>https://github.com/didi/sds</url>
 
-    <artifactId>sds-okhttp</artifactId>
     <dependencies>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>

diff --git a/sds-extension/sds-spring-boot/pom.xml b/sds-extension/sds-spring-boot/pom.xml
@@ -3,9 +3,10 @@
          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">
     <parent>
-        <artifactId>sds-extension</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-extension</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/sds-extension/sds-spring-boot/sds-spring-boot-autoconfigure/pom.xml b/sds-extension/sds-spring-boot/sds-spring-boot-autoconfigure/pom.xml
@@ -3,12 +3,14 @@
 <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">
     <parent>
-        <artifactId>sds-spring-boot</artifactId>
         <groupId>com.didiglobal.sds</groupId>
-        <version>1.0.1-SNAPSHOT</version>
+        <artifactId>sds-spring-boot</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-spring-boot-autoconfigure</artifactId>
     <packaging>jar</packaging>
 

diff --git a/sds-extension/sds-spring-boot/sds-spring-boot-starter/pom.xml b/sds-extension/sds-spring-boot/sds-spring-boot-starter/pom.xml
@@ -5,10 +5,12 @@
     <parent>
         <groupId>com.didiglobal.sds</groupId>
         <artifactId>sds-spring-boot</artifactId>
-        <version>1.0.1-SNAPSHOT</version>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.didiglobal.sds</groupId>
     <artifactId>sds-spring-boot-starter</artifactId>
 
     <url>https://github.com/didi/sds</url>