From c1310267f504b6eebc88d47fe6e2f1004fe8fc60 Mon Sep 17 00:00:00 2001
From: Ian Luo <ian.luo@gmail.com>
Date: Mon, 29 Oct 2018 15:32:16 +0800
Subject: [PATCH] fix pom for protostuff serialization (#2700)

---
 dubbo-all/pom.xml                                 | 10 +++++++++-
 dubbo-bom/pom.xml                                 |  5 +++++
 dubbo-dependencies-bom/pom.xml                    | 15 +++++++++++++--
 dubbo-distribution/pom.xml                        |  7 ++++++-
 .../dubbo-serialization-protostuff/pom.xml        |  6 ------
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index f26a1e26bd47..8e8fa661fb59 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -318,6 +318,13 @@
             <scope>compile</scope>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-serialization-protostuff</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo-bootstrap</artifactId>
@@ -431,6 +438,7 @@
                                     <include>org.apache.dubbo:dubbo-serialization-fst</include>
                                     <include>org.apache.dubbo:dubbo-serialization-kryo</include>
                                     <include>org.apache.dubbo:dubbo-serialization-jdk</include>
+                                    <include>org.apache.dubbo:dubbo-serialization-protostuff</include>
                                     <include>org.apache.dubbo:dubbo-bootstrap</include>
                                 </includes>
                             </artifactSet>
@@ -595,4 +603,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-bom/pom.xml b/dubbo-bom/pom.xml
index 0bf81218d6aa..15c8ae84b5a9 100644
--- a/dubbo-bom/pom.xml
+++ b/dubbo-bom/pom.xml
@@ -278,6 +278,11 @@
                 <artifactId>dubbo-serialization-kryo</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.dubbo</groupId>
+                <artifactId>dubbo-serialization-protostuff</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.dubbo</groupId>
                 <artifactId>dubbo-bootstrap</artifactId>
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 8a0738e62608..c95f748a7f26 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -98,6 +98,7 @@
         <kryo_version>4.0.1</kryo_version>
         <kryo_serializers_version>0.42</kryo_serializers_version>
         <fst_version>2.48-jdk-6</fst_version>
+        <protostuff_version>1.5.9</protostuff_version>
 
         <rs_api_version>2.0</rs_api_version>
         <resteasy_version>3.0.19.Final</resteasy_version>
@@ -160,7 +161,7 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>${httpcore_version}</version>            
+                <version>${httpcore_version}</version>
             </dependency>
             <dependency>
                 <groupId>com.alibaba</groupId>
@@ -267,6 +268,16 @@
                 <artifactId>fst</artifactId>
                 <version>${fst_version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.protostuff</groupId>
+                <artifactId>protostuff-core</artifactId>
+                <version>${protostuff_version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.protostuff</groupId>
+                <artifactId>protostuff-runtime</artifactId>
+                <version>${protostuff_version}</version>
+            </dependency>
             <dependency>
                 <groupId>javax.ws.rs</groupId>
                 <artifactId>javax.ws.rs-api</artifactId>
@@ -428,4 +439,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml
index d8d53ecf2e30..4611320fab7c 100644
--- a/dubbo-distribution/pom.xml
+++ b/dubbo-distribution/pom.xml
@@ -235,6 +235,11 @@
             <artifactId>dubbo-serialization-kryo</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-serialization-protostuff</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.dubbo</groupId>
             <artifactId>dubbo</artifactId>
@@ -309,4 +314,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/dubbo-serialization/dubbo-serialization-protostuff/pom.xml b/dubbo-serialization/dubbo-serialization-protostuff/pom.xml
index 80b3769fc580..cd1b644000d0 100644
--- a/dubbo-serialization/dubbo-serialization-protostuff/pom.xml
+++ b/dubbo-serialization/dubbo-serialization-protostuff/pom.xml
@@ -32,7 +32,6 @@ limitations under the License.
 
     <properties>
         <protostuff.version>1.5.9</protostuff.version>
-        <objenesis.version>2.6</objenesis.version>
     </properties>
 
     <dependencies>
@@ -51,11 +50,6 @@ limitations under the License.
             <artifactId>protostuff-runtime</artifactId>
             <version>${protostuff.version}</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>org.objenesis</groupId>-->
-            <!--<artifactId>objenesis</artifactId>-->
-            <!--<version>${objenesis.version}</version>-->
-        <!--</dependency>-->
     </dependencies>
 
 </project>