From b26604ffb470b043bd9dbd215617ff94e59aa298 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Fri, 12 Apr 2019 11:33:26 +0800 Subject: [PATCH] use maven CI friendly versions: revision, cherry-pick to 3.x. (#3852) * use maven CI friendly versions: revision * add back mis-deleted files * bump version to 3.0.0-SNAPSHOT --- .mvn/wrapper/maven-wrapper.properties | 2 +- codestyle/checkstyle.xml | 2 +- dubbo-all/pom.xml | 19 +- dubbo-bom/pom.xml | 29 +- dubbo-cluster/pom.xml | 2 +- dubbo-common/pom.xml | 2 +- dubbo-compatible/pom.xml | 2 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 264 +++++++++--------- dubbo-config/pom.xml | 2 +- .../dubbo-configcenter-api/pom.xml | 2 +- .../dubbo-configcenter-apollo/pom.xml | 2 +- .../dubbo-configcenter-consul/pom.xml | 2 +- .../dubbo-configcenter-etcd/pom.xml | 2 +- .../dubbo-configcenter-zookeeper/pom.xml | 2 +- dubbo-configcenter/pom.xml | 2 +- dubbo-container/dubbo-container-api/pom.xml | 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- .../dubbo-container-logback/pom.xml | 2 +- .../dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml | 2 +- .../dubbo-demo-annotation-consumer/pom.xml | 2 +- .../dubbo-demo-annotation-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-annotation/pom.xml | 2 +- .../dubbo-demo-api-consumer/pom.xml | 2 +- .../dubbo-demo-api-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-interface/pom.xml | 2 +- .../dubbo-demo-xml-consumer/pom.xml | 2 +- .../dubbo-demo-xml-provider/pom.xml | 2 +- dubbo-demo/dubbo-demo-xml/pom.xml | 2 +- dubbo-demo/pom.xml | 2 +- dubbo-dependencies-bom/pom.xml | 84 ++++-- .../dubbo-dependencies-zookeeper/pom.xml | 46 ++- dubbo-dependencies/pom.xml | 35 ++- dubbo-distribution/pom.xml | 16 +- .../src/assembly/source-release.xml | 1 + dubbo-filter/dubbo-filter-cache/pom.xml | 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 2 +- .../dubbo-metadata-definition/pom.xml | 2 +- .../dubbo-metadata-report-api/pom.xml | 2 +- .../dubbo-metadata-report-consul/pom.xml | 6 +- .../dubbo-metadata-report-redis/pom.xml | 2 +- .../dubbo-metadata-report-zookeeper/pom.xml | 2 +- dubbo-metadata-report/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-api/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +- dubbo-monitor/pom.xml | 2 +- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 2 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-consul/pom.xml | 6 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-etcd3/pom.xml | 6 +- .../dubbo-registry-multicast/pom.xml | 2 +- dubbo-registry/dubbo-registry-nacos/pom.xml | 150 ++++++++++ dubbo-registry/dubbo-registry-redis/pom.xml | 2 +- .../dubbo-registry-zookeeper/pom.xml | 2 +- dubbo-registry/pom.xml | 3 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-etcd3/pom.xml | 4 +- dubbo-remoting/dubbo-remoting-grizzly/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-http/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-mina/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-netty4/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-p2p/pom.xml | 2 +- .../dubbo-remoting-zookeeper/pom.xml | 12 +- dubbo-remoting/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-api/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-dubbo/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-hessian/pom.xml | 122 ++++---- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml | 61 ++++ dubbo-rpc/dubbo-rpc-memcached/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-redis/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rest/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rmi/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-rsocket/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 3 +- .../dubbo-serialization-api/pom.xml | 22 +- .../dubbo-serialization-avro/pom.xml | 44 +++ .../dubbo-serialization-fastjson/pom.xml | 2 +- .../dubbo-serialization-fst/pom.xml | 2 +- .../dubbo-serialization-hessian2/pom.xml | 2 +- .../dubbo-serialization-jdk/pom.xml | 2 +- .../dubbo-serialization-kryo/pom.xml | 2 +- .../dubbo-serialization-protostuff/pom.xml | 2 +- .../dubbo-serialization-test/pom.xml | 7 +- dubbo-serialization/pom.xml | 3 +- .../dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml | 2 +- dubbo-test/dubbo-test-integration/pom.xml | 2 +- dubbo-test/pom.xml | 11 +- pom.xml | 31 +- 99 files changed, 769 insertions(+), 366 deletions(-) create mode 100644 dubbo-registry/dubbo-registry-nacos/pom.xml create mode 100644 dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml create mode 100644 dubbo-serialization/dubbo-serialization-avro/pom.xml diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 56bb0164ec..0061e751e5 100755 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip \ No newline at end of file +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.0/apache-maven-3.6.0-bin.zip \ No newline at end of file diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml index fa4d735a78..9624bbf38f 100644 --- a/codestyle/checkstyle.xml +++ b/codestyle/checkstyle.xml @@ -9,7 +9,7 @@ - + diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml index a4a0b5cc3c..31b175aeff 100644 --- a/dubbo-all/pom.xml +++ b/dubbo-all/pom.xml @@ -19,11 +19,10 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} ../pom.xml dubbo - 2.7.1-SNAPSHOT jar dubbo-all The all in one project of dubbo @@ -143,6 +142,13 @@ compile true + + org.apache.dubbo + dubbo-rpc-jsonrpc + ${project.version} + compile + true + org.apache.dubbo dubbo-rpc-rmi @@ -332,6 +338,13 @@ compile true + + org.apache.dubbo + dubbo-serialization-avro + ${project.version} + compile + true + org.apache.dubbo dubbo-serialization-protostuff @@ -491,6 +504,7 @@ org.apache.dubbo:dubbo-rpc-api org.apache.dubbo:dubbo-rpc-dubbo org.apache.dubbo:dubbo-rpc-injvm + org.apache.dubbo:dubbo-rpc-jsonrpc org.apache.dubbo:dubbo-rpc-rmi org.apache.dubbo:dubbo-rpc-hessian org.apache.dubbo:dubbo-rpc-http @@ -523,6 +537,7 @@ org.apache.dubbo:dubbo-serialization-hessian2 org.apache.dubbo:dubbo-serialization-fst org.apache.dubbo:dubbo-serialization-kryo + org.apache.dubbo:dubbo-serialization-avro org.apache.dubbo:dubbo-serialization-jdk org.apache.dubbo:dubbo-serialization-protostuff org.apache.dubbo:dubbo-configcenter-api diff --git a/dubbo-bom/pom.xml b/dubbo-bom/pom.xml index 145495bdeb..2ecf2398af 100644 --- a/dubbo-bom/pom.xml +++ b/dubbo-bom/pom.xml @@ -1,4 +1,20 @@ + 4.0.0 @@ -6,12 +22,11 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} org.apache.dubbo dubbo-bom - 2.7.1-SNAPSHOT pom dubbo-bom @@ -158,6 +173,11 @@ dubbo-rpc-injvm ${project.version} + + org.apache.dubbo + dubbo-rpc-jsonrpc + ${project.version} + org.apache.dubbo dubbo-rpc-rmi @@ -303,6 +323,11 @@ dubbo-serialization-protostuff ${project.version} + + org.apache.dubbo + dubbo-serialization-avro + ${project.version} + org.apache.dubbo dubbo-compatible diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 58d0367d87..ff59682d84 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-cluster jar diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml index bd3347f524..98ecc9b87b 100644 --- a/dubbo-common/pom.xml +++ b/dubbo-common/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-common jar diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml index 43d14f9510..3826189591 100644 --- a/dubbo-compatible/pom.xml +++ b/dubbo-compatible/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-compatible jar diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 19c7aca7bb..3a4584d90c 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-config - 2.7.1-SNAPSHOT + ${revision} dubbo-config-api jar diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index 988715baf4..04a8223bcb 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -1,132 +1,132 @@ - - - 4.0.0 - - org.apache.dubbo - dubbo-config - 2.7.1-SNAPSHOT - - dubbo-config-spring - jar - ${project.artifactId} - The spring config module of dubbo project - - false - - - - org.apache.dubbo - dubbo-config-api - ${project.parent.version} - - - org.springframework - spring-beans - - - org.springframework - spring-web - - - org.springframework - spring-context - - - javax.servlet - javax.servlet-api - provided - - - org.apache.dubbo - dubbo-registry-default - ${project.parent.version} - test - - - org.apache.dubbo - dubbo-monitor-default - ${project.parent.version} - test - - - org.apache.dubbo - dubbo-rpc-dubbo - ${project.parent.version} - test - - - org.apache.dubbo - dubbo-rpc-rmi - ${project.parent.version} - test - - - org.apache.dubbo - dubbo-rpc-injvm - ${project.parent.version} - - - org.apache.dubbo - dubbo-remoting-netty4 - ${project.parent.version} - test - - - org.apache.dubbo - dubbo-serialization-hessian2 - ${project.parent.version} - test - - - javax.validation - validation-api - test - - - org.hibernate - hibernate-validator - test - - - org.glassfish - javax.el - test - - - org.springframework - spring-tx - test - - - org.springframework - spring-test - test - - - junit - junit - 4.12 - test - - - org.apache.tomcat.embed - tomcat-embed-core - test - - - + + + 4.0.0 + + org.apache.dubbo + dubbo-config + ${revision} + + dubbo-config-spring + jar + ${project.artifactId} + The spring config module of dubbo project + + false + + + + org.apache.dubbo + dubbo-config-api + ${project.parent.version} + + + org.springframework + spring-beans + + + org.springframework + spring-web + + + org.springframework + spring-context + + + javax.servlet + javax.servlet-api + provided + + + org.apache.dubbo + dubbo-registry-default + ${project.parent.version} + test + + + org.apache.dubbo + dubbo-monitor-default + ${project.parent.version} + test + + + org.apache.dubbo + dubbo-rpc-dubbo + ${project.parent.version} + test + + + org.apache.dubbo + dubbo-rpc-rmi + ${project.parent.version} + test + + + org.apache.dubbo + dubbo-rpc-injvm + ${project.parent.version} + + + org.apache.dubbo + dubbo-remoting-netty4 + ${project.parent.version} + test + + + org.apache.dubbo + dubbo-serialization-hessian2 + ${project.parent.version} + test + + + javax.validation + validation-api + test + + + org.hibernate + hibernate-validator + test + + + org.glassfish + javax.el + test + + + org.springframework + spring-tx + test + + + org.springframework + spring-test + test + + + junit + junit + 4.12 + test + + + org.apache.tomcat.embed + tomcat-embed-core + test + + + diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml index d1f16c146d..bb8518fea9 100644 --- a/dubbo-config/pom.xml +++ b/dubbo-config/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-config pom diff --git a/dubbo-configcenter/dubbo-configcenter-api/pom.xml b/dubbo-configcenter/dubbo-configcenter-api/pom.xml index 7f2715e5b6..bab80eb0fd 100644 --- a/dubbo-configcenter/dubbo-configcenter-api/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-api/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-configcenter - 2.7.1-SNAPSHOT + ${revision} dubbo-configcenter-api jar diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml b/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml index 040b0eb33a..26d2e88fb2 100644 --- a/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-apollo/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-configcenter - 2.7.1-SNAPSHOT + ${revision} dubbo-configcenter-apollo jar diff --git a/dubbo-configcenter/dubbo-configcenter-consul/pom.xml b/dubbo-configcenter/dubbo-configcenter-consul/pom.xml index 2a7580e837..d40ed494df 100644 --- a/dubbo-configcenter/dubbo-configcenter-consul/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-consul/pom.xml @@ -22,7 +22,7 @@ dubbo-configcenter org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-configcenter/dubbo-configcenter-etcd/pom.xml b/dubbo-configcenter/dubbo-configcenter-etcd/pom.xml index 60efc8e4bb..c90c8e2fcf 100644 --- a/dubbo-configcenter/dubbo-configcenter-etcd/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-etcd/pom.xml @@ -22,7 +22,7 @@ dubbo-configcenter org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml b/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml index 5c84f6515a..9f028ce05c 100644 --- a/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-configcenter - 2.7.1-SNAPSHOT + ${revision} dubbo-configcenter-zookeeper jar diff --git a/dubbo-configcenter/pom.xml b/dubbo-configcenter/pom.xml index 92f727d232..c6fb983bb7 100644 --- a/dubbo-configcenter/pom.xml +++ b/dubbo-configcenter/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-configcenter pom diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml index 2c1e9100af..0014da4c2a 100644 --- a/dubbo-container/dubbo-container-api/pom.xml +++ b/dubbo-container/dubbo-container-api/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-container - 2.7.1-SNAPSHOT + ${revision} dubbo-container-api jar diff --git a/dubbo-container/dubbo-container-log4j/pom.xml b/dubbo-container/dubbo-container-log4j/pom.xml index be5a1733a3..a83b66165f 100644 --- a/dubbo-container/dubbo-container-log4j/pom.xml +++ b/dubbo-container/dubbo-container-log4j/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-container - 2.7.1-SNAPSHOT + ${revision} dubbo-container-log4j jar diff --git a/dubbo-container/dubbo-container-logback/pom.xml b/dubbo-container/dubbo-container-logback/pom.xml index 9a1aa47eda..a6f70145fa 100644 --- a/dubbo-container/dubbo-container-logback/pom.xml +++ b/dubbo-container/dubbo-container-logback/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-container - 2.7.1-SNAPSHOT + ${revision} dubbo-container-logback jar diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml index 83298634f2..c7762cd418 100644 --- a/dubbo-container/dubbo-container-spring/pom.xml +++ b/dubbo-container/dubbo-container-spring/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-container - 2.7.1-SNAPSHOT + ${revision} dubbo-container-spring jar diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml index 932899488e..b61d3cf1b9 100644 --- a/dubbo-container/pom.xml +++ b/dubbo-container/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-container pom diff --git a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml index 58e260ed59..7e38ba1b43 100644 --- a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-consumer/pom.xml @@ -22,7 +22,7 @@ dubbo-demo-annotation org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml index bf6bc8fd9d..9e807ce5d4 100644 --- a/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/dubbo-demo-annotation-provider/pom.xml @@ -22,7 +22,7 @@ dubbo-demo-annotation org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-demo/dubbo-demo-annotation/pom.xml b/dubbo-demo/dubbo-demo-annotation/pom.xml index f94870dc56..df69c4c424 100644 --- a/dubbo-demo/dubbo-demo-annotation/pom.xml +++ b/dubbo-demo/dubbo-demo-annotation/pom.xml @@ -22,7 +22,7 @@ dubbo-demo org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 pom diff --git a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml index 947537667b..fd0f62631e 100644 --- a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-consumer/pom.xml @@ -22,7 +22,7 @@ dubbo-demo-api org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml index d2dd9af1c8..095b43093f 100644 --- a/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-api/dubbo-demo-api-provider/pom.xml @@ -22,7 +22,7 @@ dubbo-demo-api org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml index b9088fc4d3..944c76dd50 100644 --- a/dubbo-demo/dubbo-demo-api/pom.xml +++ b/dubbo-demo/dubbo-demo-api/pom.xml @@ -22,7 +22,7 @@ dubbo-demo org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 pom diff --git a/dubbo-demo/dubbo-demo-interface/pom.xml b/dubbo-demo/dubbo-demo-interface/pom.xml index f6376c9157..a5c4b0517d 100644 --- a/dubbo-demo/dubbo-demo-interface/pom.xml +++ b/dubbo-demo/dubbo-demo-interface/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-demo - 2.7.1-SNAPSHOT + ${revision} dubbo-demo-interface jar diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml index 8487459153..7eb47eef78 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-consumer/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-demo-xml - 2.7.1-SNAPSHOT + ${revision} dubbo-demo-xml-consumer jar diff --git a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml index fbd0f04149..81cfe6c9d7 100644 --- a/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/dubbo-demo-xml-provider/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-demo-xml - 2.7.1-SNAPSHOT + ${revision} dubbo-demo-xml-provider jar diff --git a/dubbo-demo/dubbo-demo-xml/pom.xml b/dubbo-demo/dubbo-demo-xml/pom.xml index fbbcae942b..97aa01023b 100644 --- a/dubbo-demo/dubbo-demo-xml/pom.xml +++ b/dubbo-demo/dubbo-demo-xml/pom.xml @@ -22,7 +22,7 @@ dubbo-demo org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 pom diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml index 77d59aebcd..d46e2d99df 100644 --- a/dubbo-demo/pom.xml +++ b/dubbo-demo/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-demo pom diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index 245b6ff61f..135184f269 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -1,19 +1,19 @@ org.apache apache 21 - + org.apache.dubbo dubbo-dependencies-bom - 2.7.1-SNAPSHOT + ${revision} pom dubbo-dependencies-bom @@ -118,6 +118,7 @@ 4.0.1 0.42 2.48-jdk-6 + 1.8.2 1.1.1 1.20 3.8.1 @@ -144,13 +145,17 @@ 2.0.1 2.8.5 + 1.2.0 + 2.0 + 1.1.0 + 3.0.0-SNAPSHOT -org.springframework + org.springframework spring-framework-bom ${spring_version} pom @@ -308,6 +313,11 @@ fst ${fst_version} + + org.apache.avro + avro + ${avro_version} + io.protostuff protostuff-core @@ -535,9 +545,49 @@ gson ${gson_version} + + com.github.briandilley.jsonrpc4j + jsonrpc4j + ${jsonrpc_version} + + + javax.portlet + portlet-api + ${portlet_version} + + + + + org.codehaus.mojo + flatten-maven-plugin + ${maven_flatten_version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + release diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml index 18a3f2abcc..1ff9f7f6ca 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -16,29 +16,32 @@ ~ limitations under the License. --> - + 4.0.0 org.apache apache 21 - + org.apache.dubbo dubbo-dependencies-zookeeper - 2.7.1-SNAPSHOT + ${revision} pom + + 3.0.0-SNAPSHOT + 1.1.0 + + org.apache.dubbo dubbo-dependencies-bom - 2.7.1-SNAPSHOT + ${project.version} pom import @@ -56,6 +59,36 @@ + + + + org.codehaus.mojo + flatten-maven-plugin + ${maven_flatten_version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + + + + release @@ -77,5 +110,4 @@ - diff --git a/dubbo-dependencies/pom.xml b/dubbo-dependencies/pom.xml index 6d144449d5..27cea95f42 100644 --- a/dubbo-dependencies/pom.xml +++ b/dubbo-dependencies/pom.xml @@ -1,28 +1,25 @@ - - + dubbo-parent org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml index b018cec4e5..51f486e80c 100644 --- a/dubbo-distribution/pom.xml +++ b/dubbo-distribution/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-distribution pom @@ -110,6 +110,11 @@ dubbo-rpc-injvm ${project.version} + + org.apache.dubbo + dubbo-rpc-jsonrpc + ${project.version} + org.apache.dubbo dubbo-rpc-rmi @@ -240,6 +245,11 @@ dubbo-serialization-protostuff ${project.version} + + org.apache.dubbo + dubbo-serialization-avro + ${project.version} + org.apache.dubbo dubbo @@ -267,7 +277,7 @@ 3.1.0 - bin-release + bin package single @@ -279,7 +289,7 @@ - source-release + src package single diff --git a/dubbo-distribution/src/assembly/source-release.xml b/dubbo-distribution/src/assembly/source-release.xml index 434377bdd3..344d31c1ef 100644 --- a/dubbo-distribution/src/assembly/source-release.xml +++ b/dubbo-distribution/src/assembly/source-release.xml @@ -50,6 +50,7 @@ **/.mvn/** **/*.jar **/mvnw* + **/.flattened-pom.xml diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml index bec6067478..8241d23f45 100644 --- a/dubbo-filter/dubbo-filter-cache/pom.xml +++ b/dubbo-filter/dubbo-filter-cache/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-filter - 2.7.1-SNAPSHOT + ${revision} dubbo-filter-cache jar diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml index 9ce481061d..51d70aead1 100644 --- a/dubbo-filter/dubbo-filter-validation/pom.xml +++ b/dubbo-filter/dubbo-filter-validation/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-filter - 2.7.1-SNAPSHOT + ${revision} dubbo-filter-validation jar diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml index f985141229..efb95ab8cb 100644 --- a/dubbo-filter/pom.xml +++ b/dubbo-filter/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-filter pom diff --git a/dubbo-metadata-report/dubbo-metadata-definition/pom.xml b/dubbo-metadata-report/dubbo-metadata-definition/pom.xml index 09dc860fb6..6e9a58fa81 100644 --- a/dubbo-metadata-report/dubbo-metadata-definition/pom.xml +++ b/dubbo-metadata-report/dubbo-metadata-definition/pom.xml @@ -18,7 +18,7 @@ dubbo-metadata-report org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-metadata-report/dubbo-metadata-report-api/pom.xml b/dubbo-metadata-report/dubbo-metadata-report-api/pom.xml index 6244d0407f..b892598c80 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-api/pom.xml +++ b/dubbo-metadata-report/dubbo-metadata-report-api/pom.xml @@ -18,7 +18,7 @@ dubbo-metadata-report org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-metadata-report/dubbo-metadata-report-consul/pom.xml b/dubbo-metadata-report/dubbo-metadata-report-consul/pom.xml index ad02eaedda..ad3eb4946e 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-consul/pom.xml +++ b/dubbo-metadata-report/dubbo-metadata-report-consul/pom.xml @@ -16,13 +16,11 @@ ~ limitations under the License. --> - + dubbo-metadata-report org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-metadata-report/dubbo-metadata-report-redis/pom.xml b/dubbo-metadata-report/dubbo-metadata-report-redis/pom.xml index 6f5d418e28..419c77f883 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-redis/pom.xml +++ b/dubbo-metadata-report/dubbo-metadata-report-redis/pom.xml @@ -18,7 +18,7 @@ dubbo-metadata-report org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-metadata-report/dubbo-metadata-report-zookeeper/pom.xml b/dubbo-metadata-report/dubbo-metadata-report-zookeeper/pom.xml index 4f7feb1b22..a276f83b3b 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-zookeeper/pom.xml +++ b/dubbo-metadata-report/dubbo-metadata-report-zookeeper/pom.xml @@ -18,7 +18,7 @@ dubbo-metadata-report org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-metadata-report/pom.xml b/dubbo-metadata-report/pom.xml index aa14d56122..6d47af4737 100644 --- a/dubbo-metadata-report/pom.xml +++ b/dubbo-metadata-report/pom.xml @@ -18,7 +18,7 @@ dubbo-parent org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml index 5d649dc1fa..b5c21aba7e 100644 --- a/dubbo-monitor/dubbo-monitor-api/pom.xml +++ b/dubbo-monitor/dubbo-monitor-api/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-monitor - 2.7.1-SNAPSHOT + ${revision} dubbo-monitor-api jar diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml index a7ae0ecd00..f426214f2c 100644 --- a/dubbo-monitor/dubbo-monitor-default/pom.xml +++ b/dubbo-monitor/dubbo-monitor-default/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-monitor - 2.7.1-SNAPSHOT + ${revision} dubbo-monitor-default jar diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml index 6e0171d303..a6d21a0a55 100644 --- a/dubbo-monitor/pom.xml +++ b/dubbo-monitor/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-monitor pom diff --git a/dubbo-plugin/dubbo-qos/pom.xml b/dubbo-plugin/dubbo-qos/pom.xml index 717c20ceac..0df5abb8c6 100644 --- a/dubbo-plugin/dubbo-qos/pom.xml +++ b/dubbo-plugin/dubbo-qos/pom.xml @@ -18,7 +18,7 @@ org.apache.dubbo dubbo-plugin - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml index e542776024..44b6fe0daf 100644 --- a/dubbo-plugin/pom.xml +++ b/dubbo-plugin/pom.xml @@ -18,7 +18,7 @@ dubbo-parent org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index d96df68084..5a707d0686 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-registry - 2.7.1-SNAPSHOT + ${revision} dubbo-registry-api jar diff --git a/dubbo-registry/dubbo-registry-consul/pom.xml b/dubbo-registry/dubbo-registry-consul/pom.xml index 38647f259a..ec32dbe434 100644 --- a/dubbo-registry/dubbo-registry-consul/pom.xml +++ b/dubbo-registry/dubbo-registry-consul/pom.xml @@ -16,13 +16,11 @@ ~ limitations under the License. --> - + dubbo-registry org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-registry/dubbo-registry-default/pom.xml b/dubbo-registry/dubbo-registry-default/pom.xml index 73bda5ceab..37df8f2ef7 100644 --- a/dubbo-registry/dubbo-registry-default/pom.xml +++ b/dubbo-registry/dubbo-registry-default/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-registry - 2.7.1-SNAPSHOT + ${revision} dubbo-registry-default jar diff --git a/dubbo-registry/dubbo-registry-etcd3/pom.xml b/dubbo-registry/dubbo-registry-etcd3/pom.xml index 00b0ae5390..6d9d60cbd5 100644 --- a/dubbo-registry/dubbo-registry-etcd3/pom.xml +++ b/dubbo-registry/dubbo-registry-etcd3/pom.xml @@ -16,14 +16,12 @@ ~ limitations under the License. --> - + 4.0.0 dubbo-registry org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} dubbo-registry-etcd3 diff --git a/dubbo-registry/dubbo-registry-multicast/pom.xml b/dubbo-registry/dubbo-registry-multicast/pom.xml index 61a8669e8f..643159bddd 100644 --- a/dubbo-registry/dubbo-registry-multicast/pom.xml +++ b/dubbo-registry/dubbo-registry-multicast/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-registry - 2.7.1-SNAPSHOT + ${revision} dubbo-registry-multicast jar diff --git a/dubbo-registry/dubbo-registry-nacos/pom.xml b/dubbo-registry/dubbo-registry-nacos/pom.xml new file mode 100644 index 0000000000..e2a9d02e14 --- /dev/null +++ b/dubbo-registry/dubbo-registry-nacos/pom.xml @@ -0,0 +1,150 @@ + + + + org.apache.dubbo + dubbo-registry + ${revision} + ../pom.xml + + 4.0.0 + + dubbo-registry-nacos + ${project.artifactId} + The Nacos registry module of Dubbo project + + + 1.0.0-RC3 + + + + + + org.apache.dubbo + dubbo-registry-api + ${project.version} + true + + + + org.apache.dubbo + dubbo-common + ${project.version} + true + + + + com.alibaba.nacos + nacos-client + ${nacos.version} + true + + + + + org.apache.dubbo + dubbo-config-api + ${project.version} + test + + + + org.apache.dubbo + dubbo-serialization-hessian2 + ${project.version} + test + + + + org.apache.dubbo + dubbo-config-spring + ${project.version} + test + + + + org.apache.dubbo + dubbo-rpc-dubbo + ${project.version} + test + + + + org.apache.dubbo + dubbo-remoting-netty4 + ${project.version} + test + + + + ch.qos.logback + logback-classic + test + + + + + org.apache.dubbo + dubbo-rpc-rest + ${project.version} + test + + + + org.jboss.resteasy + resteasy-jaxrs + test + + + + org.jboss.resteasy + resteasy-client + test + + + + org.jboss.resteasy + resteasy-netty4 + test + + + + javax.validation + validation-api + test + + + + org.jboss.resteasy + resteasy-jackson-provider + test + + + + org.jboss.resteasy + resteasy-jaxb-provider + test + + + + org.springframework + spring-test + test + + + + \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-redis/pom.xml b/dubbo-registry/dubbo-registry-redis/pom.xml index 7644e1ca85..8144089f35 100644 --- a/dubbo-registry/dubbo-registry-redis/pom.xml +++ b/dubbo-registry/dubbo-registry-redis/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-registry - 2.7.1-SNAPSHOT + ${revision} dubbo-registry-redis jar diff --git a/dubbo-registry/dubbo-registry-zookeeper/pom.xml b/dubbo-registry/dubbo-registry-zookeeper/pom.xml index 2c565d8b1a..3aa13d3fcf 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/pom.xml +++ b/dubbo-registry/dubbo-registry-zookeeper/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-registry - 2.7.1-SNAPSHOT + ${revision} dubbo-registry-zookeeper jar diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml index 33a329bb0f..c9c3441ca2 100644 --- a/dubbo-registry/pom.xml +++ b/dubbo-registry/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-registry pom @@ -36,5 +36,6 @@ dubbo-registry-redis dubbo-registry-consul dubbo-registry-etcd3 + dubbo-registry-nacos diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml index ec278e96e0..6d35681d9f 100644 --- a/dubbo-remoting/dubbo-remoting-api/pom.xml +++ b/dubbo-remoting/dubbo-remoting-api/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-remoting - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-api jar diff --git a/dubbo-remoting/dubbo-remoting-etcd3/pom.xml b/dubbo-remoting/dubbo-remoting-etcd3/pom.xml index 768052f6b1..2f827a9fbb 100644 --- a/dubbo-remoting/dubbo-remoting-etcd3/pom.xml +++ b/dubbo-remoting/dubbo-remoting-etcd3/pom.xml @@ -23,7 +23,7 @@ dubbo-remoting org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-etcd3 jar @@ -49,4 +49,4 @@ - \ No newline at end of file + diff --git a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml index f740422a7a..cd185367fd 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml +++ b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-remoting - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-grizzly jar diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml index 85ea81dff1..9937a19129 100644 --- a/dubbo-remoting/dubbo-remoting-http/pom.xml +++ b/dubbo-remoting/dubbo-remoting-http/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-remoting - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-http jar diff --git a/dubbo-remoting/dubbo-remoting-mina/pom.xml b/dubbo-remoting/dubbo-remoting-mina/pom.xml index a10aacc52d..4808a1781c 100644 --- a/dubbo-remoting/dubbo-remoting-mina/pom.xml +++ b/dubbo-remoting/dubbo-remoting-mina/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-remoting - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-mina jar diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml index cfa826279e..761d37b516 100644 --- a/dubbo-remoting/dubbo-remoting-netty/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-remoting - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-netty jar diff --git a/dubbo-remoting/dubbo-remoting-netty4/pom.xml b/dubbo-remoting/dubbo-remoting-netty4/pom.xml index e17cfe185f..10d7f26fe1 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty4/pom.xml @@ -18,7 +18,7 @@ dubbo-remoting org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-remoting/dubbo-remoting-p2p/pom.xml b/dubbo-remoting/dubbo-remoting-p2p/pom.xml index 238398e4a1..f947606288 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/pom.xml +++ b/dubbo-remoting/dubbo-remoting-p2p/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-remoting - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-p2p jar diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml index 24b14e9bd7..497bc83f94 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-remoting - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting-zookeeper jar @@ -35,10 +35,12 @@ ${project.parent.version} - org.apache.dubbo - dubbo-dependencies-zookeeper - ${project.parent.version} - pom + org.apache.curator + curator-recipes + + + org.apache.zookeeper + zookeeper org.apache.curator diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml index fd17dbf0cd..c95fbfad2e 100644 --- a/dubbo-remoting/pom.xml +++ b/dubbo-remoting/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-remoting pom diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml index 06d17aec9e..aae1c05b6e 100644 --- a/dubbo-rpc/dubbo-rpc-api/pom.xml +++ b/dubbo-rpc/dubbo-rpc-api/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-api jar diff --git a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml index 290f627b36..dc6cd2295f 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml +++ b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-dubbo jar diff --git a/dubbo-rpc/dubbo-rpc-hessian/pom.xml b/dubbo-rpc/dubbo-rpc-hessian/pom.xml index 0eed79d254..99ef99da3c 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc/dubbo-rpc-hessian/pom.xml @@ -1,62 +1,62 @@ - - - 4.0.0 - - org.apache.dubbo - dubbo-rpc - 2.7.1-SNAPSHOT - - dubbo-rpc-hessian - jar - ${project.artifactId} - The hessian rpc module of dubbo project - - false - - - - org.apache.dubbo - dubbo-rpc-api - ${project.parent.version} - - - org.apache.dubbo - dubbo-remoting-http - ${project.parent.version} - - - com.caucho - hessian - - - org.apache.httpcomponents - httpclient - - - org.apache.dubbo - dubbo-serialization-jdk - ${project.parent.version} - test - - - org.springframework - spring-test - test - - + + + 4.0.0 + + org.apache.dubbo + dubbo-rpc + ${revision} + + dubbo-rpc-hessian + jar + ${project.artifactId} + The hessian rpc module of dubbo project + + false + + + + org.apache.dubbo + dubbo-rpc-api + ${project.parent.version} + + + org.apache.dubbo + dubbo-remoting-http + ${project.parent.version} + + + com.caucho + hessian + + + org.apache.httpcomponents + httpclient + + + org.apache.dubbo + dubbo-serialization-jdk + ${project.parent.version} + test + + + org.springframework + spring-test + test + + \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-http/pom.xml b/dubbo-rpc/dubbo-rpc-http/pom.xml index 5ab4d25d15..6681a9a632 100644 --- a/dubbo-rpc/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc/dubbo-rpc-http/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-http jar diff --git a/dubbo-rpc/dubbo-rpc-injvm/pom.xml b/dubbo-rpc/dubbo-rpc-injvm/pom.xml index 9a3de8e080..53ed2ffb4e 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/pom.xml +++ b/dubbo-rpc/dubbo-rpc-injvm/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-injvm jar diff --git a/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml b/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml new file mode 100644 index 0000000000..c5b4e89038 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml @@ -0,0 +1,61 @@ + + + + dubbo-rpc + org.apache.dubbo + ${revision} + + 4.0.0 + + dubbo-rpc-jsonrpc + + The JSON-RPC module of dubbo project + + + false + + + + + org.apache.dubbo + dubbo-rpc-api + ${project.parent.version} + + + org.apache.dubbo + dubbo-remoting-http + ${project.parent.version} + + + org.springframework + spring-context + + + com.github.briandilley.jsonrpc4j + jsonrpc4j + + + javax.portlet + portlet-api + + + + + \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-memcached/pom.xml b/dubbo-rpc/dubbo-rpc-memcached/pom.xml index 6544e9c9a1..bcfeea67e6 100644 --- a/dubbo-rpc/dubbo-rpc-memcached/pom.xml +++ b/dubbo-rpc/dubbo-rpc-memcached/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-memcached jar diff --git a/dubbo-rpc/dubbo-rpc-redis/pom.xml b/dubbo-rpc/dubbo-rpc-redis/pom.xml index 056b901397..123273215f 100644 --- a/dubbo-rpc/dubbo-rpc-redis/pom.xml +++ b/dubbo-rpc/dubbo-rpc-redis/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-redis jar diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml index 126b26d3a0..c1d9e4e727 100644 --- a/dubbo-rpc/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-rest jar diff --git a/dubbo-rpc/dubbo-rpc-rmi/pom.xml b/dubbo-rpc/dubbo-rpc-rmi/pom.xml index bb5efb4ed3..7e560b2cb9 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rmi/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-rmi jar diff --git a/dubbo-rpc/dubbo-rpc-rsocket/pom.xml b/dubbo-rpc/dubbo-rpc-rsocket/pom.xml index c4f749c470..f11823452b 100644 --- a/dubbo-rpc/dubbo-rpc-rsocket/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rsocket/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-rsocket jar diff --git a/dubbo-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-rpc/dubbo-rpc-thrift/pom.xml index 5e106b2ba3..d6e20ed95e 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/pom.xml +++ b/dubbo-rpc/dubbo-rpc-thrift/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-thrift jar diff --git a/dubbo-rpc/dubbo-rpc-webservice/pom.xml b/dubbo-rpc/dubbo-rpc-webservice/pom.xml index a859b58546..70078f8f1a 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/pom.xml +++ b/dubbo-rpc/dubbo-rpc-webservice/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc-webservice jar diff --git a/dubbo-rpc/pom.xml b/dubbo-rpc/pom.xml index d175da8f6f..1065b98707 100644 --- a/dubbo-rpc/pom.xml +++ b/dubbo-rpc/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-rpc pom @@ -32,6 +32,7 @@ dubbo-rpc-api dubbo-rpc-dubbo dubbo-rpc-injvm + dubbo-rpc-jsonrpc dubbo-rpc-rmi dubbo-rpc-hessian dubbo-rpc-http diff --git a/dubbo-serialization/dubbo-serialization-api/pom.xml b/dubbo-serialization/dubbo-serialization-api/pom.xml index cd1ff42939..62cf6f3105 100644 --- a/dubbo-serialization/dubbo-serialization-api/pom.xml +++ b/dubbo-serialization/dubbo-serialization-api/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.apache.dubbo dubbo-serialization - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization-api jar @@ -35,25 +35,5 @@ limitations under the License. dubbo-common ${project.parent.version} - - com.alibaba - hessian-lite - - - com.alibaba - fastjson - - - com.esotericsoftware - kryo - - - de.javakaffee - kryo-serializers - - - de.ruedigermoeller - fst - \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-avro/pom.xml b/dubbo-serialization/dubbo-serialization-avro/pom.xml new file mode 100644 index 0000000000..908c49eb2f --- /dev/null +++ b/dubbo-serialization/dubbo-serialization-avro/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + + org.apache.dubbo + dubbo-serialization + ${revision} + + dubbo-serialization-avro + jar + ${project.artifactId} + The avro serialization module of dubbo project + + false + + + + + org.apache.dubbo + dubbo-serialization-api + ${project.parent.version} + + + org.apache.avro + avro + + + \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-fastjson/pom.xml b/dubbo-serialization/dubbo-serialization-fastjson/pom.xml index 92dbbec882..6553abd7ec 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/pom.xml +++ b/dubbo-serialization/dubbo-serialization-fastjson/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.apache.dubbo dubbo-serialization - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization-fastjson jar diff --git a/dubbo-serialization/dubbo-serialization-fst/pom.xml b/dubbo-serialization/dubbo-serialization-fst/pom.xml index 4332453a90..1f2936e8dd 100644 --- a/dubbo-serialization/dubbo-serialization-fst/pom.xml +++ b/dubbo-serialization/dubbo-serialization-fst/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-serialization - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization-fst jar diff --git a/dubbo-serialization/dubbo-serialization-hessian2/pom.xml b/dubbo-serialization/dubbo-serialization-hessian2/pom.xml index b5ba85a295..9363daca43 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/pom.xml +++ b/dubbo-serialization/dubbo-serialization-hessian2/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.apache.dubbo dubbo-serialization - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization-hessian2 jar diff --git a/dubbo-serialization/dubbo-serialization-jdk/pom.xml b/dubbo-serialization/dubbo-serialization-jdk/pom.xml index 1f78b9a9c1..21df9f487e 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/pom.xml +++ b/dubbo-serialization/dubbo-serialization-jdk/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.apache.dubbo dubbo-serialization - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization-jdk jar diff --git a/dubbo-serialization/dubbo-serialization-kryo/pom.xml b/dubbo-serialization/dubbo-serialization-kryo/pom.xml index 4ebf59bea3..86b5083a06 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/pom.xml +++ b/dubbo-serialization/dubbo-serialization-kryo/pom.xml @@ -20,7 +20,7 @@ limitations under the License. org.apache.dubbo dubbo-serialization - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization-kryo jar diff --git a/dubbo-serialization/dubbo-serialization-protostuff/pom.xml b/dubbo-serialization/dubbo-serialization-protostuff/pom.xml index ab3a2a5f39..7d9e2c8e87 100644 --- a/dubbo-serialization/dubbo-serialization-protostuff/pom.xml +++ b/dubbo-serialization/dubbo-serialization-protostuff/pom.xml @@ -20,7 +20,7 @@ limitations under the License. dubbo-serialization org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization-protostuff diff --git a/dubbo-serialization/dubbo-serialization-test/pom.xml b/dubbo-serialization/dubbo-serialization-test/pom.xml index 392dc335d7..2c44dbc348 100644 --- a/dubbo-serialization/dubbo-serialization-test/pom.xml +++ b/dubbo-serialization/dubbo-serialization-test/pom.xml @@ -19,7 +19,7 @@ dubbo-serialization org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 @@ -67,5 +67,10 @@ dubbo-serialization-api ${project.parent.version} + + org.apache.dubbo + dubbo-serialization-avro + ${project.parent.version} + diff --git a/dubbo-serialization/pom.xml b/dubbo-serialization/pom.xml index 9cfb7d72da..1c6de9d406 100644 --- a/dubbo-serialization/pom.xml +++ b/dubbo-serialization/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-serialization pom @@ -36,6 +36,7 @@ dubbo-serialization-fst dubbo-serialization-jdk dubbo-serialization-protostuff + dubbo-serialization-avro dubbo-serialization-test diff --git a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml index db01ae3917..0295aaa399 100644 --- a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml +++ b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml @@ -19,7 +19,7 @@ dubbo-test-compatibility org.apache.dubbo - 2.7.1-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml b/dubbo-test/dubbo-test-compatibility/pom.xml index c6d2e1ee55..d3c178d068 100644 --- a/dubbo-test/dubbo-test-compatibility/pom.xml +++ b/dubbo-test/dubbo-test-compatibility/pom.xml @@ -22,7 +22,7 @@ org.apache.dubbo dubbo-test - 2.7.1-SNAPSHOT + ${revision} dubbo-test-compatibility pom diff --git a/dubbo-test/dubbo-test-integration/pom.xml b/dubbo-test/dubbo-test-integration/pom.xml index 51552d47e8..f9e0794d29 100644 --- a/dubbo-test/dubbo-test-integration/pom.xml +++ b/dubbo-test/dubbo-test-integration/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-test - 2.7.1-SNAPSHOT + ${revision} dubbo-test-integration jar diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 0cdf2a68fa..48ea790e21 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} dubbo-test pom @@ -94,6 +94,10 @@ org.apache.dubbo dubbo-remoting-http + + org.apache.dubbo + dubbo-rpc-jsonrpc + org.apache.dubbo dubbo-rpc-dubbo @@ -198,10 +202,13 @@ org.apache.dubbo dubbo-serialization-kryo + + org.apache.dubbo + dubbo-serialization-avro + org.apache.dubbo dubbo-serialization-jdk - 2.7.1-SNAPSHOT org.hibernate diff --git a/pom.xml b/pom.xml index 6220d015df..efd92e5fb7 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ org.apache.dubbo dubbo-parent - 2.7.1-SNAPSHOT + ${revision} pom ${project.artifactId} @@ -120,10 +120,12 @@ 9.4.11.v20180605 3.0.0 0.8.2 + 1.1.0 0.12 true true + 3.0.0-SNAPSHOT @@ -154,7 +156,7 @@ org.apache.dubbo dubbo-dependencies-bom - 2.7.1-SNAPSHOT + ${project.version} pom import @@ -470,6 +472,31 @@ ${arguments} + + org.codehaus.mojo + flatten-maven-plugin + ${maven_flatten_version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + +