You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@metron.apache.org by dbist <gi...@git.apache.org> on 2017/07/25 14:38:33 UTC
[GitHub] metron pull request #668: Metron 1063 address javadoc warnings in metron-ste...
GitHub user dbist opened a pull request:
https://github.com/apache/metron/pull/668
Metron 1063 address javadoc warnings in metron-stellar
## Contributor Comments
[Please place any comments here. A description of the problem/enhancement, how to reproduce the issue, your testing methodology, etc.]
## Pull Request Checklist
Thank you for submitting a contribution to Apache Metron.
Please refer to our [Development Guidelines](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61332235) for the complete guide to follow for contributions.
Please refer also to our [Build Verification Guidelines](https://cwiki.apache.org/confluence/display/METRON/Verifying+Builds?show-miniview) for complete smoke testing guides.
In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:
### For all changes:
- [x] Is there a JIRA ticket associated with this PR? If not one needs to be created at [Metron Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
- [x] Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [x] Has your PR been rebased against the latest commit within the target branch (typically master)?
### For code changes:
- [ ] Have you included steps to reproduce the behavior or problem that is being changed or addressed?
- [ ] Have you included steps or a guide to how the change may be verified and tested manually?
- [ ] Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:
```
mvn -q clean integration-test install && build_utils/verify_licenses.sh
```
- [ ] Have you written or updated unit tests and or integration tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?
### For documentation related changes:
- [ ] Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via `site-book/target/site/index.html`:
```
cd site-book
mvn site
```
#### Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
It is also recommended that [travis-ci](https://travis-ci.org) is set up for your personal repository such that your branches are built there before submitting a pull request.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dbist/metron METRON-1063
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/668.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 #668
----
commit 55c71de5033959387c3fb7399c80ca8b433f7f21
Author: Artem Ervits <ge...@gmail.com>
Date: 2017-07-24T17:14:58Z
METRON-1059
commit f30e80e10260e46d0df39475bbff4fe14de5ae21
Author: Artem Ervits <ge...@gmail.com>
Date: 2017-07-24T18:12:35Z
METRON-1059-2
commit 07a187ae88147234384ba627bbf061620d94b58d
Author: Artem Ervits <ge...@gmail.com>
Date: 2017-07-24T19:03:11Z
METRON-1059-3
commit db0d61526429a86939b6a119aeffc3787d1c888d
Author: Artem Ervits <ge...@gmail.com>
Date: 2017-07-25T14:36:58Z
METRON-1063-0
----
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] metron issue #668: METRON-1063 address javadoc warnings in metron-stellar
Posted by ottobackwards <gi...@git.apache.org>.
Github user ottobackwards commented on the issue:
https://github.com/apache/metron/pull/668
So, to resolve the conflicts what I would usually do is:
```bash
> cd metron
> git checkout pr-branch
# make sure i have all the master changes
> git fetch apache
# rebase on to master
> git rebase -i apache/master
..... resolve conflicts .....
> git rebase --continue
# verify build
> mvn clean && time mvn -q -T 2C -DskipTests install && time mvn -q -T 2C surefire:test@unit-tests && time mvn -q surefire:test@integration-tests && time mvn -q test --projects metron-interface/metron-config && time build_utils/verify_licenses.sh
# important -> -f flag is required after rebase
# push
> git push -f origin pr-branch
---------
Is that close to what you are doing? What are you doing differently? What are the issues you are having?
---
[GitHub] metron issue #668: METRON-1063 address javadoc warnings in metron-stellar
Posted by ottobackwards <gi...@git.apache.org>.
Github user ottobackwards commented on the issue:
https://github.com/apache/metron/pull/668
There are conflicts with this PR, can we get them resolved?
---
[GitHub] metron issue #668: METRON-1063 address javadoc warnings in metron-stellar
Posted by ottobackwards <gi...@git.apache.org>.
Github user ottobackwards commented on the issue:
https://github.com/apache/metron/pull/668
I am +1 on this, thanks for the contribution. Looks good to me. @cestella do you need to look?
---
[GitHub] metron issue #668: METRON-1063 address javadoc warnings in metron-stellar
Posted by dbist <gi...@git.apache.org>.
Github user dbist commented on the issue:
https://github.com/apache/metron/pull/668
I was rebasing to my forked branch instead of upstream, I was able to rebase to upstream with your steps, currently running the tests
---
[GitHub] metron pull request #668: METRON-1063 address javadoc warnings in metron-ste...
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/metron/pull/668
---
[GitHub] metron issue #668: METRON-1063 address javadoc warnings in metron-stellar
Posted by dbist <gi...@git.apache.org>.
Github user dbist commented on the issue:
https://github.com/apache/metron/pull/668
@ottobackwards I'm having issues pushing this patch to my repo, I generated the patch and it rebased locally. Any ideas? I wonder if it's because I pulled METRON-1059 into this patch as well.
---
[GitHub] metron issue #668: METRON-1063 address javadoc warnings in metron-stellar
Posted by dbist <gi...@git.apache.org>.
Github user dbist commented on the issue:
https://github.com/apache/metron/pull/668
@ottobackwards please review
---
[GitHub] metron issue #668: METRON-1063 address javadoc warnings in metron-stellar
Posted by ottobackwards <gi...@git.apache.org>.
Github user ottobackwards commented on the issue:
https://github.com/apache/metron/pull/668
please mark the jira as done
---