From 648b806fc1d7b4cd7fed00c92d056c613ed7318c Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Thu, 11 Apr 2019 11:44:46 +0800 Subject: [PATCH 1/2] use maven CI friendly versions: revision --- .mvn/wrapper/maven-wrapper.properties | 2 +- codestyle/checkstyle-suppressions.xml | 8 ---- codestyle/checkstyle.xml | 31 -------------- codestyle/dubbo_codestyle_for_idea.xml | 16 ------- codestyle/manage_profiles.png | Bin 430 -> 0 bytes dubbo-all/pom.xml | 3 +- dubbo-bom/pom.xml | 3 +- 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 | 2 +- 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 | 34 ++++++++++++++- .../dubbo-dependencies-zookeeper/pom.xml | 39 +++++++++++++++++- dubbo-dependencies/pom.xml | 2 +- dubbo-distribution/pom.xml | 2 +- .../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 | 2 +- .../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 | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-etcd3/pom.xml | 2 +- .../dubbo-registry-multicast/pom.xml | 2 +- dubbo-registry/dubbo-registry-nacos/pom.xml | 2 +- dubbo-registry/dubbo-registry-redis/pom.xml | 2 +- .../dubbo-registry-zookeeper/pom.xml | 2 +- dubbo-registry/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-api/pom.xml | 2 +- dubbo-remoting/dubbo-remoting-etcd3/pom.xml | 2 +- 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 | 2 +- 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 | 2 +- dubbo-rpc/dubbo-rpc-http/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-injvm/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml | 2 +- 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-thrift/pom.xml | 2 +- dubbo-rpc/dubbo-rpc-webservice/pom.xml | 2 +- dubbo-rpc/pom.xml | 2 +- .../dubbo-serialization-api/pom.xml | 2 +- .../dubbo-serialization-avro/pom.xml | 2 +- .../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 | 2 +- dubbo-serialization/pom.xml | 2 +- .../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 | 2 +- pom.xml | 31 +++++++++++++- 101 files changed, 193 insertions(+), 155 deletions(-) delete mode 100644 codestyle/checkstyle-suppressions.xml delete mode 100644 codestyle/checkstyle.xml delete mode 100644 codestyle/dubbo_codestyle_for_idea.xml delete mode 100644 codestyle/manage_profiles.png diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 56bb0164ec1..0061e751e50 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-suppressions.xml b/codestyle/checkstyle-suppressions.xml deleted file mode 100644 index 1817cf762c2..00000000000 --- a/codestyle/checkstyle-suppressions.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml deleted file mode 100644 index fa4d735a785..00000000000 --- a/codestyle/checkstyle.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/codestyle/dubbo_codestyle_for_idea.xml b/codestyle/dubbo_codestyle_for_idea.xml deleted file mode 100644 index 1f87caa7135..00000000000 --- a/codestyle/dubbo_codestyle_for_idea.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - \ No newline at end of file diff --git a/codestyle/manage_profiles.png b/codestyle/manage_profiles.png deleted file mode 100644 index 1664d67ea43d2e2b5f38f5dc2e08ae91b195cd3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^(m*W90VEinmUA@$Db50q$YKTtz9S&aI8~buq=LP~ z)7O>#A+rd-puic`HP^sGt`Q}Ur6n2pMGPy~o$&w)@st3CTvCgZi!uvJGV}8oggF(J zf#O^sap(Mk%A(Blj1q=5{Aa9yqI_V{qSQo?QiYPt+*AhB@BExV8BUN)aDG}zd16s2 zLu|o+kaBLY;hDwBIf+1}MGV^yZ0QFIbAW`y6N~aP^U@g(NIz=_im^lVmlh?bGJO5t z{2HdrIX^cyHLrx>+nH(mfnsbRWg(d*IjIaQ-d$1$id1^KIEHAPzk1P-uf>4JC9v-g zqo(Xb4uy$kA~M~F91lo org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} ../pom.xml dubbo - 2.7.2-SNAPSHOT jar dubbo-all The all in one project of dubbo diff --git a/dubbo-bom/pom.xml b/dubbo-bom/pom.xml index 25313af03a0..2359319a223 100644 --- a/dubbo-bom/pom.xml +++ b/dubbo-bom/pom.xml @@ -22,11 +22,10 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-bom - 2.7.2-SNAPSHOT pom dubbo-bom diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 7b8860a1490..ff59682d847 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-cluster jar diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml index 3477f9b859a..98ecc9b87b2 100644 --- a/dubbo-common/pom.xml +++ b/dubbo-common/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-common jar diff --git a/dubbo-compatible/pom.xml b/dubbo-compatible/pom.xml index 2fd3d2e6f29..3826189591a 100644 --- a/dubbo-compatible/pom.xml +++ b/dubbo-compatible/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-compatible jar diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index 0ff700d657d..3a4584d90c3 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.2-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 dc51d4e9798..04a8223bcb7 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-config - 2.7.2-SNAPSHOT + ${revision} dubbo-config-spring jar diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml index dc8c043da9f..bb8518fea95 100644 --- a/dubbo-config/pom.xml +++ b/dubbo-config/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-config pom diff --git a/dubbo-configcenter/dubbo-configcenter-api/pom.xml b/dubbo-configcenter/dubbo-configcenter-api/pom.xml index 2e8a000b8d2..bab80eb0fdc 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.2-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 4a502141b6e..26d2e88fb28 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.2-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 03dc3d19d26..6f8b24ff666 100644 --- a/dubbo-configcenter/dubbo-configcenter-consul/pom.xml +++ b/dubbo-configcenter/dubbo-configcenter-consul/pom.xml @@ -20,7 +20,7 @@ dubbo-configcenter org.apache.dubbo - 2.7.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-configcenter/dubbo-configcenter-etcd/pom.xml b/dubbo-configcenter/dubbo-configcenter-etcd/pom.xml index 71cdef0e31d..2eb1e358d4c 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml b/dubbo-configcenter/dubbo-configcenter-zookeeper/pom.xml index c4bccaf4539..9f028ce05c7 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.2-SNAPSHOT + ${revision} dubbo-configcenter-zookeeper jar diff --git a/dubbo-configcenter/pom.xml b/dubbo-configcenter/pom.xml index 206293f639f..c6fb983bb72 100644 --- a/dubbo-configcenter/pom.xml +++ b/dubbo-configcenter/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-configcenter pom diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml index 1ace802bc8c..0014da4c2a8 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.2-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 46655f6181c..a83b66165f5 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.2-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 8e3d4150cac..a6f70145fad 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.2-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 cb06217c6cc..c7762cd4189 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.2-SNAPSHOT + ${revision} dubbo-container-spring jar diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml index 7e17a601756..b61d3cf1b90 100644 --- a/dubbo-container/pom.xml +++ b/dubbo-container/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-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 78027b0882f..7e38ba1b435 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.2-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 7b02888b66f..9e807ce5d48 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-demo/dubbo-demo-annotation/pom.xml b/dubbo-demo/dubbo-demo-annotation/pom.xml index 8109804d4bf..df69c4c424b 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.2-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 25cb23e950b..fd0f62631e4 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.2-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 c30139cacb5..095b43093fa 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml index c1a2eee320b..944c76dd505 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.2-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 5488d9824d6..a5c4b0517de 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.2-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 35f357039bd..7eb47eef78e 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.2-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 9c9b18c9f53..81cfe6c9d70 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.2-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 80339b10316..97aa01023bf 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.2-SNAPSHOT + ${revision} 4.0.0 pom diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml index 9894cd95ab8..d46e2d99df9 100644 --- a/dubbo-demo/pom.xml +++ b/dubbo-demo/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-demo pom diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml index f4a47a99181..0329e73ba60 100644 --- a/dubbo-dependencies-bom/pom.xml +++ b/dubbo-dependencies-bom/pom.xml @@ -27,7 +27,7 @@ org.apache.dubbo dubbo-dependencies-bom - 2.7.2-SNAPSHOT + ${revision} pom dubbo-dependencies-bom @@ -145,6 +145,8 @@ 2.8.5 1.2.0 2.0 + 1.1.0 + 2.7.2-SNAPSHOT @@ -553,6 +555,36 @@ + + + + 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 9a94a7b50b0..66dba910f4f 100644 --- a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml +++ b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml @@ -28,15 +28,20 @@ org.apache.dubbo dubbo-dependencies-zookeeper - 2.7.2-SNAPSHOT + ${revision} pom + + 2.7.2-SNAPSHOT + 1.1.0 + + org.apache.dubbo dubbo-dependencies-bom - 2.7.2-SNAPSHOT + ${project.version} pom import @@ -54,6 +59,36 @@ + + + + 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/pom.xml b/dubbo-dependencies/pom.xml index 188d1e7b896..27cea95f42e 100644 --- a/dubbo-dependencies/pom.xml +++ b/dubbo-dependencies/pom.xml @@ -19,7 +19,7 @@ dubbo-parent org.apache.dubbo - 2.7.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml index b29c303ae76..51f486e80cc 100644 --- a/dubbo-distribution/pom.xml +++ b/dubbo-distribution/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-distribution pom diff --git a/dubbo-distribution/src/assembly/source-release.xml b/dubbo-distribution/src/assembly/source-release.xml index 2a802a54012..2f265166b7f 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 3128aea3d9d..8241d23f457 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.2-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 0d23e59bb11..51d70aead19 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.2-SNAPSHOT + ${revision} dubbo-filter-validation jar diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml index 958a1830bde..efb95ab8cb0 100644 --- a/dubbo-filter/pom.xml +++ b/dubbo-filter/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-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 2aca021bba2..6e9a58fa818 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.2-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 d9bc0c3d9fd..b892598c800 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.2-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 4630f58c49a..ad3eb4946e7 100644 --- a/dubbo-metadata-report/dubbo-metadata-report-consul/pom.xml +++ b/dubbo-metadata-report/dubbo-metadata-report-consul/pom.xml @@ -20,7 +20,7 @@ dubbo-metadata-report org.apache.dubbo - 2.7.2-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 9fd1479299b..419c77f8839 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.2-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 dd7afdcda79..a276f83b3bf 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-metadata-report/pom.xml b/dubbo-metadata-report/pom.xml index 2aa17954da2..6d47af47374 100644 --- a/dubbo-metadata-report/pom.xml +++ b/dubbo-metadata-report/pom.xml @@ -18,7 +18,7 @@ dubbo-parent org.apache.dubbo - 2.7.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml index ec69d4e39b0..b5c21aba7e2 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.2-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 0b84690a526..f426214f2c7 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.2-SNAPSHOT + ${revision} dubbo-monitor-default jar diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml index 35eca044fe5..a6d21a0a556 100644 --- a/dubbo-monitor/pom.xml +++ b/dubbo-monitor/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-monitor pom diff --git a/dubbo-plugin/dubbo-qos/pom.xml b/dubbo-plugin/dubbo-qos/pom.xml index 4fee097f612..0df5abb8c65 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml index 91ea5b7d378..44b6fe0dafe 100644 --- a/dubbo-plugin/pom.xml +++ b/dubbo-plugin/pom.xml @@ -18,7 +18,7 @@ dubbo-parent org.apache.dubbo - 2.7.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index bb32665a077..5a707d0686b 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.2-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 70bb1a3fac2..ec32dbe4340 100644 --- a/dubbo-registry/dubbo-registry-consul/pom.xml +++ b/dubbo-registry/dubbo-registry-consul/pom.xml @@ -20,7 +20,7 @@ dubbo-registry org.apache.dubbo - 2.7.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-registry/dubbo-registry-default/pom.xml b/dubbo-registry/dubbo-registry-default/pom.xml index 792ec4b5f4f..37df8f2ef72 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.2-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 a77861a703f..6d9d60cbd57 100644 --- a/dubbo-registry/dubbo-registry-etcd3/pom.xml +++ b/dubbo-registry/dubbo-registry-etcd3/pom.xml @@ -21,7 +21,7 @@ dubbo-registry org.apache.dubbo - 2.7.2-SNAPSHOT + ${revision} dubbo-registry-etcd3 diff --git a/dubbo-registry/dubbo-registry-multicast/pom.xml b/dubbo-registry/dubbo-registry-multicast/pom.xml index 586f1aa9174..643159bddd4 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.2-SNAPSHOT + ${revision} dubbo-registry-multicast jar diff --git a/dubbo-registry/dubbo-registry-nacos/pom.xml b/dubbo-registry/dubbo-registry-nacos/pom.xml index c67ab4bcd7d..e2a9d02e149 100644 --- a/dubbo-registry/dubbo-registry-nacos/pom.xml +++ b/dubbo-registry/dubbo-registry-nacos/pom.xml @@ -18,7 +18,7 @@ org.apache.dubbo dubbo-registry - 2.7.2-SNAPSHOT + ${revision} ../pom.xml 4.0.0 diff --git a/dubbo-registry/dubbo-registry-redis/pom.xml b/dubbo-registry/dubbo-registry-redis/pom.xml index 816083f2558..8144089f35a 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.2-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 b6bc23710f3..3aa13d3fcfd 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.2-SNAPSHOT + ${revision} dubbo-registry-zookeeper jar diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml index f9161c64bf0..c9c3441ca25 100644 --- a/dubbo-registry/pom.xml +++ b/dubbo-registry/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-registry pom diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml index 9f96912163c..6d35681d9fe 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.2-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 340782682a5..2f827a9fbb3 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.2-SNAPSHOT + ${revision} dubbo-remoting-etcd3 jar diff --git a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml index 5e01ff37ed7..cd185367fd9 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.2-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 ecfb55e0340..9937a191294 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.2-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 2d7b2da175e..4808a1781c3 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.2-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 44ecba5e10d..761d37b5160 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.2-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 e565c28e3e7..10d7f26fe14 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-remoting/dubbo-remoting-p2p/pom.xml b/dubbo-remoting/dubbo-remoting-p2p/pom.xml index 7f5d4f55b1a..f9476062881 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.2-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 864e88bc318..497bc83f94e 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.2-SNAPSHOT + ${revision} dubbo-remoting-zookeeper jar diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml index efa3a14f7b9..c95fbfad2e6 100644 --- a/dubbo-remoting/pom.xml +++ b/dubbo-remoting/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-remoting pom diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml index 91a6aa4a329..aae1c05b6ed 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.2-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 d93ad0942af..dc6cd2295f8 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.2-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 582c01aae02..99ef99da3cc 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc/dubbo-rpc-hessian/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-rpc - 2.7.2-SNAPSHOT + ${revision} dubbo-rpc-hessian jar diff --git a/dubbo-rpc/dubbo-rpc-http/pom.xml b/dubbo-rpc/dubbo-rpc-http/pom.xml index 1cff7cf084a..6681a9a6321 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.2-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 3e266f5f4fc..53ed2ffb4ea 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.2-SNAPSHOT + ${revision} dubbo-rpc-injvm jar diff --git a/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml b/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml index 4a367328fe8..c5b4e890389 100644 --- a/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml +++ b/dubbo-rpc/dubbo-rpc-jsonrpc/pom.xml @@ -20,7 +20,7 @@ dubbo-rpc org.apache.dubbo - 2.7.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-rpc/dubbo-rpc-memcached/pom.xml b/dubbo-rpc/dubbo-rpc-memcached/pom.xml index 156f48d5fc6..bcfeea67e6b 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.2-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 4fe00c0be3b..123273215fd 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.2-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 ab2c758faf0..c1d9e4e727b 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.2-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 6a096a3c58d..7e560b2cb97 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.2-SNAPSHOT + ${revision} dubbo-rpc-rmi jar diff --git a/dubbo-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-rpc/dubbo-rpc-thrift/pom.xml index 49633e2d569..d6e20ed95e2 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.2-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 96986ddd13f..70078f8f1a9 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.2-SNAPSHOT + ${revision} dubbo-rpc-webservice jar diff --git a/dubbo-rpc/pom.xml b/dubbo-rpc/pom.xml index 342c193fe9d..20e8e8d1321 100644 --- a/dubbo-rpc/pom.xml +++ b/dubbo-rpc/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-rpc pom diff --git a/dubbo-serialization/dubbo-serialization-api/pom.xml b/dubbo-serialization/dubbo-serialization-api/pom.xml index 2ac22b58e6c..62cf6f3105f 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.2-SNAPSHOT + ${revision} dubbo-serialization-api jar diff --git a/dubbo-serialization/dubbo-serialization-avro/pom.xml b/dubbo-serialization/dubbo-serialization-avro/pom.xml index 27fd5378c7a..908c49eb2fe 100644 --- a/dubbo-serialization/dubbo-serialization-avro/pom.xml +++ b/dubbo-serialization/dubbo-serialization-avro/pom.xml @@ -20,7 +20,7 @@ org.apache.dubbo dubbo-serialization - 2.7.2-SNAPSHOT + ${revision} dubbo-serialization-avro jar diff --git a/dubbo-serialization/dubbo-serialization-fastjson/pom.xml b/dubbo-serialization/dubbo-serialization-fastjson/pom.xml index cb9435c06ec..6553abd7ecf 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.2-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 781d79c0d45..1f2936e8dd4 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.2-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 88ee9b9365e..9363daca432 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.2-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 51bc49484a4..21df9f487e0 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.2-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 3d5b022ce51..86b5083a067 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.2-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 37d2d55ef37..7d9e2c8e87d 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.2-SNAPSHOT + ${revision} dubbo-serialization-protostuff diff --git a/dubbo-serialization/dubbo-serialization-test/pom.xml b/dubbo-serialization/dubbo-serialization-test/pom.xml index ee6e353d3de..2c44dbc3480 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-serialization/pom.xml b/dubbo-serialization/pom.xml index 3fd40ea6ef9..1c6de9d406c 100644 --- a/dubbo-serialization/pom.xml +++ b/dubbo-serialization/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-serialization pom 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 d6523a0c1dd..0295aaa3990 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.2-SNAPSHOT + ${revision} 4.0.0 diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml b/dubbo-test/dubbo-test-compatibility/pom.xml index 6528449153d..d3c178d0685 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.2-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 32bd0be055e..f9e0794d290 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.2-SNAPSHOT + ${revision} dubbo-test-integration jar diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 0c77353c834..5c950ad8980 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -19,7 +19,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} dubbo-test pom diff --git a/pom.xml b/pom.xml index eff466e8fe4..a1f7b56820d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.dubbo dubbo-parent - 2.7.2-SNAPSHOT + ${revision} pom ${project.artifactId} @@ -119,10 +119,12 @@ 9.4.11.v20180605 3.0.0 0.8.2 + 1.1.0 0.12 true true + 2.7.2-SNAPSHOT @@ -153,7 +155,7 @@ org.apache.dubbo dubbo-dependencies-bom - 2.7.2-SNAPSHOT + ${project.version} pom import @@ -469,6 +471,31 @@ ${arguments} + + org.codehaus.mojo + flatten-maven-plugin + ${maven_flatten_version} + + true + resolveCiFriendliesOnly + + + + flatten + process-resources + + flatten + + + + flatten.clean + clean + + clean + + + + From 0e5ef2b91a312d560c51598f231da880e8cfc0f0 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Thu, 11 Apr 2019 14:00:06 +0800 Subject: [PATCH 2/2] add back mis-deleted files --- codestyle/checkstyle-suppressions.xml | 8 +++++++ codestyle/checkstyle.xml | 31 +++++++++++++++++++++++++ codestyle/dubbo_codestyle_for_idea.xml | 16 +++++++++++++ codestyle/manage_profiles.png | Bin 0 -> 430 bytes 4 files changed, 55 insertions(+) create mode 100644 codestyle/checkstyle-suppressions.xml create mode 100644 codestyle/checkstyle.xml create mode 100644 codestyle/dubbo_codestyle_for_idea.xml create mode 100644 codestyle/manage_profiles.png diff --git a/codestyle/checkstyle-suppressions.xml b/codestyle/checkstyle-suppressions.xml new file mode 100644 index 00000000000..1817cf762c2 --- /dev/null +++ b/codestyle/checkstyle-suppressions.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/codestyle/checkstyle.xml b/codestyle/checkstyle.xml new file mode 100644 index 00000000000..9624bbf38fa --- /dev/null +++ b/codestyle/checkstyle.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/codestyle/dubbo_codestyle_for_idea.xml b/codestyle/dubbo_codestyle_for_idea.xml new file mode 100644 index 00000000000..1f87caa7135 --- /dev/null +++ b/codestyle/dubbo_codestyle_for_idea.xml @@ -0,0 +1,16 @@ + + + \ No newline at end of file diff --git a/codestyle/manage_profiles.png b/codestyle/manage_profiles.png new file mode 100644 index 0000000000000000000000000000000000000000..1664d67ea43d2e2b5f38f5dc2e08ae91b195cd3a GIT binary patch literal 430 zcmeAS@N?(olHy`uVBq!ia0vp^(m*W90VEinmUA@$Db50q$YKTtz9S&aI8~buq=LP~ z)7O>#A+rd-puic`HP^sGt`Q}Ur6n2pMGPy~o$&w)@st3CTvCgZi!uvJGV}8oggF(J zf#O^sap(Mk%A(Blj1q=5{Aa9yqI_V{qSQo?QiYPt+*AhB@BExV8BUN)aDG}zd16s2 zLu|o+kaBLY;hDwBIf+1}MGV^yZ0QFIbAW`y6N~aP^U@g(NIz=_im^lVmlh?bGJO5t z{2HdrIX^cyHLrx>+nH(mfnsbRWg(d*IjIaQ-d$1$id1^KIEHAPzk1P-uf>4JC9v-g zqo(Xb4uy$kA~M~F91lo