This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch 2.6.2-release-preparation in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
commit b43ef62afb62da107abdbfcc124b370949e9e2d4 Author: ken.lj <ken.lj...@gmail.com> AuthorDate: Fri Apr 27 16:55:49 2018 +0800 Change pom structure of project --- all/pom.xml | 6 +- bom/pom.xml | 2 +- dubbo-cluster/pom.xml | 3 +- dubbo-common/pom.xml | 3 +- dubbo-config/dubbo-config-api/pom.xml | 2 +- dubbo-config/dubbo-config-spring/pom.xml | 2 +- dubbo-config/pom.xml | 3 +- dubbo-container/dubbo-container-api/pom.xml | 2 +- dubbo-container/dubbo-container-log4j/pom.xml | 2 +- dubbo-container/dubbo-container-logback/pom.xml | 2 +- dubbo-container/dubbo-container-spring/pom.xml | 2 +- dubbo-container/pom.xml | 3 +- dubbo-demo/dubbo-demo-api/pom.xml | 2 +- dubbo-demo/dubbo-demo-consumer/pom.xml | 2 +- dubbo-demo/dubbo-demo-provider/pom.xml | 2 +- dubbo-demo/pom.xml | 3 +- dubbo-filter/dubbo-filter-cache/pom.xml | 2 +- dubbo-filter/dubbo-filter-validation/pom.xml | 2 +- dubbo-filter/pom.xml | 3 +- dubbo-monitor/dubbo-monitor-api/pom.xml | 2 +- dubbo-monitor/dubbo-monitor-default/pom.xml | 2 +- dubbo-monitor/pom.xml | 3 +- {dependencies-bom => dubbo-parent}/pom.xml | 147 +++++++-------------- dubbo-plugin/dubbo-qos/pom.xml | 2 +- dubbo-plugin/pom.xml | 3 +- dubbo-registry/dubbo-registry-api/pom.xml | 2 +- dubbo-registry/dubbo-registry-default/pom.xml | 2 +- dubbo-registry/dubbo-registry-multicast/pom.xml | 2 +- dubbo-registry/dubbo-registry-redis/pom.xml | 2 +- dubbo-registry/dubbo-registry-zookeeper/pom.xml | 2 +- dubbo-registry/pom.xml | 3 +- dubbo-remoting/dubbo-remoting-api/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/dubbo-remoting-zookeeper/pom.xml | 2 +- dubbo-remoting/pom.xml | 3 +- 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-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 | 3 +- .../dubbo-serialization-api/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/pom.xml | 3 +- dubbo-test/dubbo-test-benchmark/pom.xml | 2 +- .../dubbo-test-spring3/pom.xml | 2 +- dubbo-test/dubbo-test-compatibility/pom.xml | 2 +- dubbo-test/dubbo-test-examples/pom.xml | 2 +- dubbo-test/dubbo-test-integration/pom.xml | 2 +- dubbo-test/pom.xml | 3 +- hessian-lite/pom.xml | 3 +- pom.xml | 65 ++------- 67 files changed, 141 insertions(+), 219 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index e28108d..eb26289 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -20,11 +20,11 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> - <relativePath>../pom.xml</relativePath> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> <packaging>jar</packaging> <name>dubbo-all</name> <description>The all in one project of dubbo</description> diff --git a/bom/pom.xml b/bom/pom.xml index 98e8db8..d05a9a8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -7,7 +7,7 @@ <!--<parent>--> <!--<artifactId>dubbo-parent</artifactId>--> <!--<groupId>com.alibaba</groupId>--> - <!--<version>2.6.1</version>--> + <!--<version>2.6.2-SNAPSHOT</version>--> <!--<relativePath>../pom.xml</relativePath>--> <!--</parent>--> <parent> diff --git a/dubbo-cluster/pom.xml b/dubbo-cluster/pom.xml index 4464888..3de15f5 100644 --- a/dubbo-cluster/pom.xml +++ b/dubbo-cluster/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-cluster</artifactId> <packaging>jar</packaging> diff --git a/dubbo-common/pom.xml b/dubbo-common/pom.xml index 682fa1c..77bf917 100644 --- a/dubbo-common/pom.xml +++ b/dubbo-common/pom.xml @@ -21,7 +21,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-common</artifactId> <packaging>jar</packaging> diff --git a/dubbo-config/dubbo-config-api/pom.xml b/dubbo-config/dubbo-config-api/pom.xml index ef25a87..0e71073 100644 --- a/dubbo-config/dubbo-config-api/pom.xml +++ b/dubbo-config/dubbo-config-api/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-config</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-config-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-config/dubbo-config-spring/pom.xml b/dubbo-config/dubbo-config-spring/pom.xml index 019537c..c7a6660 100644 --- a/dubbo-config/dubbo-config-spring/pom.xml +++ b/dubbo-config/dubbo-config-spring/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-config</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-config-spring</artifactId> <packaging>jar</packaging> diff --git a/dubbo-config/pom.xml b/dubbo-config/pom.xml index 87b7e0e..9d8949f 100644 --- a/dubbo-config/pom.xml +++ b/dubbo-config/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-config</artifactId> <packaging>pom</packaging> diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml index b0d5894..e399c34 100644 --- a/dubbo-container/dubbo-container-api/pom.xml +++ b/dubbo-container/dubbo-container-api/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-container-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/dubbo-container-log4j/pom.xml b/dubbo-container/dubbo-container-log4j/pom.xml index 863ddcf..604c573 100644 --- a/dubbo-container/dubbo-container-log4j/pom.xml +++ b/dubbo-container/dubbo-container-log4j/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-container-log4j</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/dubbo-container-logback/pom.xml b/dubbo-container/dubbo-container-logback/pom.xml index 98fc54d..f03b0a3 100644 --- a/dubbo-container/dubbo-container-logback/pom.xml +++ b/dubbo-container/dubbo-container-logback/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-container-logback</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/dubbo-container-spring/pom.xml b/dubbo-container/dubbo-container-spring/pom.xml index b8b865b..8221adf 100644 --- a/dubbo-container/dubbo-container-spring/pom.xml +++ b/dubbo-container/dubbo-container-spring/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-container</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-container-spring</artifactId> <packaging>jar</packaging> diff --git a/dubbo-container/pom.xml b/dubbo-container/pom.xml index 3e4a206..0907dc6 100644 --- a/dubbo-container/pom.xml +++ b/dubbo-container/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-container</artifactId> <packaging>pom</packaging> diff --git a/dubbo-demo/dubbo-demo-api/pom.xml b/dubbo-demo/dubbo-demo-api/pom.xml index 19c17cc..9316cba 100644 --- a/dubbo-demo/dubbo-demo-api/pom.xml +++ b/dubbo-demo/dubbo-demo-api/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-demo</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-demo-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-demo/dubbo-demo-consumer/pom.xml b/dubbo-demo/dubbo-demo-consumer/pom.xml index 22a7ac4..ca81339 100644 --- a/dubbo-demo/dubbo-demo-consumer/pom.xml +++ b/dubbo-demo/dubbo-demo-consumer/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-demo</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-demo-consumer</artifactId> <packaging>jar</packaging> diff --git a/dubbo-demo/dubbo-demo-provider/pom.xml b/dubbo-demo/dubbo-demo-provider/pom.xml index ddfc888..0409cf9 100644 --- a/dubbo-demo/dubbo-demo-provider/pom.xml +++ b/dubbo-demo/dubbo-demo-provider/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-demo</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-demo-provider</artifactId> <packaging>jar</packaging> diff --git a/dubbo-demo/pom.xml b/dubbo-demo/pom.xml index 051fd7d..c992739 100644 --- a/dubbo-demo/pom.xml +++ b/dubbo-demo/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-demo</artifactId> <packaging>pom</packaging> diff --git a/dubbo-filter/dubbo-filter-cache/pom.xml b/dubbo-filter/dubbo-filter-cache/pom.xml index bd0791f..f7d2bce 100644 --- a/dubbo-filter/dubbo-filter-cache/pom.xml +++ b/dubbo-filter/dubbo-filter-cache/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-filter</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-filter-cache</artifactId> <packaging>jar</packaging> diff --git a/dubbo-filter/dubbo-filter-validation/pom.xml b/dubbo-filter/dubbo-filter-validation/pom.xml index 7584347..d553750 100644 --- a/dubbo-filter/dubbo-filter-validation/pom.xml +++ b/dubbo-filter/dubbo-filter-validation/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-filter</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-filter-validation</artifactId> <packaging>jar</packaging> diff --git a/dubbo-filter/pom.xml b/dubbo-filter/pom.xml index 4274278..d69306c 100644 --- a/dubbo-filter/pom.xml +++ b/dubbo-filter/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-filter</artifactId> <packaging>pom</packaging> diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml b/dubbo-monitor/dubbo-monitor-api/pom.xml index 203de9e..ad15b76 100644 --- a/dubbo-monitor/dubbo-monitor-api/pom.xml +++ b/dubbo-monitor/dubbo-monitor-api/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-monitor</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-monitor-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-monitor/dubbo-monitor-default/pom.xml b/dubbo-monitor/dubbo-monitor-default/pom.xml index b952607..a6d52c6 100644 --- a/dubbo-monitor/dubbo-monitor-default/pom.xml +++ b/dubbo-monitor/dubbo-monitor-default/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-monitor</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-monitor-default</artifactId> <packaging>jar</packaging> diff --git a/dubbo-monitor/pom.xml b/dubbo-monitor/pom.xml index b8c39db..2c7eae1 100644 --- a/dubbo-monitor/pom.xml +++ b/dubbo-monitor/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-monitor</artifactId> <packaging>pom</packaging> diff --git a/dependencies-bom/pom.xml b/dubbo-parent/pom.xml similarity index 76% rename from dependencies-bom/pom.xml rename to dubbo-parent/pom.xml index f857245..796d3d1 100644 --- a/dependencies-bom/pom.xml +++ b/dubbo-parent/pom.xml @@ -1,76 +1,34 @@ -<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.apache</groupId> - <artifactId>apache</artifactId> - <version>18</version> - <relativePath /> + <groupId>com.alibaba</groupId> + <artifactId>dubbo-project</artifactId> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> </parent> - <groupId>com.alibaba</groupId> - <artifactId>dubbo-dependencies-bom</artifactId> - <version>2.6.2-SNAPSHOT</version> + <artifactId>dubbo-parent</artifactId> <packaging>pom</packaging> - <name>${project.artifactId}</name> <description>The parent project of dubbo</description> - <url>https://github.com/apache/incubator-dubbo</url> - <inceptionYear>2011</inceptionYear> - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0</url> - <distribution>repo</distribution> - </license> - </licenses> - - <scm> - <url>https://github.com/apache/incubator-dubbo</url> - <connection>scm:git:https://github.com/apache/incubator-dubbo.git</connection> - <developerConnection>scm:git:https://github.com/apache/incubator-dubbo.git</developerConnection> - <tag>HEAD</tag> - </scm> - <mailingLists> - <mailingList> - <name>Development List</name> - <subscribe>dev-subscr...@dubbo.apache.org</subscribe> - <unsubscribe>dev-unsubscr...@dubbo.apache.org</unsubscribe> - <post>d...@dubbo.apache.org</post> - </mailingList> - <mailingList> - <name>Commits List</name> - <subscribe>commits-subscr...@dubbo.apache.org</subscribe> - <unsubscribe>commits-unsubscr...@dubbo.apache.org</unsubscribe> - <post>commits@dubbo.apache.org</post> - </mailingList> - <mailingList> - <name>Issues List</name> - <subscribe>issues-subscr...@dubbo.apache.org</subscribe> - <unsubscribe>issues-unsubscr...@dubbo.apache.org</unsubscribe> - <post>iss...@dubbo.apache.org</post> - </mailingList> - </mailingLists> - <developers> - <developer> - <id>dubbo.io</id> - <name>The Dubbo Project Contributors</name> - <email>dev-subscr...@dubbo.apache.org</email> - <url>http://dubbo.apache.org/</url> - </developer> - </developers> - - <organization> - <name>The Apache Software Foundation</name> - <url>http://www.apache.org/</url> - </organization> - - <issueManagement> - <system>Github Issues</system> - <url>https://github.com/apache/incubator-dubbo/issues</url> - </issueManagement> <properties> <!-- Common libs --> @@ -340,42 +298,31 @@ </dependencies> </dependencyManagement> - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>sign</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - <useReleaseProfile>false</useReleaseProfile> - <releaseProfiles>release</releaseProfiles> - <goals>deploy</goals> - </configuration> - </plugin> - </plugins> - </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit_version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>${easymock_version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jmockit</groupId> + <artifactId>jmockit</artifactId> + <version>${jmockit_version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>${cglib_version}</version> + <scope>test</scope> + </dependency> + </dependencies> </project> \ No newline at end of file diff --git a/dubbo-plugin/dubbo-qos/pom.xml b/dubbo-plugin/dubbo-qos/pom.xml index da75cdf..b84034f 100644 --- a/dubbo-plugin/dubbo-qos/pom.xml +++ b/dubbo-plugin/dubbo-qos/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-plugin</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-plugin/pom.xml b/dubbo-plugin/pom.xml index aac6458..4761766 100644 --- a/dubbo-plugin/pom.xml +++ b/dubbo-plugin/pom.xml @@ -19,7 +19,8 @@ <parent> <artifactId>dubbo-parent</artifactId> <groupId>com.alibaba</groupId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-registry/dubbo-registry-api/pom.xml b/dubbo-registry/dubbo-registry-api/pom.xml index 9f432a2..2eed9ad 100644 --- a/dubbo-registry/dubbo-registry-api/pom.xml +++ b/dubbo-registry/dubbo-registry-api/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-registry-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-default/pom.xml b/dubbo-registry/dubbo-registry-default/pom.xml index 1786647..2214967 100644 --- a/dubbo-registry/dubbo-registry-default/pom.xml +++ b/dubbo-registry/dubbo-registry-default/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-registry-default</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-multicast/pom.xml b/dubbo-registry/dubbo-registry-multicast/pom.xml index 2b64e6c..3c403f6 100644 --- a/dubbo-registry/dubbo-registry-multicast/pom.xml +++ b/dubbo-registry/dubbo-registry-multicast/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-registry-multicast</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-redis/pom.xml b/dubbo-registry/dubbo-registry-redis/pom.xml index 9257094..11eeb1b 100644 --- a/dubbo-registry/dubbo-registry-redis/pom.xml +++ b/dubbo-registry/dubbo-registry-redis/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-registry-redis</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/dubbo-registry-zookeeper/pom.xml b/dubbo-registry/dubbo-registry-zookeeper/pom.xml index b1ba554..4b4bbf7 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/pom.xml +++ b/dubbo-registry/dubbo-registry-zookeeper/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-registry</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-registry-zookeeper</artifactId> <packaging>jar</packaging> diff --git a/dubbo-registry/pom.xml b/dubbo-registry/pom.xml index cf6ab87..ac16959 100644 --- a/dubbo-registry/pom.xml +++ b/dubbo-registry/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-registry</artifactId> <packaging>pom</packaging> diff --git a/dubbo-remoting/dubbo-remoting-api/pom.xml b/dubbo-remoting/dubbo-remoting-api/pom.xml index 73cc919..83113d7 100644 --- a/dubbo-remoting/dubbo-remoting-api/pom.xml +++ b/dubbo-remoting/dubbo-remoting-api/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-remoting-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml index ef774e7..3c78111 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/pom.xml +++ b/dubbo-remoting/dubbo-remoting-grizzly/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-remoting-grizzly</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-http/pom.xml b/dubbo-remoting/dubbo-remoting-http/pom.xml index beb49e1..e13d348 100644 --- a/dubbo-remoting/dubbo-remoting-http/pom.xml +++ b/dubbo-remoting/dubbo-remoting-http/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-remoting-http</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-mina/pom.xml b/dubbo-remoting/dubbo-remoting-mina/pom.xml index a9958f1..2de2654 100644 --- a/dubbo-remoting/dubbo-remoting-mina/pom.xml +++ b/dubbo-remoting/dubbo-remoting-mina/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-remoting-mina</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml b/dubbo-remoting/dubbo-remoting-netty/pom.xml index e281ddc..1d88e51 100644 --- a/dubbo-remoting/dubbo-remoting-netty/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-remoting-netty</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-netty4/pom.xml b/dubbo-remoting/dubbo-remoting-netty4/pom.xml index 836c88d..ef74d0c 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/pom.xml +++ b/dubbo-remoting/dubbo-remoting-netty4/pom.xml @@ -19,7 +19,7 @@ <parent> <artifactId>dubbo-remoting</artifactId> <groupId>com.alibaba</groupId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-remoting/dubbo-remoting-p2p/pom.xml b/dubbo-remoting/dubbo-remoting-p2p/pom.xml index 9cec967..89af9bd 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/pom.xml +++ b/dubbo-remoting/dubbo-remoting-p2p/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-remoting-p2p</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml index 2ff3397..70cfd21 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml +++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-remoting</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-remoting-zookeeper</artifactId> <packaging>jar</packaging> diff --git a/dubbo-remoting/pom.xml b/dubbo-remoting/pom.xml index da07bb1..5aa08c5 100644 --- a/dubbo-remoting/pom.xml +++ b/dubbo-remoting/pom.xml @@ -21,7 +21,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-remoting</artifactId> <packaging>pom</packaging> diff --git a/dubbo-rpc/dubbo-rpc-api/pom.xml b/dubbo-rpc/dubbo-rpc-api/pom.xml index 44ceec5..c04c634 100644 --- a/dubbo-rpc/dubbo-rpc-api/pom.xml +++ b/dubbo-rpc/dubbo-rpc-api/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml index ff3c427..b9197f9 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/pom.xml +++ b/dubbo-rpc/dubbo-rpc-dubbo/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-dubbo</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-hessian/pom.xml b/dubbo-rpc/dubbo-rpc-hessian/pom.xml index 114c65e..00ca28c 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/pom.xml +++ b/dubbo-rpc/dubbo-rpc-hessian/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-hessian</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-http/pom.xml b/dubbo-rpc/dubbo-rpc-http/pom.xml index 2e953ad..427b70b 100644 --- a/dubbo-rpc/dubbo-rpc-http/pom.xml +++ b/dubbo-rpc/dubbo-rpc-http/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-http</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-injvm/pom.xml b/dubbo-rpc/dubbo-rpc-injvm/pom.xml index d3529e4..e8f64e3 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/pom.xml +++ b/dubbo-rpc/dubbo-rpc-injvm/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-injvm</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-memcached/pom.xml b/dubbo-rpc/dubbo-rpc-memcached/pom.xml index ed50bbd..d5fcc70 100644 --- a/dubbo-rpc/dubbo-rpc-memcached/pom.xml +++ b/dubbo-rpc/dubbo-rpc-memcached/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-memcached</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-redis/pom.xml b/dubbo-rpc/dubbo-rpc-redis/pom.xml index c9f5a98..19bad83 100644 --- a/dubbo-rpc/dubbo-rpc-redis/pom.xml +++ b/dubbo-rpc/dubbo-rpc-redis/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-redis</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml index 4a8a4b1..026e2c2 100644 --- a/dubbo-rpc/dubbo-rpc-rest/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml @@ -19,7 +19,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-rest</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-rmi/pom.xml b/dubbo-rpc/dubbo-rpc-rmi/pom.xml index 1624ea1..f255bf0 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/pom.xml +++ b/dubbo-rpc/dubbo-rpc-rmi/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-rmi</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-thrift/pom.xml b/dubbo-rpc/dubbo-rpc-thrift/pom.xml index 002eb7e..06b544f 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/pom.xml +++ b/dubbo-rpc/dubbo-rpc-thrift/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-thrift</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/dubbo-rpc-webservice/pom.xml b/dubbo-rpc/dubbo-rpc-webservice/pom.xml index aca13e2..a2b656d 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/pom.xml +++ b/dubbo-rpc/dubbo-rpc-webservice/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-rpc</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-rpc-webservice</artifactId> <packaging>jar</packaging> diff --git a/dubbo-rpc/pom.xml b/dubbo-rpc/pom.xml index 4be7200..c4b4d87 100644 --- a/dubbo-rpc/pom.xml +++ b/dubbo-rpc/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-rpc</artifactId> <packaging>pom</packaging> diff --git a/dubbo-serialization/dubbo-serialization-api/pom.xml b/dubbo-serialization/dubbo-serialization-api/pom.xml index 6a22ff8..eca9eec 100644 --- a/dubbo-serialization/dubbo-serialization-api/pom.xml +++ b/dubbo-serialization/dubbo-serialization-api/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-serialization</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-serialization-api</artifactId> <packaging>jar</packaging> diff --git a/dubbo-serialization/dubbo-serialization-fastjson/pom.xml b/dubbo-serialization/dubbo-serialization-fastjson/pom.xml index c1dfe7e..cd2dd71 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/pom.xml +++ b/dubbo-serialization/dubbo-serialization-fastjson/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-serialization</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-serialization-fastjson</artifactId> <packaging>jar</packaging> diff --git a/dubbo-serialization/dubbo-serialization-fst/pom.xml b/dubbo-serialization/dubbo-serialization-fst/pom.xml index 6f903d4..09fb25d 100644 --- a/dubbo-serialization/dubbo-serialization-fst/pom.xml +++ b/dubbo-serialization/dubbo-serialization-fst/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-serialization</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-serialization-fst</artifactId> <packaging>jar</packaging> diff --git a/dubbo-serialization/dubbo-serialization-hessian2/pom.xml b/dubbo-serialization/dubbo-serialization-hessian2/pom.xml index 927b8fe..13afbff 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/pom.xml +++ b/dubbo-serialization/dubbo-serialization-hessian2/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-serialization</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-serialization-hessian2</artifactId> <packaging>jar</packaging> diff --git a/dubbo-serialization/dubbo-serialization-jdk/pom.xml b/dubbo-serialization/dubbo-serialization-jdk/pom.xml index 1e84db6..dc7c1c0 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/pom.xml +++ b/dubbo-serialization/dubbo-serialization-jdk/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-serialization</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-serialization-jdk</artifactId> <packaging>jar</packaging> diff --git a/dubbo-serialization/dubbo-serialization-kryo/pom.xml b/dubbo-serialization/dubbo-serialization-kryo/pom.xml index f1757d2..6622a0a 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/pom.xml +++ b/dubbo-serialization/dubbo-serialization-kryo/pom.xml @@ -21,7 +21,7 @@ limitations under the License. <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-serialization</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-serialization-kryo</artifactId> <packaging>jar</packaging> diff --git a/dubbo-serialization/pom.xml b/dubbo-serialization/pom.xml index d8f5912..c364cb6 100644 --- a/dubbo-serialization/pom.xml +++ b/dubbo-serialization/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-serialization</artifactId> <packaging>pom</packaging> diff --git a/dubbo-test/dubbo-test-benchmark/pom.xml b/dubbo-test/dubbo-test-benchmark/pom.xml index 6c3fc10..1721940 100644 --- a/dubbo-test/dubbo-test-benchmark/pom.xml +++ b/dubbo-test/dubbo-test-benchmark/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-test-benchmark</artifactId> <packaging>jar</packaging> 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 894de82..75460b8 100644 --- a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml +++ b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/pom.xml @@ -21,7 +21,7 @@ <parent> <artifactId>dubbo-test-compatibility</artifactId> <groupId>com.alibaba</groupId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml b/dubbo-test/dubbo-test-compatibility/pom.xml index 3a2de9c..a0f8538 100644 --- a/dubbo-test/dubbo-test-compatibility/pom.xml +++ b/dubbo-test/dubbo-test-compatibility/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-test-compatibility</artifactId> <packaging>pom</packaging> diff --git a/dubbo-test/dubbo-test-examples/pom.xml b/dubbo-test/dubbo-test-examples/pom.xml index fd9cd1c..d3321d3 100644 --- a/dubbo-test/dubbo-test-examples/pom.xml +++ b/dubbo-test/dubbo-test-examples/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-test-examples</artifactId> <packaging>jar</packaging> diff --git a/dubbo-test/dubbo-test-integration/pom.xml b/dubbo-test/dubbo-test-integration/pom.xml index bfe38bc..0e6fb90 100644 --- a/dubbo-test/dubbo-test-integration/pom.xml +++ b/dubbo-test/dubbo-test-integration/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-test</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> </parent> <artifactId>dubbo-test-integration</artifactId> <packaging>jar</packaging> diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 022ad8f..a908933 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -20,7 +20,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>dubbo-test</artifactId> <packaging>pom</packaging> diff --git a/hessian-lite/pom.xml b/hessian-lite/pom.xml index 07eec26..3580930 100644 --- a/hessian-lite/pom.xml +++ b/hessian-lite/pom.xml @@ -21,7 +21,8 @@ <parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> + <relativePath>../dubbo-parent/pom.xml</relativePath> </parent> <artifactId>hessian-lite</artifactId> <packaging>jar</packaging> diff --git a/pom.xml b/pom.xml index 7ee26b4..aa0a25d 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ </parent> <groupId>com.alibaba</groupId> - <artifactId>dubbo-parent</artifactId> + <artifactId>dubbo-project</artifactId> <version>2.6.2-SNAPSHOT</version> <packaging>pom</packaging> @@ -132,50 +132,11 @@ <module>dubbo-demo</module> <module>dubbo-plugin</module> <module>dubbo-serialization</module> - <module>dependencies-bom</module> + <module>dubbo-parent</module> <module>bom</module> <module>all</module> </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>com.alibaba</groupId> - <artifactId>dubbo-dependencies-bom</artifactId> - <version>2.6.2-SNAPSHOT</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit_version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>${easymock_version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jmockit</groupId> - <artifactId>jmockit</artifactId> - <version>${jmockit_version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib-nodep</artifactId> - <version>${cglib_version}</version> - <scope>test</scope> - </dependency> - </dependencies> - <profiles> <profile> <id>java6</id> @@ -494,6 +455,17 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.5.3</version> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + <useReleaseProfile>false</useReleaseProfile> + <releaseProfiles>release</releaseProfiles> + <goals>deploy</goals> + </configuration> + </plugin> </plugins> <pluginManagement> @@ -592,17 +564,6 @@ </dependency> </dependencies> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.5.3</version> - <configuration> - <autoVersionSubmodules>true</autoVersionSubmodules> - <useReleaseProfile>false</useReleaseProfile> - <releaseProfiles>release</releaseProfiles> - <goals>deploy</goals> - </configuration> - </plugin> </plugins> </pluginManagement> </build> -- To stop receiving notification emails like this one, please contact liu...@apache.org.