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 e07370e56de0ce349a1e1e57e6d298458c53ea46 Author: ken.lj <ken.lj...@gmail.com> AuthorDate: Fri Apr 27 15:51:42 2018 +0800 Change parent pom from oss to apache --- bom/pom.xml | 93 ++++++++++++++++++++++++++++------------------- dependencies-bom/pom.xml | 95 +++++++++++++++++++++++++++++------------------- pom.xml | 23 +++++++++--- 3 files changed, 130 insertions(+), 81 deletions(-) diff --git a/bom/pom.xml b/bom/pom.xml index 58eb037..98e8db8 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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> @@ -12,70 +11,74 @@ <!--<relativePath>../pom.xml</relativePath>--> <!--</parent>--> <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>7</version> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>18</version> <relativePath/> </parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-bom</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> <packaging>pom</packaging> - <name>dubbo-bom</name> + <name>${project.artifactId}</name> <description>Dubbo dependencies BOM</description> - <url>http://dubbo.io</url> - + <url>https://github.com/apache/incubator-dubbo</url> <inceptionYear>2011</inceptionYear> <licenses> <license> - <name>Apache 2</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <distribution>repo</distribution> </license> </licenses> - <organization> - <name>The Dubbo Project</name> - <url>http://dubbo.io</url> - </organization> - - <issueManagement> - <system>Github Issues</system> - <url>https://github.com/alibaba/dubbo/issues</url> - </issueManagement> <scm> - <url>https://github.com/alibaba/dubbo/tree/master</url> - <connection>scm:git:git://github.com/alibaba/dubbo.git</connection> - <developerConnection>scm:git:g...@github.com:alibaba/dubbo.git</developerConnection> + <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>Dubbo User Mailling List</name> - <subscribe>dubbo+subscr...@googlegroups.com</subscribe> - <unsubscribe>dubbo+unsubscr...@googlegroups.com</unsubscribe> - <post>du...@googlegroups.com</post> - <archive>http://groups.google.com/group/dubbo</archive> + <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>Dubbo Developer Mailling List</name> - <subscribe>dubbo-developers+subscr...@googlegroups.com</subscribe> - <unsubscribe>dubbo-developers+unsubscr...@googlegroups.com</unsubscribe> - <post>dubbo-develop...@googlegroups.com</post> - <archive>http://groups.google.com/group/dubbo-developers</archive> + <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>du...@googlegroups.com</email> - <url>http://dubbo.io</url> - <organization>The Dubbo Project</organization> - <organizationUrl>http://dubbo.io</organizationUrl> + <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> + <dependencyManagement> <dependencies> <dependency> @@ -313,4 +316,20 @@ </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> + </project> \ No newline at end of file diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml index 503182b..f857245 100644 --- a/dependencies-bom/pom.xml +++ b/dependencies-bom/pom.xml @@ -1,74 +1,77 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<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.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>7</version> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>18</version> <relativePath /> </parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-dependencies-bom</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> <packaging>pom</packaging> - <name>dubbo-dependencies-bom</name> - <description>Dubbo dependencies BOM</description> - <url>http://dubbo.io</url> - + <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 2</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0</url> + <distribution>repo</distribution> </license> </licenses> - <organization> - <name>The Dubbo Project</name> - <url>http://dubbo.io</url> - </organization> - - <issueManagement> - <system>Github Issues</system> - <url>https://github.com/alibaba/dubbo/issues</url> - </issueManagement> <scm> - <url>https://github.com/alibaba/dubbo/tree/master</url> - <connection>scm:git:git://github.com/alibaba/dubbo.git</connection> - <developerConnection>scm:git:g...@github.com:alibaba/dubbo.git</developerConnection> + <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>Dubbo User Mailling List</name> - <subscribe>dubbo+subscr...@googlegroups.com</subscribe> - <unsubscribe>dubbo+unsubscr...@googlegroups.com</unsubscribe> - <post>du...@googlegroups.com</post> - <archive>http://groups.google.com/group/dubbo</archive> + <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>Dubbo Developer Mailling List</name> - <subscribe>dubbo-developers+subscr...@googlegroups.com</subscribe> - <unsubscribe>dubbo-developers+unsubscr...@googlegroups.com</unsubscribe> - <post>dubbo-develop...@googlegroups.com</post> - <archive>http://groups.google.com/group/dubbo-developers</archive> + <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>du...@googlegroups.com</email> - <url>http://dubbo.io</url> - <organization>The Dubbo Project</organization> - <organizationUrl>http://dubbo.io</organizationUrl> + <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 --> <spring_version>4.3.16.RELEASE</spring_version> @@ -359,4 +362,20 @@ </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> + </project> \ No newline at end of file diff --git a/pom.xml b/pom.xml index 96ba402..7ee26b4 100644 --- a/pom.xml +++ b/pom.xml @@ -14,20 +14,20 @@ See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" +<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/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.sonatype.oss</groupId> - <artifactId>oss-parent</artifactId> - <version>7</version> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>18</version> </parent> <groupId>com.alibaba</groupId> <artifactId>dubbo-parent</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> <packaging>pom</packaging> <name>${project.artifactId}</name> @@ -142,7 +142,7 @@ <dependency> <groupId>com.alibaba</groupId> <artifactId>dubbo-dependencies-bom</artifactId> - <version>2.6.1</version> + <version>2.6.2-SNAPSHOT</version> <type>pom</type> <scope>import</scope> </dependency> @@ -592,6 +592,17 @@ </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.