Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

METRON-1063 address javadoc warnings in metron-stellar #668

Closed
wants to merge 5 commits into from

Conversation

dbist
Copy link
Contributor

@dbist dbist commented Jul 25, 2017

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 for the complete guide to follow for contributions.
Please refer also to our Build Verification Guidelines 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:

  • Is there a JIRA ticket associated with this PR? If not one needs to be created at Metron Jira.
  • 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.
  • 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?

  • 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 is set up for your personal repository such that your branches are built there before submitting a pull request.

@dbist dbist changed the title Metron 1063 address javadoc warnings in metron-stellar METRON-1063 address javadoc warnings in metron-stellar Jul 25, 2017
@ottobackwards
Copy link
Contributor

There are conflicts with this PR, can we get them resolved?

@dbist
Copy link
Contributor Author

dbist commented Sep 14, 2017

@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.

@ottobackwards
Copy link
Contributor

ottobackwards commented Sep 14, 2017

So, to resolve the conflicts what I would usually do is:

> 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?

@dbist
Copy link
Contributor Author

dbist commented Sep 14, 2017

I was rebasing to my forked branch instead of upstream, I was able to rebase to upstream with your steps, currently running the tests

@dbist
Copy link
Contributor Author

dbist commented Sep 15, 2017

@ottobackwards please review

@ottobackwards
Copy link
Contributor

I am +1 on this, thanks for the contribution. Looks good to me. @cestella do you need to look?

@asfgit asfgit closed this in 695e904 Sep 19, 2017
@ottobackwards
Copy link
Contributor

please mark the jira as done

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
2 participants