GitHub user weijietong opened a pull request: https://github.com/apache/drill/pull/917
Drill-5734: exclude the conflicted dependency commons-codec exclude commons-codes from pom files: contrib/format-maprdb/pom.xml , contrib/storage-hive/hive-exec-shade/pom.xml You can merge this pull request into a Git repository by running: $ git pull https://github.com/weijietong/drill DRILL-5734 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/drill/pull/917.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #917 ---- commit b44f780a948c4a0898e7cee042c0590f0713f780 Author: weijietong <tongweijie...@gmail.com> Date: 2017-06-08T08:03:46Z Merge pull request #1 from apache/master sync commit d045c757c80a759b435479cc89f33c749fc16ac2 Author: weijie.tong <weijie.t...@alipay.com> Date: 2017-08-11T08:01:36Z Merge branch 'master' of github.com:weijietong/drill commit 906eef175f6751663e58f36519b325f5a4e6dfea Author: weijie.tong <weijie.t...@alipay.com> Date: 2017-08-11T08:14:54Z let some test cases be Local independent commit 1381f190b0b380d438c552f929d5a4352b72484d Author: weijie.tong <weijie.t...@alipay.com> Date: 2017-08-13T13:45:36Z update commit 90590c7b4dc0a4da3f493dbd9fe8b991f6b62b3e Author: weijie.tong <weijie.t...@alipay.com> Date: 2017-08-20T11:41:01Z update commit 2d0e878276691e073d3595d7031896a7c9b76a94 Author: weijie.tong <weijie.t...@alipay.com> Date: 2017-08-20T11:53:57Z exclude the conflicted dependency ---- --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---