Merge pull request apache#1389, refactor dubbo deployment process

Fixes apache#1322
zonghaishang · Mar 6, 2018 · 4a5c5e2 · 4a5c5e2
1 parent b626432
commit 4a5c5e2
Show file tree

Hide file tree

Showing 294 changed files with 16,319 additions and 7,766 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -132,7 +132,7 @@ limitations under the License.
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>dubbo-rpc-default</artifactId>
+            <artifactId>dubbo-rpc-dubbo</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
@@ -277,10 +277,52 @@ limitations under the License.
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-serialization-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-serialization-fastjson</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-serialization-fst</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-serialization-hessian2</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-serialization-jdk</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>dubbo-serialization-kryo</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>hessian-lite</artifactId>
-            <version>3.2.1-fixed-2</version>
+            <version>3.2.2</version>
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
@@ -361,7 +403,7 @@ limitations under the License.
                                     <include>com.alibaba:dubbo-remoting-http</include>
                                     <include>com.alibaba:dubbo-remoting-zookeeper</include>
                                     <include>com.alibaba:dubbo-rpc-api</include>
-                                    <include>com.alibaba:dubbo-rpc-default</include>
+                                    <include>com.alibaba:dubbo-rpc-dubbo</include>
                                     <include>com.alibaba:dubbo-rpc-injvm</include>
                                     <include>com.alibaba:dubbo-rpc-rmi</include>
                                     <include>com.alibaba:dubbo-rpc-hessian</include>
@@ -388,6 +430,12 @@ limitations under the License.
                                     <include>com.alibaba:dubbo-container-log4j</include>
                                     <include>com.alibaba:dubbo-container-logback</include>
                                     <include>com.alibaba:dubbo-qos</include>
+                                    <include>com.alibaba:dubbo-serialization-api</include>
+                                    <include>com.alibaba:dubbo-serialization-fastjson</include>
+                                    <include>com.alibaba:dubbo-serialization-hessian2</include>
+                                    <include>com.alibaba:dubbo-serialization-fst</include>
+                                    <include>com.alibaba:dubbo-serialization-kryo</include>
+                                    <include>com.alibaba:dubbo-serialization-jdk</include>
                                 </includes>
                             </artifactSet>
                             <transformers>

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -150,7 +150,7 @@
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
-                <artifactId>dubbo-rpc-default</artifactId>
+                <artifactId>dubbo-rpc-dubbo</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
@@ -253,10 +253,40 @@
                 <artifactId>dubbo-qos</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dubbo-serialization-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dubbo-serialization-fastjson</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dubbo-serialization-fst</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dubbo-serialization-hessian2</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dubbo-serialization-jdk</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>dubbo-serialization-kryo</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>hessian-lite</artifactId>
-                <version>3.2.1-fixed-2</version>
+                <version>3.2.2</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml
@@ -27,7 +27,7 @@
     <name>${project.artifactId}</name>
     <description>The cluster module of dubbo project</description>
     <properties>
-        <skip_maven_deploy>true</skip_maven_deploy>
+        <skip_maven_deploy>false</skip_maven_deploy>
     </properties>
     <dependencies>
         <dependency>

diff --git a/...ter/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/availablerule.javascript b/...ter/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/availablerule.javascript
diff --git a/...luster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/methodrule.javascript b/...luster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/methodrule.javascript
diff --git a/.../src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/notAvailablerule.javascript b/.../src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/notAvailablerule.javascript
diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
     <name>${project.artifactId}</name>
     <description>The common module of dubbo project</description>
     <properties>
-        <skip_maven_deploy>true</skip_maven_deploy>
+        <skip_maven_deploy>false</skip_maven_deploy>
     </properties>
     <dependencies>
         <dependency>
@@ -51,7 +51,7 @@ limitations under the License.
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>hessian-lite</artifactId>
-            <version>3.2.1-fixed-2</version>
+            <version>3.2.2</version>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>