Merge pull request #5 from apache/master

PULL origin

.github/ISSUE_TEMPLATE/dubbo-issue-report-template.md

@@ -4,8 +4,8 @@ about: If you would like to report a issue to Dubbo, please use this template.
 
 ---
 
-- [ ] I have searched the [issues](https://github.com/apache/incubator-dubbo/issues) of this repository and believe that this is not a duplicate.
-- [ ] I have checked the [FAQ](https://github.com/apache/incubator-dubbo/blob/master/FAQ.md) of this repository and believe that this is not a duplicate.
+- [ ] I have searched the [issues](https://github.com/apache/dubbo/issues) of this repository and believe that this is not a duplicate.
+- [ ] I have checked the [FAQ](https://github.com/apache/dubbo/blob/master/FAQ.md) of this repository and believe that this is not a duplicate.
 
 ### Environment
 

.gitignore

@@ -31,4 +31,7 @@ Thumbs.db
 *.orig
 
 # flatten ignore
-.flattened-pom.xml
+.flattened-pom.xml
+
+# license check result
+license-list.txt

CONTRIBUTING.md

@@ -9,15 +9,15 @@ Before we accept a non-trivial patch or pull request we will need you to sign th
 
 #### Mailing list
 
-The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [guide](https://github.com/apache/incubator-dubbo/wiki/Mailing-list-subscription-guide) for detailed documentation on how to subscribe.
+The mailing list is the recommended way for discussing almost anything that related to Dubbo. Please refer to this [guide](https://github.com/apache/dubbo/wiki/Mailing-list-subscription-guide) for detailed documentation on how to subscribe.
 
-- [dev@dubbo.incubator.apache.org](mailto:dev-subscribe@dubbo.incubator.apache.org): the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo.
-- [commits@dubbo.incubator.apache.org](mailto:commits-subscribe@dubbo.incubator.apache.org): all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development.
-- [notifications@dubbo.incubator.apache.org](mailto:notifications-subscribe@dubbo.incubator.apache.org): all the Github [issue](https://github.com/apache/incubator-dubbo/issues) updates and [pull request](https://github.com/apache/incubator-dubbo/pulls) updates will be sent to this mailing list.
+- [[email protected]](mailto:[email protected]): the develop mailing list, you can ask question here if you have encountered any problem when using or developing Dubbo.
+- [[email protected]](mailto:[email protected]): all the commits will be sent to this mailing list. You can subscribe to it if you are interested in Dubbo's development.
+- [[email protected]](mailto:[email protected]): all the Github [issue](https://github.com/apache/dubbo/issues) updates and [pull request](https://github.com/apache/dubbo/pulls) updates will be sent to this mailing list.
 
 ### Reporting issue
 
-Please follow the [template](https://github.com/apache/incubator-dubbo/issues/new?template=dubbo-issue-report-template.md) for reporting any issues.
+Please follow the [template](https://github.com/apache/dubbo/issues/new?template=dubbo-issue-report-template.md) for reporting any issues.
 
 ### Code Conventions
 Our code style is almost in line with the standard java conventions (Popular IDE's default setting satisfy this), with the following additional restricts:  
@@ -46,23 +46,23 @@ This is a rough outline of what a contributor's workflow looks like:
 * Make commits of logical units.
 * Make sure commit messages are in the proper format (see below).
 * Push changes in a topic branch to your forked repository.
-* Follow the checklist in the [pull request template](https://github.com/apache/incubator-dubbo/blob/master/PULL_REQUEST_TEMPLATE.md)
+* Follow the checklist in the [pull request template](https://github.com/apache/dubbo/blob/master/PULL_REQUEST_TEMPLATE.md)
 * Before you sending out the pull request, please sync your forked repository with remote repository, this will make your pull request simple and clear. See guide below:
 ```
-git remote add upstream [email protected]:apache/incubator-dubbo.git
+git remote add upstream [email protected]:apache/dubbo.git
 git fetch upstream
 git rebase upstream/master
 git checkout -b your_awesome_patch
 ... add some work
 git push origin your_awesome_patch
 ```
-* Submit a pull request to apache/incubator-dubbo and wait for the reply.
+* Submit a pull request to apache/dubbo and wait for the reply.
 
 Thanks for contributing!
 
 ### Code style
 
-We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/apache/incubator-dubbo/tree/master/codestyle/dubbo_codestyle_for_idea.xml) for IntelliJ idea, you can import it to you IDE. 
+We provide a template file [dubbo_codestyle_for_idea.xml](https://github.com/apache/dubbo/tree/master/codestyle/dubbo_codestyle_for_idea.xml) for IntelliJ idea, you can import it to you IDE. 
 If you use Eclipse you can config manually by referencing the same file.
 
 **NOTICE**

Jenkinsfile

@@ -0,0 +1,138 @@
+import groovy.json.JsonSlurper
+
+pipeline {
+    agent {
+        node {
+            label 'ubuntu'
+        }
+    }
+
+    options {
+        buildDiscarder(logRotator(daysToKeepStr: '14', artifactNumToKeepStr: '10'))
+    }
+
+    environment {
+        JAVA_HOME = "${tool 'JDK 1.8 (latest)'}"
+    }
+
+    tools {
+        maven 'Maven 3 (latest)'
+        jdk 'JDK 1.8 (latest)'
+    }
+
+    triggers {
+        cron '''TZ=Asia/Shanghai
+        H 2,14 * * *'''
+        pollSCM '''TZ=Asia/Shanghai
+        H H/2 * * *'''
+    }
+
+
+    stages {
+        stage('Clone') {
+            steps {
+                checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CloneOption', noTags: true, reference: '', shallow: true]], gitTool: 'Default', submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/apache/dubbo.git']]])
+            }
+        }
+
+        stage('Duplicate deploy check') {
+            steps {
+                script {
+                    def deployedCommitId = sh(returnStdout: true, script: "curl --silent https://builds.apache.org/job/Apache%20Dubbo/job/${env.JOB_BASE_NAME}/lastSuccessfulBuild/artifact/DEPLOY_COMMIT_ID || true").trim()
+                    env.DEPLOYED_COMMIT_ID = deployedCommitId
+                    def commitId = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
+                    env.COMMIT_ID = commitId
+
+                    if (commitId == deployedCommitId) {
+                        env.STATUS_CHECK = "false"
+                        println "Latest deployed commit id is $deployedCommitId, Skip deployment this time"
+                    } else {
+                        env.STATUS_CHECK = "true"
+                        println "Current commit id hasn't been deployed, continue"
+                    }
+                }
+            }
+        }
+
+        stage('Commit status check') {
+            when {
+                expression {
+                    return env.STATUS_CHECK == "true";
+                }
+            }
+            steps {
+                script {
+                    def commitId = env.COMMIT_ID
+                    println "Current commit id: $commitId"
+
+                    def commitStatusJson = sh(script: "curl --silent https://api.github.com/repos/apache/dubbo/commits/$commitId/status", returnStdout: true).trim()
+                    println "Commit status: \r\n$commitStatusJson"
+
+                    def jsonSlurper = new JsonSlurper()
+                    def jsonObject = jsonSlurper.parseText(commitStatusJson)
+
+                    def status = jsonObject.state
+
+                    println "Current commit status is $status"
+
+                    if (status == "success") {
+                        env.STATUS_CHECK = "true"
+                        println "Continue to deploy snapshot"
+                    } else {
+                        env.STATUS_CHECK = "false"
+                        println "Current commit status not allow to deploy snapshot"
+                    }
+                }
+            }
+        }
+
+        stage('Snapshot version check') {
+            when {
+                expression {
+                    return env.STATUS_CHECK == "true";
+                }
+            }
+            steps {
+                sh 'env'
+                sh 'java -version'
+                sh './mvnw clean install -pl "dubbo-dependencies-bom" && ./mvnw clean install -DskipTests=true && ./mvnw clean validate -Psnapshot-ci-deploy -pl "dubbo-all"'
+            }
+        }
+
+        stage('Deploy snapshot') {
+            when {
+                expression {
+                    return env.STATUS_CHECK == "true";
+                }
+            }
+            steps {
+                timeout(35) {
+                    sh './mvnw --version'
+                    sh './mvnw clean package deploy -pl dubbo-dependencies-bom && ./mvnw clean package deploy -DskipTests=true'
+                }
+            }
+        }
+
+        stage('Save deployed commit id') {
+            steps {
+                script {
+                    if (env.STATUS_CHECK != "true") {
+                        println "Not pass status check"
+                        env.COMMIT_ID = env.DEPLOYED_COMMIT_ID
+                    }
+                }
+                writeFile file: 'DEPLOY_COMMIT_ID', text: "${env.COMMIT_ID}"
+                archiveArtifacts 'DEPLOY_COMMIT_ID'
+            }
+        }
+    }
+
+    post {
+        failure {
+            mail bcc: '', body: '''Project: ${env.JOB_NAME}
+            Build Number: ${env.BUILD_NUMBER}
+            URL: ${env.BUILD_URL}''', cc: '', from: '', replyTo: '', subject: 'Apache Dubbo snapshot deployment fail', to: '[email protected]'
+        }
+    }
+
+}

NOTICE

@@ -1,4 +1,4 @@
-Apache Dubbo (incubating)
+Apache Dubbo
 Copyright 2018-2019 The Apache Software Foundation
 
 This product includes software developed at

PULL_REQUEST_TEMPLATE.md

@@ -12,9 +12,9 @@ XXXXX
 
 Follow this checklist to help us incorporate your contribution quickly and easily:
 
-- [x] Make sure there is a [GITHUB_issue](https://github.com/apache/incubator-dubbo/issues) field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
+- [x] Make sure there is a [GITHUB_issue](https://github.com/apache/dubbo/issues) field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
 - [ ] Format the pull request title like `[Dubbo-XXX] Fix UnknownException when host config not exist #XXX`. Each commit in the pull request should have a meaningful subject line and body.
 - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
-- [ ] Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in [test module](https://github.com/apache/incubator-dubbo/tree/master/dubbo-test).
+- [ ] Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add sample in [dubbo samples](https://github.com/apache/dubbo-samples) project.
 - [ ] Run `mvn clean install -DskipTests=false` & `mvn clean test-compile failsafe:integration-test` to make sure unit-test and integration-test pass.
-- [ ] If this contribution is large, please follow the [Software Donation Guide](https://github.com/apache/incubator-dubbo/wiki/Software-donation-guide).
+- [ ] If this contribution is large, please follow the [Software Donation Guide](https://github.com/apache/dubbo/wiki/Software-donation-guide).